buncha changes

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.