diff --git a/devices/srv1/node0/default.nix b/devices/srv1/node0/default.nix index cfd8ebcb..b9040749 100644 --- a/devices/srv1/node0/default.nix +++ b/devices/srv1/node0/default.nix @@ -27,8 +27,12 @@ inputs: xrdp = { enable = true; hostname = [ "srv1.chn.moe" ]; }; samba = { hostsAllowed = ""; shares = { home.path = "/home"; root.path = "/"; }; }; }; - packages.packages._prebuildPackages = - [ inputs.topInputs.self.nixosConfigurations.srv1-node1.pkgs.localPackages.vasp.intel ]; + packages = + { + desktop = {}; + packages._prebuildPackages = + [ inputs.topInputs.self.nixosConfigurations.srv1-node1.pkgs.localPackages.vasp.intel ]; + }; }; }; } diff --git a/devices/srv2/node0/default.nix b/devices/srv2/node0/default.nix index 1e4896b6..19ba42e7 100644 --- a/devices/srv2/node0/default.nix +++ b/devices/srv2/node0/default.nix @@ -29,6 +29,7 @@ inputs: sshd = { groupBanner = true; motd = true; }; speedtest = {}; }; + packages.desktp = {}; }; }; } diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix index f85818ed..52b1737e 100644 --- a/modules/packages/desktop.nix +++ b/modules/packages/desktop.nix @@ -3,7 +3,7 @@ inputs: options.nixos.packages.desktop = let inherit (inputs.lib) mkOption types; in mkOption { type = types.nullOr (types.submodule {}); - default = if builtins.elem inputs.config.nixos.model.type [ "desktop" "server" ] then {} else null; + default = if inputs.config.nixos.model.type == "desktop" then {} else null; }; config = let inherit (inputs.config.nixos.packages) desktop; in inputs.lib.mkIf (desktop != null) {