devices.srv1.node2: fix network

devices/srv1/node2/default.nix

@@ -9,11 +9,16 @@ inputs:
         nixpkgs.march = "broadwell";
         networking.networkd.static =
         {
-          eno1 = { ip = "192.168.1.12"; mask = 24; gateway = "192.168.1.1"; dns = "192.168.1.1"; };
+          br0 = { ip = "192.168.1.12"; mask = 24; gateway = "192.168.1.1"; dns = "192.168.1.1"; };
           eno2 = { ip = "192.168.178.3"; mask = 24; };
         };
         cluster.nodeType = "worker";
-        fileSystems.mount.nfs."192.168.178.1:/home" = "/home";
+        fileSystems.mount =
+        {
+          nfs."192.168.178.1:/home" = "/home";
+          btrfs."/dev/disk/by-partlabel/srv1-node2-nodatacow" =
+            { "/nix/nodatacow" = "/nix/nodatacow"; "/nix/backups" = "/nix/backups"; };
+        };
       };
       services =
       {
@@ -22,6 +27,7 @@ inputs:
       };
       packages.packages._prebuildPackages =
         [ inputs.topInputs.self.nixosConfigurations.srv1-node0.config.system.build.toplevel ];
+      virtualization.kvmHost = { enable = true; gui = true; };
     };
     specialisation.no-share-home.configuration =
     {
@@ -31,5 +37,8 @@ inputs:
     boot.initrd.systemd.network.networks."10-eno2" = inputs.config.systemd.network.networks."10-eno2";
     # make slurm sub process to be able to communicate with the master
     networking.firewall.trustedInterfaces = [ "eno2" ];
+    # add a bridge for kvm
+    # 设置桥接之后，不能再给eno1配置ip，需要转而给 br0 配置ip
+    networking.bridges.br0.interfaces = [ "eno1" ];
   };
 }

modules/system/networking.nix

@@ -75,10 +75,10 @@ inputs:
           (builtins.map
             (network:
             {
-              name = "10-${network.ssid}";
+              name = "10-${network}";
               value =
               {
-                matchConfig.Name = network.ssid;
+                matchConfig.Name = network;
                 networkConfig = { DHCP = "yes"; IPv6AcceptRA = true; };
                 linkConfig.RequiredForOnline = "routable";
               };