flake.nix

@@ -111,7 +111,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,22 +1,31 @@
-{ lib, pkgs, ... }: {
+{ lib, config, ... }:
+{
   imports = [
     ./mullvad.nix
     ./dumpdvb.nix
     ./zw.nix
   ];
 
-  environment.systemPackages = with pkgs; [ iwgtk impala ];
+  # Networkmanager shouldn't interfere with systemd managed interfaces
+  networking.networkmanager.unmanaged =
+    let
+      systemd_netdevs = lib.attrsets.attrValues (
+        lib.attrsets.mapAttrs (_name: value: value.netdevConfig.Name) config.systemd.network.netdevs
+      );
+    in
+    systemd_netdevs;
 
-  # kick out networkmanager
+  systemd.network = {
-  networking.networkmanager.enable = lib.mkForce false;
+    enable = true;
-  networking.useNetworkd = true;
+    wait-online.enable = false; # uplink is managed by networkmanager
-  systemd.network.enable = true;
+  };
+
+  users.users."0xa".extraGroups = [ "networkmanager" ];
 
   networking = {
     hostName = "toaster";
     firewall.enable = true;
     wireguard.enable = true;
-    wireless.iwd.enable = true;
   };
 
   services.resolved = {
@@ -30,34 +39,4 @@
     ];
   };
 
-  # 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;
-      };
-    };
-  };
-
 }

modules/fonts.nix

@@ -26,8 +26,7 @@
     twemoji-color-font
     twitter-color-emoji
     iosevka-bin
-    cozette
+    (nerdfonts.override { fonts = [ "Hack" ]; })
-    (nerdfonts.override { fonts = [ "Hack" "3270" ]; })
   ];
 
   fonts.enableDefaultPackages = true;