diff --git a/flake.nix b/flake.nix index 5561fea..8dfbc01 100755 --- a/flake.nix +++ b/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 diff --git a/hosts/nas/configuration.nix b/hosts/nas/configuration.nix index a432238..717b6d0 100755 --- a/hosts/nas/configuration.nix +++ b/hosts/nas/configuration.nix @@ -22,6 +22,7 @@ ./services.nix ./sops.nix ../default.nix + ../../modules/desktop-environments/cosmic/default.nix ]; powerManagement.cpuFreqGovernor = "powersave"; diff --git a/hosts/nas/services.nix b/hosts/nas/services.nix index b88501b..b493ca2 100755 --- a/hosts/nas/services.nix +++ b/hosts/nas/services.nix @@ -1,6 +1,6 @@ { pkgs, config, ... }: let - enableDisplayManager = true; + enableDisplayManager = false; in { imports = [ ./nix-serve.nix ]; diff --git a/modules/desktop-environments/cosmic/default.nix b/modules/desktop-environments/cosmic/default.nix index 980ed63..ebf4d38 100755 --- a/modules/desktop-environments/cosmic/default.nix +++ b/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; }; }; }