nas cosmic

flake.nix

@@ -17,12 +17,6 @@
       url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
     };
 
-    # cosmic launcher
-    desktop-cosmic = {
-      url = "github:lilyinstarlight/nixos-cosmic";
-      inputs.nixpkgs.follows = "desktop-nixpkgs";
-    };
-
     # Home Manager
     desktop-home-manager = {
       url = "github:nix-community/home-manager";
@@ -73,6 +67,12 @@
       inputs.nixpkgs.follows = "nas-nixpkgs";
     };
 
+    # cosmic launcher
+    nas-cosmic = {
+      url = "github:lilyinstarlight/nixos-cosmic";
+      inputs.nixpkgs.follows = "nas-nixpkgs";
+    };
+
     # crowdsec
     nas-crowdsec = {
       url = "git+https://codeberg.org/kampka/nix-flake-crowdsec.git";
@@ -223,7 +223,6 @@
       # Desktop
       desktop-nixpkgs,
       desktop-chaotic,
-      desktop-cosmic,
       desktop-home-manager,
       desktop-impermanence,
       desktop-lanzaboote,
@@ -234,6 +233,7 @@
       # NAS
       nas-nixpkgs,
       nas-authentik-nix,
+      nas-cosmic,
       nas-crowdsec,
       nas-home-manager,
       nas-impermanence,
@@ -315,8 +315,6 @@
             desktop-nixos-hardware.nixosModules.common-pc
 
             desktop-sops-nix.nixosModules.sops
-
-            # desktop-cosmic.nixosModules.default
           ];
         };
 
@@ -329,6 +327,7 @@
           modules = [
             nas-impermanence.nixosModules.impermanence
             nas-lanzaboote.nixosModules.lanzaboote
+            nas-cosmic.nixosModules.default
             ./hosts/nas/configuration.nix
             ./hosts/nas/impermanence.nix
             nas-home-manager.nixosModules.home-manager

hosts/nas/configuration.nix

@@ -22,6 +22,7 @@
     ./services.nix
     ./sops.nix
     ../default.nix
+    ../../modules/desktop-environments/cosmic/default.nix
   ];
 
   powerManagement.cpuFreqGovernor = "powersave";

hosts/nas/services.nix

@@ -1,6 +1,6 @@
 { pkgs, config, ... }:
 let
-  enableDisplayManager = true;
+  enableDisplayManager = false;
 in
 {
   imports = [ ./nix-serve.nix ];

modules/desktop-environments/cosmic/default.nix

@@ -4,10 +4,6 @@
     services = {
       desktopManager.cosmic.enable = true;
       displayManager.cosmic-greeter.enable = true;
-
-      # disable plasma
-      displayManager.sddm.enable = false;
-      desktopManager.plasma6.enable = false;
     };
   };
 }