From cbb93b004159a190e483d289c49200c91d597043 Mon Sep 17 00:00:00 2001
From: Grisha Shipunov <blame@oxapentane.com>
Date: Sat, 15 Feb 2025 17:03:56 +0100
Subject: [PATCH 1/4] update website

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

diff --git a/flake.lock b/flake.lock
index ad32233..d608a5c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -704,11 +704,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739185568,
-        "narHash": "sha256-8wxwZP6WOWZCmpQzZlo5FG0Y8+hDr8O0U1cY6RB9OZQ=",
+        "lastModified": 1739635190,
+        "narHash": "sha256-UOFXRKepDpnPTGRyyfOt8uVkYaDL4gMbE2VlZR0lCNA=",
         "ref": "main",
-        "rev": "a1ab95888f08020483584d028c68617bafd27b5f",
-        "revCount": 7,
+        "rev": "28953f4e57a2c4ca2ada3547a45c8d2a839d4dfc",
+        "revCount": 9,
         "type": "git",
         "url": "https://git.oxapentane.com/0xa/website.git"
       },

From 73df58ccb08aeb44ff7f2b5324762533d5be9ec0 Mon Sep 17 00:00:00 2001
From: Grisha Shipunov <blame@oxapentane.com>
Date: Fri, 24 Jan 2025 22:42:28 +0100
Subject: [PATCH 2/4] sway config

---
 flake.nix                         |  2 +-
 hosts/toaster/network/default.nix | 55 +++++++++++++++++++++----------
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0038003..342df6a 100644
--- a/flake.nix
+++ b/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
diff --git a/hosts/toaster/network/default.nix b/hosts/toaster/network/default.nix
index 6d96c3c..0bf35e9 100644
--- a/hosts/toaster/network/default.nix
+++ b/hosts/toaster/network/default.nix
@@ -1,36 +1,27 @@
-{ lib, config, ... }:
-{
+{ lib, config, pkgs, ... }: {
   imports = [
     ./mullvad.nix
     ./dumpdvb.nix
     ./zw.nix
   ];
 
-  # 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;
+  environment.systemPackages = with pkgs; [ iwgtk impala ];
 
-  systemd.network = {
-    enable = true;
-    wait-online.enable = false; # uplink is managed by networkmanager
-  };
-
-  users.users."0xa".extraGroups = [ "networkmanager" ];
+  # kick out networkmanager
+  networking.networkmanager.enable = lib.mkForce false;
+  networking.useNetworkd = true;
+  systemd.network.enable = true;
 
   networking = {
     hostName = "toaster";
     firewall.enable = true;
     wireguard.enable = true;
+    wireless.iwd.enable = true;
   };
 
   services.resolved = {
     enable = true;
-    dnssec = "false";
+    dnssec = "allow-downgrade";
     fallbackDns = [
       "9.9.9.9"
       "2620:fe::fe"
@@ -39,4 +30,34 @@
     ];
   };
 
+  # 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;
+      };
+    };
+  };
+
 }

From f72c2e676cd4d498a92a7d4897f1b9fe72e327cb Mon Sep 17 00:00:00 2001
From: Grisha Shipunov <blame@oxapentane.com>
Date: Sat, 15 Feb 2025 16:38:10 +0100
Subject: [PATCH 3/4] dnssec is annoying

---
 hosts/toaster/network/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hosts/toaster/network/default.nix b/hosts/toaster/network/default.nix
index 0bf35e9..48a6f8a 100644
--- a/hosts/toaster/network/default.nix
+++ b/hosts/toaster/network/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }: {
+{ lib, pkgs, ... }: {
   imports = [
     ./mullvad.nix
     ./dumpdvb.nix
@@ -21,7 +21,7 @@
 
   services.resolved = {
     enable = true;
-    dnssec = "allow-downgrade";
+    dnssec = "false";
     fallbackDns = [
       "9.9.9.9"
       "2620:fe::fe"

From 15e9870f452e66c550d26b16b915b49d9060e242 Mon Sep 17 00:00:00 2001
From: Grisha Shipunov <blame@oxapentane.com>
Date: Sat, 15 Feb 2025 16:43:48 +0100
Subject: [PATCH 4/4] add ibm3270 to fonts

---
 modules/fonts.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/fonts.nix b/modules/fonts.nix
index 7ee909b..1fde925 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -26,7 +26,7 @@
     twemoji-color-font
     twitter-color-emoji
     iosevka-bin
-    (nerdfonts.override { fonts = [ "Hack" ]; })
+    (nerdfonts.override { fonts = [ "Hack" "3270" ]; })
   ];
 
   fonts.enableDefaultPackages = true;