+

oluceps · Jul 5, 2024 · 9a3e5bd · 9a3e5bd
1 parent 325110d
commit 9a3e5bd
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 10 deletions.
diff --git a/hosts/hastur/network.nix b/hosts/hastur/network.nix
@@ -90,6 +90,14 @@
         MACAddressPolicy = "persistent";
       };
     };
+    links."20-ncm" = {
+      matchConfig.Driver = "cdc_ncm";
+      linkConfig = {
+        NamePolicy = "keep";
+        Name = "ncm";
+        MACAddressPolicy = "persistent";
+      };
+    };
     links."40-wlan0" = {
       matchConfig.MACAddress = "70:66:55:e7:1c:b1";
       linkConfig.Name = "wlan0";
@@ -188,6 +196,18 @@
         # };
       };
 
+      "25-ncm" = {
+        matchConfig.Name = "ncm";
+        DHCP = "yes";
+        dhcpV4Config.RouteMetric = 2044;
+        dhcpV6Config.RouteMetric = 2044;
+        dhcpV4Config.UseDNS = false;
+        dhcpV6Config.UseDNS = false;
+        networkConfig = {
+          DNSSEC = true;
+        };
+      };
+
       "30-rndis" = {
         matchConfig.Name = "rndis";
         DHCP = "yes";

diff --git a/hosts/kaambl/hardware.nix b/hosts/kaambl/hardware.nix
@@ -27,8 +27,7 @@
     disk = {
       nvme = {
         type = "disk";
-        # device = "/dev/disk/by-id/nvme-HP_SSD_FX900_Plus_M.2_2TB_HBSE53120600733";
-        device = "/dev/disk/by-id/usb-HIKSEMI_MD202_012938008F0E-0:0";
+        device = "/dev/disk/by-id/nvme-HP_SSD_FX900_Plus_M.2_2TB_HBSE53120600733";
         content = {
           type = "gpt";
           partitions = {

diff --git a/hosts/kaambl/network.nix b/hosts/kaambl/network.nix
@@ -83,6 +83,14 @@
         MACAddressPolicy = "persistent";
       };
     };
+    links."20-ncm" = {
+      matchConfig.Driver = "cdc_ncm";
+      linkConfig = {
+        NamePolicy = "keep";
+        Name = "ncm";
+        MACAddressPolicy = "persistent";
+      };
+    };
     links."40-wlan" = {
       matchConfig.Driver = "ath11k_pci";
       linkConfig.Name = "wlan0";
@@ -101,16 +109,16 @@
         };
         wireguardPeers = [
           {
-              PublicKey = "+fuA9nUmFVKy2Ijfh5xfcnO9tpA/SkIL4ttiWKsxyXI=";
-              AllowedIPs = [ "10.0.1.0/24" ];
-              Endpoint = "127.0.0.1:41820";
-              PersistentKeepalive = 15;
+            PublicKey = "+fuA9nUmFVKy2Ijfh5xfcnO9tpA/SkIL4ttiWKsxyXI=";
+            AllowedIPs = [ "10.0.1.0/24" ];
+            Endpoint = "127.0.0.1:41820";
+            PersistentKeepalive = 15;
           }
           {
-              PublicKey = "49xNnrpNKHAvYCDikO3XhiK94sUaSQ4leoCnTOQjWno=";
-              AllowedIPs = [ "10.0.2.0/24" ];
-              Endpoint = "116.196.112.43:51820";
-              PersistentKeepalive = 15;
+            PublicKey = "49xNnrpNKHAvYCDikO3XhiK94sUaSQ4leoCnTOQjWno=";
+            AllowedIPs = [ "10.0.2.0/24" ];
+            Endpoint = "116.196.112.43:51820";
+            PersistentKeepalive = 15;
           }
           # {
           #   wireguardPeerConfig = {
@@ -169,6 +177,17 @@
           DNSSEC = true;
         };
       };
+      "25-ncm" = {
+        matchConfig.Name = "ncm";
+        DHCP = "yes";
+        dhcpV4Config.RouteMetric = 2044;
+        dhcpV6Config.RouteMetric = 2044;
+        dhcpV4Config.UseDNS = false;
+        dhcpV6Config.UseDNS = false;
+        networkConfig = {
+          DNSSEC = true;
+        };
+      };
     };
   };
 }