Revert "back to declarative network"

This reverts commit 3511f194c5.

flake.nix

@@ -58,7 +58,7 @@
           ./modules/basic-tools
           ./modules/binary-caches.nix
           ./modules/devtools.nix
-          ./modules/sway.nix
+          ./modules/gnome.nix
           ./modules/gnupg.nix
           ./modules/radio.nix
           ./modules/science.nix

hosts/toaster/network/default.nix

@@ -1,61 +1,39 @@
-{ lib, config, pkgs, ... }: {
+{ lib, config, ... }: {
   imports = [
     ./mullvad.nix
     ./dumpdvb.nix
     ./zw.nix
   ];
 
-  # kick out networkmanager
+  # Networkmanager shouldn't interfere with systemd managed interfaces
-  networking.networkmanager.enable = lib.mkForce false;
+  networking.networkmanager.unmanaged =
-  networking.useNetworkd = true;
+    let
-  systemd.network.enable = true;
+      systemd_netdevs = lib.attrsets.attrValues (lib.attrsets.mapAttrs (_name: value: value.netdevConfig.Name) config.systemd.network.netdevs);
+    in
+    systemd_netdevs;
 
-  networking = {
+    systemd.network = {
-    hostName = "toaster";
+      enable = true;
-    firewall.enable = true;
+      wait-online.enable = false; # uplink is managed by networkmanager
-    wireguard.enable = true;
-    wireless.iwd.enable = true;
-  };
-
-  services.resolved = {
-    enable = true;
-    dnssec = "false";
-    fallbackDns = [
-      "9.9.9.9"
-      "2620:fe::fe"
-      "149.112.112.112"
-      "2620:fe::9"
-    ];
-  };
-
-  # we might have no interwebs at all
-  systemd.network.wait-online.enable = false;
-
-  # uplinks
-  systemd.network.networks = {
-    "10-ether-uplink" = {
-      matchConfig.Name = "enp1s0f0";
-      networkConfig = {
-        DHCP = "yes";
-        IPv6AcceptRA = true;
-      };
     };
-    "10-dock-uplink" = {
-      matchConfig.Name = "enp5s0f4u1u1";
-      networkConfig = {
-        DHCP = "yes";
-        IPv6AcceptRA = true;
-      };
-      dhcpV4Config = { RouteMetric = 666; };
-      dhcpV6Config = { RouteMetric = 666; };
-    };
-    "wlan-uplink" = {
-      matchConfig.Name = "wlan0";
-      networkConfig = {
-        DHCP = "yes";
-        IPv6AcceptRA = true;
-      };
-    };
-  };
 
-}
+    users.users."0xa".extraGroups = [ "networkmanager" ];
+
+    networking = {
+      hostName = "toaster";
+      firewall.enable = true;
+      wireguard.enable = true;
+    };
+
+    services.resolved = {
+      enable = true;
+      dnssec = "false";
+      fallbackDns = [
+        "9.9.9.9"
+        "2620:fe::fe"
+        "149.112.112.112"
+        "2620:fe::9"
+      ];
+    };
+
+  }

modules/gnome.nix

@@ -94,6 +94,7 @@
     twemoji-color-font
     twitter-color-emoji
     iosevka-bin
+    nerd-fonts.hack
   ];
 
   fonts.enableDefaultPackages = true;