diff --git a/hosts/virtual-machines/cosmic/default.nix b/hosts/virtual-machines/cosmic/default.nix deleted file mode 100644 index 0aff4e5..0000000 --- a/hosts/virtual-machines/cosmic/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - pkgs, - lib, - ... -}: -let - packages = with pkgs; [ - fastfetch - cosmic-wallpapers - ]; -in -{ - programs = { - firefox.enable = true; - }; - - services = { - desktopManager.cosmic.enable = true; - displayManager.cosmic-greeter.enable = true; - }; - - virtualisation.vmVariant.virtualisation = { - memorySize = 8192; - cores = 6; - }; - - environment.systemPackages = lib.lists.unique (packages); - - nix = { - settings = { - substituters = [ - "https://cosmic.cachix.org" - ]; - trusted-public-keys = [ - "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" - ]; - }; - }; -} diff --git a/hosts/virtual-machines/cosmic/flake.nix b/hosts/virtual-machines/cosmic/flake.nix index 06c2606..9fb2d1b 100644 --- a/hosts/virtual-machines/cosmic/flake.nix +++ b/hosts/virtual-machines/cosmic/flake.nix @@ -28,8 +28,44 @@ modules = [ # imports ../common.nix - ./default.nix cosmic.nixosModules.default + ( + { pkgs, lib, ... }: + let + packages = with pkgs; [ + fastfetch + cosmic-wallpapers + ]; + in + { + programs = { + firefox.enable = true; + }; + + services = { + desktopManager.cosmic.enable = true; + displayManager.cosmic-greeter.enable = true; + }; + + virtualisation.vmVariant.virtualisation = { + memorySize = 8192; + cores = 6; + }; + + environment.systemPackages = lib.lists.unique (packages); + + nix = { + settings = { + substituters = [ + "https://cosmic.cachix.org" + ]; + trusted-public-keys = [ + "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" + ]; + }; + }; + } + ) ]; }; };