diff --git a/modules/nixos/cosmic-desktop/default.nix b/modules/nixos/cosmic-desktop/default.nix
new file mode 100644
index 0000000..7c03dc7
--- /dev/null
+++ b/modules/nixos/cosmic-desktop/default.nix
@@ -0,0 +1,32 @@
+{ config
+, lib
+, inputs
+, pkgs
+, ...
+}:
+let
+  inherit (lib) mkEnableOption mkIf;
+  inherit (lib.my-namespace) disabled enabled;
+
+  cfg = config.my-namespace.cosmic-desktop;
+  # moduleImports = {
+  #   "enabled" = [inputs.nixos-cosmic.nixosModules.default];
+  #   "disabled" = [];
+  # };
+  # optionalImports = { imports = []; };
+in
+{
+  options.my-namespace.cosmic-desktop = {
+    enable = mkEnableOption "Enable nvidia";
+  };
+  imports = [ inputs.nixos-cosmic.nixosModules.default ];
+  config = mkIf cfg.enable {
+    nix.settings = {
+      substituters = [ "https://cosmic.cachix.org/" ];
+      trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
+    };
+    
+    services.desktopManager.cosmic.enable = true;
+    services.displayManager.cosmic-greeter.enable = true;
+  };
+}
diff --git a/systems/x86_64-linux/drivebystation-nix/configuration.nix b/systems/x86_64-linux/drivebystation-nix/configuration.nix
index 95c55c1..2be7db5 100644
--- a/systems/x86_64-linux/drivebystation-nix/configuration.nix
+++ b/systems/x86_64-linux/drivebystation-nix/configuration.nix
@@ -47,6 +47,7 @@
 
   # Enable the GNOME Desktop Environment.
   services.xserver.displayManager.gdm.enable = true; 
+  services.xserver.displayManager.defaultSession = "gnome";
   # services.xserver.displayManager.lightdm.enable = true;
   # services.xserver.displayManager.autoLogin.enable = true;
   # services.xserver.displayManager.autoLogin.user = "andreas";
@@ -100,6 +101,7 @@
   environment.systemPackages = with pkgs; [
   #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
   #  wget
+    pkgs.gnome3.gnome-tweaks
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
diff --git a/systems/x86_64-linux/drivebystation-nix/default.nix b/systems/x86_64-linux/drivebystation-nix/default.nix
index 56e4cad..23ba21b 100644
--- a/systems/x86_64-linux/drivebystation-nix/default.nix
+++ b/systems/x86_64-linux/drivebystation-nix/default.nix
@@ -26,6 +26,7 @@
 , ...
 }:
 let
+  inherit (lib.my-namespace) enabled;
   inherit pkgs;
   installedPackages = lib.my-namespace.mkPackages pkgs;
 in
@@ -45,21 +46,26 @@ in
         description = "Andreas Schaafsma";
         extraGroups = [ "networkmanager" "wheel" ]    ;
         packages = with pkgs; [
-          flatpak
-          gnome-software
-          soundwireserver
-          vscode  
-          spotify
-          appimage-run
+          # Packages from inputs
           inputs.game-of-life.packages.x86_64-linux.default
           inputs.zen-browser.packages.x86_64-linux.default
           inputs.nixos-cosmic
+
+          flatpak
+          gnome-software
+          gnomeExtensions.pop-shell
+          soundwireserver
+          vscode  
+          spotify
+          appimage-run  
           minecraft
           trilium-desktop
           terraform
           #  thunderbird
         ];
       };
+
+      my-namespace.cosmic-desktop.enable = false;
       # lib.my-namespace.home.stream-tools.enable = true;
 
       # Open ports in the firewall.