diff --git a/devices/pc/default.nix b/devices/pc/default.nix index eb991d86..da5b6972 100644 --- a/devices/pc/default.nix +++ b/devices/pc/default.nix @@ -136,7 +136,7 @@ inputs: memoryMB = 90112; gpus."4060" = 1; }; - partitions.default = [ "pc" ]; + partitions.localhost = [ "pc" ]; }; ollama = {}; waydroid = {}; diff --git a/devices/srv1/default.nix b/devices/srv1/default.nix index 4d501d34..bce309ab 100644 --- a/devices/srv1/default.nix +++ b/devices/srv1/default.nix @@ -59,7 +59,7 @@ inputs: }; partitions = { - default = [ "srv1-node0" ]; + localhost = [ "srv1-node0" ]; old = [ "srv1-node1" "srv1-node2" "srv1-node3" ]; }; }; diff --git a/devices/xmupc1/default.nix b/devices/xmupc1/default.nix index 2328d25a..a79b8202 100644 --- a/devices/xmupc1/default.nix +++ b/devices/xmupc1/default.nix @@ -81,7 +81,7 @@ inputs: memoryMB = 94208; gpus = { "p5000" = 1; "3090" = 1; "4090" = 1; }; }; - partitions.default = [ "xmupc1" ]; + partitions.localhost = [ "xmupc1" ]; }; xrdp = { enable = true; hostname = [ "xmupc1.chn.moe" ]; }; samba = diff --git a/devices/xmupc2/default.nix b/devices/xmupc2/default.nix index 50eb9dfa..40e1b540 100644 --- a/devices/xmupc2/default.nix +++ b/devices/xmupc2/default.nix @@ -80,7 +80,7 @@ inputs: memoryMB = 253952; gpus."4090" = 1; }; - partitions.default = [ "xmupc2" ]; + partitions.localhost = [ "xmupc2" ]; }; xrdp = { enable = true; hostname = [ "xmupc2.chn.moe" ]; }; samba = { enable = true; hostsAllowed = ""; shares = { home.path = "/home"; root.path = "/"; }; }; diff --git a/modules/services/slurm.nix b/modules/services/slurm.nix index 006d67d1..fae2139b 100644 --- a/modules/services/slurm.nix +++ b/modules/services/slurm.nix @@ -22,7 +22,7 @@ inputs: gpus = mkOption { type = types.nullOr (types.attrsOf types.ints.unsigned); default = null; }; };}));}; partitions = mkOption { type = types.attrsOf (types.listOf types.nonEmptyStr); default = {}; }; - defaultPartition = mkOption { type = types.nonEmptyStr; default = "default"; }; + defaultPartition = mkOption { type = types.nonEmptyStr; default = "localhost"; }; }; config = let inherit (inputs.config.nixos.services) slurm; in inputs.lib.mkIf slurm.enable (inputs.lib.mkMerge [