From 173f7bd6babd0633ca779747ccabe458b625f4df Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Tue, 8 Jul 2025 11:19:01 +0800
Subject: [PATCH] Revert "devices.srv2: swap master"

This reverts commit 3d6d7bb141f024ae6c13de6843570ba6646695c0.
---
 devices/srv2/default.nix       | 3 +--
 devices/srv2/node0/default.nix | 3 ++-
 devices/srv2/node1/default.nix | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/devices/srv2/default.nix b/devices/srv2/default.nix
index a0032dbd..d577153f 100644
--- a/devices/srv2/default.nix
+++ b/devices/srv2/default.nix
@@ -18,7 +18,6 @@ inputs:
               { mountPoint = "/nix/remote/pc"; hard = false; };
           };
           swap = [ "/nix/swap/swap" ];
-          cluster.masterAddress = "2";
         };
         nixpkgs.cuda.capabilities =
         [
@@ -39,7 +38,7 @@ inputs:
         slurm =
         {
           enable = true;
-          master = "srv2-node1";
+          master = "srv2-node0";
           node =
           {
             srv2-node0 =
diff --git a/devices/srv2/node0/default.nix b/devices/srv2/node0/default.nix
index 0ca6fb06..198fee14 100644
--- a/devices/srv2/node0/default.nix
+++ b/devices/srv2/node0/default.nix
@@ -4,12 +4,13 @@ inputs:
   {
     nixos =
     {
+      model.cluster.nodeType = "master";
       system =
       {
         nixpkgs.march = "skylake";
         network =
         {
-          static.eno2 = { ip = "192.168.178.1"; mask = 24; gateway = "192.168.178.2"; dns = "192.168.178.2"; };
+          static.eno2 = { ip = "192.168.178.1"; mask = 24; };
           wireless = [ "457的5G" ];
           masquerade = [ "eno2" ];
           trust = [ "eno2" ];
diff --git a/devices/srv2/node1/default.nix b/devices/srv2/node1/default.nix
index dd273cf6..bc79d4ef 100644
--- a/devices/srv2/node1/default.nix
+++ b/devices/srv2/node1/default.nix
@@ -4,16 +4,14 @@ inputs:
   {
     nixos =
     {
-      model.cluster.nodeType = "master";
       system =
       {
         nixpkgs.march = "znver3";
         network =
         {
-          static.enp58s0 = { ip = "192.168.178.2"; mask = 24; };
+          static.enp58s0 =
+            { ip = "192.168.178.2"; mask = 24; gateway = "192.168.178.1"; dns = "192.168.178.1"; };
           trust = [ "enp58s0" ];
-          wireless = [ "457的5G" ];
-          masquerade = [ "enp58s0" ];
         };
       };
       services.beesd."/".hashTableSizeMB = 64;