From e9625f41c4c0d5b4f99bee89a4e5d398bbb1cf24 Mon Sep 17 00:00:00 2001
From: Grisha Shipunov <blame@oxapentane.com>
Date: Sun, 23 Feb 2025 02:34:20 +0100
Subject: [PATCH 1/3] software changes

---
 modules/basic-tools/default.nix | 2 +-
 modules/sway.nix                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/basic-tools/default.nix b/modules/basic-tools/default.nix
index d5e81d3..a917168 100644
--- a/modules/basic-tools/default.nix
+++ b/modules/basic-tools/default.nix
@@ -39,7 +39,6 @@
       exfatprogs
       nmap
       bind
-      nnn
       lf
       man-pages
       unzip
@@ -50,6 +49,7 @@
       sshfs
       whois
       mtr
+      joshuto
     ]
     ++ (
       if config.networking.hostName == "toaster" then
diff --git a/modules/sway.nix b/modules/sway.nix
index 44ee647..47f5698 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -27,6 +27,7 @@ in
     audacity
     spotify-player
     zathura
+    ncdu
   ];
 
   # Enable sound.

From db8daf4f061e13961eef5142dcdc9816a094c9a1 Mon Sep 17 00:00:00 2001
From: Grisha Shipunov <blame@oxapentane.com>
Date: Sun, 23 Feb 2025 02:34:27 +0100
Subject: [PATCH 2/3] bump lock

---
 flake.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

From 019a309ddaf9f43357c5de1c01873bb7edaac2f4 Mon Sep 17 00:00:00 2001
From: Grisha Shipunov <blame@oxapentane.com>
Date: Wed, 19 Feb 2025 01:57:32 +0100
Subject: [PATCH 3/3] Revert "sway config"

This reverts commit 73df58ccb08aeb44ff7f2b5324762533d5be9ec0.
---
 flake.nix                         |  2 +-
 hosts/toaster/network/default.nix | 59 ++++++++-----------------------
 2 files changed, 16 insertions(+), 45 deletions(-)

diff --git a/flake.nix b/flake.nix
index 342df6a..0038003 100644
--- a/flake.nix
+++ b/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
diff --git a/hosts/toaster/network/default.nix b/hosts/toaster/network/default.nix
index ee0bdbe..6d96c3c 100644
--- a/hosts/toaster/network/default.nix
+++ b/hosts/toaster/network/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, config, ... }:
 {
   imports = [
     ./mullvad.nix
@@ -6,21 +6,26 @@
     ./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
-  networking.networkmanager.enable = lib.mkForce false;
-  networking.useNetworkd = true;
-  systemd.network.enable = true;
+  systemd.network = {
+    enable = true;
+    wait-online.enable = false; # uplink is managed by networkmanager
+  };
+
+  users.users."0xa".extraGroups = [ "networkmanager" ];
 
   networking = {
     hostName = "toaster";
     firewall.enable = true;
     wireguard.enable = true;
-    wireless.iwd.enable = true;
   };
 
   services.resolved = {
@@ -34,38 +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;
-      };
-    };
-  };
-
 }