flake.lock

@@ -278,11 +278,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1740253065,
+        "lastModified": 1740025708,
-        "narHash": "sha256-ucwXcftJ7DHjk1UA2LmfHXkDPoCgfB4uadwFUCBvc8w=",
+        "narHash": "sha256-TQ8EQoulNFD2nP94Aw3W17cjlV3F+fMpDsV6LOrrkbY=",
-        "rev": "82c7e76c9c2d829dc11c22b32173a40056cc44ef",
+        "rev": "e335a26d5cd8371ea836d1166b627eaf17427299",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/82c7e76c9c2d829dc11c22b32173a40056cc44ef.tar.gz?rev=82c7e76c9c2d829dc11c22b32173a40056cc44ef"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e335a26d5cd8371ea836d1166b627eaf17427299.tar.gz?rev=e335a26d5cd8371ea836d1166b627eaf17427299"
       },
       "original": {
         "type": "tarball",

flake.nix

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

hosts/toaster/network/default.nix

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

@@ -39,6 +39,7 @@
       exfatprogs
       nmap
       bind
+      nnn
       lf
       man-pages
       unzip
@@ -49,7 +50,6 @@
       sshfs
       whois
       mtr
-      joshuto
     ]
     ++ (
       if config.networking.hostName == "toaster" then

modules/sway.nix

@@ -27,7 +27,6 @@ in
     audacity
     spotify-player
     zathura
-    ncdu
   ];
 
   # Enable sound.