diff --git a/nix-os/desktopManagers/cosmic.nix b/nix-os/desktopManagers/cosmic.nix
index 589ee56..a26c073 100644
--- a/nix-os/desktopManagers/cosmic.nix
+++ b/nix-os/desktopManagers/cosmic.nix
@@ -16,11 +16,35 @@ in
     "${nixos-cosmic}/nixos/cosmic/module.nix"
   ];
   config = {
-    services.desktopManager.cosmic.enable = true;
+    services.xserver.desktopManager.cosmic.enable = true;
     nixpkgs.overlays = [ cosmicPkgsOverlay ];
     nix.settings = {
       substituters = [ "https://cosmic.cachix.org/" ];
       trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
     };
   };
+  options = {
+    cosmic-applets = lib.mkOption {default = pkgs.cosmic-applets;};
+    cosmic-applibrary = lib.mkOption {default = pkgs.cosmic-applibrary;};
+    cosmic-bg = lib.mkOption {default = pkgs.cosmic-bg;};
+    cosmic-comp = lib.mkOption {default = pkgs.cosmic-comp;};
+    cosmic-design-demo = lib.mkOption {default = pkgs.cosmic-design;};
+    cosmic-edit = lib.mkOption {default = pkgs.cosmic-edit;};
+    cosmic-files = lib.mkOption {default = pkgs.cosmic-files;};
+    cosmic-icons = lib.mkOption {default = pkgs.cosmic-icons;};
+    cosmic-launcher = lib.mkOption {default = pkgs.cosmic-launcher;};
+    cosmic-notifications = lib.mkOption {default = pkgs.cosmic-notifications;};
+    cosmic-osd = lib.mkOption {default = pkgs.cosmic-osd;};
+    cosmic-panel = lib.mkOption {default = pkgs.cosmic-panel;};
+    cosmic-protocols = lib.mkOption {default = pkgs.cosmic-protocols;};
+    cosmic-randr = lib.mkOption {default = pkgs.cosmic-randr;};
+    cosmic-screenshot = lib.mkOption {default = pkgs.cosmic-screenshot;};
+    cosmic-session = lib.mkOption {default = pkgs.cosmic-session;};
+    cosmic-settings = lib.mkOption {default = pkgs.cosmic-settings;};
+    cosmic-settings-daemon = lib.mkOption {default = pkgs.cosmic-settings;};
+    cosmic-term = lib.mkOption {default = pkgs.cosmic-term;};
+    cosmic-workspaces-epoch = lib.mkOption {default = pkgs.cosmic-workspaces;};
+    wrapCosmicAppsHook = lib.mkOption {default = pkgs.wrapCosmicAppsHook;};
+    xdg-desktop-portal-cosmic = lib.mkOption {default = pkgs.xdg-desktop-portal-cosmic;};
+  };
 }
diff --git a/nix-os/displayManagers/cosmic-greeter.nix b/nix-os/displayManagers/cosmic-greeter.nix
index da54a6d..b66341a 100644
--- a/nix-os/displayManagers/cosmic-greeter.nix
+++ b/nix-os/displayManagers/cosmic-greeter.nix
@@ -16,11 +16,15 @@ in
     "${nixos-cosmic}/nixos/cosmic-greeter/module.nix"
   ];
   config = {
-    services.displayManager.cosmic-greeter.enable = true;
+    services.xserver.desktopManager.cosmic.enable = true;
+    services.xserver.displayManager.cosmic-greeter.enable = true;
     nixpkgs.overlays = [ cosmicPkgsOverlay ];
     nix.settings = {
       substituters = [ "https://cosmic.cachix.org/" ];
       trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
     };
   };
+  options = {
+    cosmic-greeter = lib.mkOption {default = pkgs.cosmic-greeter;};
+  };
 }
diff --git a/nix-os/shell.nix b/nix-os/shell.nix
index 5c2bc44..2975c9b 100644
--- a/nix-os/shell.nix
+++ b/nix-os/shell.nix
@@ -17,25 +17,17 @@ let
       setuptools
     ] ++ old.propagatedBuildInputs;
   });
-  aliasDrag = pkgs.writeScriptBin "drag" ''
-    ${unstablePkgs.ripdrag}/bin/ripdrag -Axd $@
-  '';
 in
 {
   imports = [
     ./unstable-packages.nix
   ];
   environment.systemPackages = with pkgs; [
-    aliasDrag
     rangerGit
     kitty
     zoxide
   ];
 
-  programs.bash.shellInit = ''
-    HISTCONTROL=ignoreboth
-  '';
-
   programs.bash.interactiveShellInit = ''
     if test -n "$KITTY_INSTALLATION_DIR"; then
       export KITTY_SHELL_INTEGRATION="enabled,no-sudo"