WIP continue reviving underworld

6 files changed, 41 insertions, 15 deletions

diff --git a/.envrc b/.envrc
index 3550a30..3b11770 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1,2 @@
 use flake
+dotenv
diff --git a/.gitignore b/.gitignore
index 65bd986..8129dc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /.direnv
 /.pre-commit-config.yaml
 result
+.env
diff --git a/hosts/underworld/default.nix b/hosts/underworld/default.nix
index a9b3494..2d1c814 100644
--- a/hosts/underworld/default.nix
+++ b/hosts/underworld/default.nix
@@ -99,21 +99,26 @@
     #media-session.enable = true;
   };
 
-  boot.kernelModules = [ "8852au" ];
-  # boot.extraModulePackages = [
-  #   config.boot.kernelPackages.rtl8852bu # TP-Link Archer TX20U Nano
-  # ];
-  services.udev.extraRules =
-    # Switch TP-Link Archer TX20U Nano from CDROM mode (default) to WiFi mode
-    ''
-      ATTR{idVendor}=="0bda", ATTR{idProduct}=="1a2b", RUN+="${lib.getExe pkgs.usb-modeswitch} -K -v 0bda -p 1a2b"
-    '';
 
-  nixpkgs.config = {
-    problems.handlers = {
-      rtl8852bu.broken = "warn"; # or "ignore"
-    };
-  };
+  # Since 6.17, the special WiFi hardware I'm using should work since 6.17.
+  boot.kernelPackages = lib.mkForce (
+    if builtins.compareVersions pkgs.linuxPackages.kernel.version "6.17" >= 0 then
+      pkgs.linuxPackages
+    else
+      pkgs.linuxPackages_latest
+  );
+
+  assertions = [
+    (
+      let
+        version = config.boot.kernelPackages.kernel.version;
+      in
+      {
+        assertion = builtins.compareVersions version "6.17" >= 0;
+        message = "My WiFi dongles only work with upstream Linux >= 6.17 (is ${version})";
+      }
+    )
+  ];
 
   users.users = {
     osiris = {
diff --git a/hosts/underworld/home.nix b/hosts/underworld/home.nix
index bb5f23b..8c30aef 100644
--- a/hosts/underworld/home.nix
+++ b/hosts/underworld/home.nix
@@ -22,6 +22,7 @@
       (flakeRoot + /share/home/dev-stuff.nix)
       (flakeRoot + /share/home/shell.nix)
       (flakeRoot + /share/home/gui-tools.nix)
+      (flakeRoot + /share/home/rbw.nix)
       # (flakeRoot + /share/home/gaming.nix)
       (flakeRoot + /share/home/niri.nix)
     ];
diff --git a/secrets/wireguard/underworld.txt b/secrets/wireguard/underworld.txt
new file mode 100644
index 0000000..28526ea
--- /dev/null
+++ b/secrets/wireguard/underworld.txt
@@ -0,0 +1,18 @@
+{
+	"data": "ENC[AES256_GCM,data:PBD5K8RhSCVwkbOcl6GQ/EEmt9NRgy3NITLZ24crh94+6kxh7hZMHXpnPakv,iv:ZhotjNIf3VXpXFZvY2JtLhc/7PtQqzC74fO+FOIJ61A=,tag:bEVDBSuYqdT/R6y8H4XbXQ==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqNzRPWFdVbDB5OVlQZEhl\nYTNNVTREUjNjY3ljUUlTTDlkVytrOW0xYUdzCnNCaUtxbHRvSng0N0JhYVRHVFM4\nNk1JQXlKa0dDZHVTQ2ttaEU1TjBtZzQKLS0tIGt3dWxtRWdnYmtNcmhNR2lGMUV6\nRER6Q1k5UXBvUmdWTUxDSWxRdFNMNWMKHAAA4Y+5Mip29dDmC4GxD7rtfEhyxXO3\njWuH2PTgCq04g8kkV/j6yZbFW+FOiQYIfBAvMdWP1iMG+ZAmCgWr3g==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1jmpdssn7555g0pht7zwqq2dvrvzxyu65w6cf2su8pp2fz0zvaykq0jgern"
+			},
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtelMvQzZ3VFovSUhIVU9Y\nWmZDTGFyVzVsd0l0eDF2RHNoR3MxTHFBZEc0ClAxMFlKaG1Eb2VCOVFtcVU2c3Q0\nMUh6Z3Vjc0dVb0QwenZwakNIRHY2bm8KLS0tIDJaeTM2VjdLZjFWb3NWbFczbjZC\nRmFkT3JQK2hZNUN0MFBVR010UGw5YzgKrrO/lOlhLYlE8hm6/G+nxKMGxDzrS4mG\nlsFyH4UUgXjOKZRp1LYz82R90lw6diNXaKfEBFqdZWuBMfCsrl22Fg==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1c8ff4rph28fvpy2e2kwh9m8hwrpyxzet75uhpxvxe90ncjcded5qmt64zq"
+			}
+		],
+		"lastmodified": "2026-08-02T10:35:41Z",
+		"mac": "ENC[AES256_GCM,data:nA4gCWRG5Cix5TDJ79Nb4Psi8KkmBsaQU7sa8CLAPgw1Ma7mW2G5Lg0MLa9+QoUaiSycCtWMx+TJVZujb3UNWn86pzIRFkL23iJgrxc/VdQsa1lNv5idCItB2QVkyuT4iU399/pXlzsrrN+m4LrVqnhxn45j+RMUBBrqLKDVcCs=,iv:KAaY+848NHMGZg24S7G9EHbkSG9ilNdczU0mSwuD1SI=,tag:NuPo29TS4EHgTcUmo+JZ6w==,type:str]",
+		"version": "3.13.3"
+	}
+}
diff --git a/wireguard.nix b/wireguard.nix
index 16f1d40..c880be2 100644
--- a/wireguard.nix
+++ b/wireguard.nix
@@ -27,7 +27,7 @@ let
     };
     underworld = {
       address = "2301:db8:acad:a::4/128";
-      publicKey = "";
+      publicKey = "GPVOvXqg8rp1a38T6YDHQN6UkG2TJT399A4wNtK4WTM=";
     };
   };