hosts: desktop: move to systemd-networkd

flake.lock

@@ -9,11 +9,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695384796,
+        "lastModified": 1696775529,
         "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4",
+        "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4",
         "type": "github"
       },
       "original": {
@@ -44,24 +44,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -90,11 +72,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696446489,
+        "lastModified": 1696737557,
-        "narHash": "sha256-xSjMKdNR+q/3hdSPyg/LUMsZT/WIoUi8dcm5zT4SMUQ=",
+        "narHash": "sha256-YD/pjDjj/BNmisEvRdM/vspkCU3xyyeGVAUWhvVSi5Y=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "68f7d8c0fb0bfc67d1916dd7f06288424360d43a",
+        "rev": "3c1d8758ac3f55ab96dcaf4d271c39da4b6e836d",
         "type": "github"
       },
       "original": {
@@ -106,11 +88,11 @@
     "jovian-nixos": {
       "flake": false,
       "locked": {
-        "lastModified": 1696061591,
+        "lastModified": 1696680633,
-        "narHash": "sha256-fqbuMDAmLW9d2flWy14+3bvLW/QzLRs++BksXvlDDsE=",
+        "narHash": "sha256-773+wE1zvOePToAuR0dbQ/xyyev8Qh7TDp4DY9TzQ+4=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "399187a234cfc9c312f830fc44017beb0106f0d5",
+        "rev": "73ce8be67aee67fceef3e959a8922475cdcb7ba5",
         "type": "github"
       },
       "original": {
@@ -120,27 +102,6 @@
         "type": "github"
       }
     },
-    "microvm": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1696405736,
-        "narHash": "sha256-Wb8qSpePi/cSLOGr9YStiU4F4w6KyycDlyHXNI8U3xA=",
-        "owner": "astro",
-        "repo": "microvm.nix",
-        "rev": "abd63123e2b2dbc34d1ac38a73578b27ec9ef342",
-        "type": "github"
-      },
-      "original": {
-        "owner": "astro",
-        "repo": "microvm.nix",
-        "type": "github"
-      }
-    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1696614066,
@@ -159,11 +120,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1696375444,
+        "lastModified": 1696604326,
-        "narHash": "sha256-Sv0ICt/pXfpnFhTGYTsX6lUr1SljnuXWejYTI2ZqHa4=",
+        "narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "81e8f48ebdecf07aab321182011b067aafc78896",
+        "rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64",
         "type": "github"
       },
       "original": {
@@ -175,11 +136,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1696374741,
+        "lastModified": 1696697597,
-        "narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=",
+        "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=",
         "owner": "NixOS",
         "repo": "nIxpkgs",
-        "rev": "8a4c17493e5c39769f79117937c79e1c88de6729",
+        "rev": "5a237aecb57296f67276ac9ab296a41c23981f56",
         "type": "github"
       },
       "original": {
@@ -191,11 +152,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1696621524,
+        "lastModified": 1696853627,
-        "narHash": "sha256-2RQ/g/hTbbzn0MaxYSNt7HPW4/lORguM2GcTW80q1gA=",
+        "narHash": "sha256-ELtKIGYJ/+xaCkMGkNktpyKuQz4UJj6jDWpjlFxnYiU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "00ae1fac84d8535fb1accc10f288e93cb771c594",
+        "rev": "50139018c48dd130a9b4fbd0756984cfe0dc88b7",
         "type": "github"
       },
       "original": {
@@ -209,27 +170,11 @@
         "agenix": "agenix",
         "home-manager": "home-manager_2",
         "jovian-nixos": "jovian-nixos",
-        "microvm": "microvm",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

hosts/desktop/hardware-configuration.nix

@@ -116,60 +116,29 @@
   swapDevices = [ { device = "/swap/swapfile"; } ];
   
   networking = {
-    vswitches = {
-        vs0 = {
-            interfaces = {
-                enp34s0 = {  };
-                lo1 = {
-                    type = "internal";
-                };
-                #enp34s0iot = {
-                #    type = "internal";
-                #    vlan = 100;
-                #};
-            };
-        };
-    };
     useDHCP = false;                        # Deprecated
     hostName = "hades";
-    domain = "home.opel-online.de";
     networkmanager = {
       enable = false;
     };
-    timeServers = [
-        "192.168.2.1"
-    ];
-    interfaces = {
-      #enp34s0 = {
-      #  useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
-      #  #ipv4.addresses = [ {
-      #  #    address = "192.168.0.51";
-      #  #    prefixLength = 24;
-      #  #} ];
-      #};
-      #enp34s0iot.useDHCP = true;
-      lo1 = {
-          useDHCP = true;
-          macAddress = "1a:20:e9:ce:9c:1a";
-      };
-    };
-    #defaultGateway = "192.168.0.1";
-    defaultGateway6 = {
-      address = "fe80::1";
-      interface = "lo1";
-    };
-    #nameservers = [ "192.168.0.4" ];
-    #firewall = {
-    #  enable = false;
-    #  #allowedUDPPorts = [ 53 67 ];
-    #  #allowedTCPPorts = [ 53 80 443 9443 ];
-    #};
   };
 
-  systemd.services = {
+  systemd.network = {
-    "ovsdb".partOf = [ "network-setup.service" ];
+      enable = true;
-    "ovs-vswitchd".partOf = [ "network-setup.service" ];
+      networks = {
-    "network-addresses-lo1".partOf = [ "network-setup.service" ];
+          "10-lan" = {
+              matchConfig.Name = "enp34s0";
+              ntp = [ "192.168.2.1" ];
+              domains = [ "home.opel-online.de" ];
+              ipv6AcceptRAConfig = {
+                  DHCPv6Client = "always";
+                  UseDNS = true;
+              };
+              networkConfig = {
+                DHCP = "yes";
+              };
+          };
+      };
   };
 
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

modules/desktop/virtualisation/qemu.nix

@@ -14,7 +14,6 @@
   users.groups.libvirtd.members = [ "root" "${user}" ];
 
   virtualisation = {
-    vswitch.enable = true;
     libvirtd = {
       enable = true;                          # Virtual drivers
       onShutdown = "shutdown";