From a791dd0583e5390e41f0156da0346285b301958c Mon Sep 17 00:00:00 2001
From: Bun <bun@nixfox.ca>
Date: Mon, 12 May 2025 11:19:54 -0400
Subject: [PATCH] Fix waybar Nvidia module

---
 flake.nix                                        | 11 ++++-------
 hosts/tower/boot/default.nix                     |  4 ++--
 modules/home/wms/programs/waybar/default.nix     |  3 ++-
 modules/system/settings/nix/channels/default.nix | 11 +++++++++++
 modules/system/settings/nix/default.nix          |  1 +
 5 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 modules/system/settings/nix/channels/default.nix

diff --git a/flake.nix b/flake.nix
index 6c46828e..99e7f0c2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -57,7 +57,10 @@
         specialArgs = inputs;
       };
       mkHome = extraModules: hm.lib.homeManagerConfiguration {
-        modules = [ ./modules/home ] ++ extraModules;
+        modules = [
+          ./modules/home
+          { targets.genericLinux.enable = true; }
+        ] ++ extraModules;
         extraSpecialArgs = inputs;
         pkgs = builtins.getAttr system stable.legacyPackages;
       };
@@ -79,12 +82,6 @@
       homeConfigurations = {
         default = mkHome [ ];
         desktop = mkHome [{ home.guifull.enable = true; }];
-
-        generic = mkHome [{ targets.genericLinux.enable = true; }];
-        genericDesktop = mkHome [{
-          home.guifull.enable = true;
-          targets.genericLinux.enable = true;
-        }];
       };
     }
   );
diff --git a/hosts/tower/boot/default.nix b/hosts/tower/boot/default.nix
index 9f0c2504..8c5668af 100644
--- a/hosts/tower/boot/default.nix
+++ b/hosts/tower/boot/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgsUnstable, ... }:
 let
   commonKernelParams = [
     # VM/GPU passthrough
@@ -13,7 +13,7 @@ let
 in {
   boot = {
     # Latest kernel and IOMMU isolation
-    kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = pkgsUnstable.linuxPackages_latest;
     kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:1f82,10de:10fa" ];
 
     # Load into GPU before video driver
diff --git a/modules/home/wms/programs/waybar/default.nix b/modules/home/wms/programs/waybar/default.nix
index 1ce093b2..94a9d228 100644
--- a/modules/home/wms/programs/waybar/default.nix
+++ b/modules/home/wms/programs/waybar/default.nix
@@ -61,6 +61,7 @@
         BC="${bc}/bin/bc"
         HEAD="${uutils-coreutils-noprefix}/bin/head"
         CAT="${uutils-coreutils-noprefix}/bin/cat"
+        NVIDIA="/run/current-system/sw/bin/nvidia-smi"
 
         # Detect the active GPU driver
         gpu_driver="$($LSPCI -k | $GREP -Eo 'in use: (nvidia|amdgpu)' | $AWK '{print $3}')"
@@ -72,7 +73,7 @@
         
         # Get VRAM usage in MB
         if [[ "$gpu_driver" == "nvidia" ]]; then
-          vram_usage_mb="$(nvidia-smi --query-gpu=memory.used --format=csv,noheader,nounits | $HEAD -n1)"
+          vram_usage_mb="$($NVIDIA --query-gpu=memory.used --format=csv,noheader,nounits | $HEAD -n1)"
         elif [[ "$gpu_driver" == "amdgpu" ]]; then
           vram_bytes="$($CAT /sys/class/drm/card*/device/mem_info_vram_used 2>/dev/null | $HEAD -n1)"
           vram_usage_mb="$($BC <<< "$vram_bytes / 1024 / 1024")"
diff --git a/modules/system/settings/nix/channels/default.nix b/modules/system/settings/nix/channels/default.nix
new file mode 100644
index 00000000..b81caa1f
--- /dev/null
+++ b/modules/system/settings/nix/channels/default.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, stable, unstable, ... }:
+with pkgs; {
+  _module.args.pkgsStable = import stable {
+    inherit (stdenv.hostPlatform) system;
+    inherit (config.nixpkgs) config;
+  };
+  _module.args.pkgsUnstable = import unstable {
+    inherit (stdenv.hostPlatform) system;
+    inherit (config.nixpkgs) config;
+  };
+}
diff --git a/modules/system/settings/nix/default.nix b/modules/system/settings/nix/default.nix
index 73fb0248..c1115185 100644
--- a/modules/system/settings/nix/default.nix
+++ b/modules/system/settings/nix/default.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 {
   imports = [
+    ./channels
     ./gc
     ./unfree
   ];