From 35def6311bb9a4b30b1d40929e02c6967e955301 Mon Sep 17 00:00:00 2001 From: Isabella Bastaja Date: Sun, 2 Aug 2026 12:35:53 +0200 Subject: WIP continue reviving underworld --- hosts/underworld/default.nix | 35 ++++++++++++++++++++--------------- hosts/underworld/home.nix | 1 + 2 files changed, 21 insertions(+), 15 deletions(-) (limited to 'hosts/underworld') 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) ]; -- cgit v1.3.1