From 88d5d1bdd8741556beca0441a70a7e18f8c5a39c Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sun, 3 Mar 2024 17:34:21 -0500
Subject: [PATCH] refactor: get rid of isNvidia

---
 devices/nos/modules/jellyfin/packages.nix | 3 +--
 modules/greetd/hyprland.nix               | 3 +--
 modules/hyprland/default.nix              | 4 +---
 modules/hyprland/packages.nix             | 7 +++----
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/devices/nos/modules/jellyfin/packages.nix b/devices/nos/modules/jellyfin/packages.nix
index 7009a0b..e11c4ba 100644
--- a/devices/nos/modules/jellyfin/packages.nix
+++ b/devices/nos/modules/jellyfin/packages.nix
@@ -6,9 +6,8 @@
 }: let
   inherit (lib) hasAttr optionals;
 
-  isNvidia = config.hardware.nvidia.modesetting.enable;
   jellyPkgs =
-    if isNvidia
+    if config.nvidia.enableCUDA
     then pkgs.cudaPackages.pkgs
     else pkgs;
 in {
diff --git a/modules/greetd/hyprland.nix b/modules/greetd/hyprland.nix
index c6263f0..7ee4066 100644
--- a/modules/greetd/hyprland.nix
+++ b/modules/greetd/hyprland.nix
@@ -20,7 +20,6 @@
   inherit (import ./setupMonitors.nix {inherit config pkgs;}) setupMonitors;
 
   # Nix stuff
-  isNvidia = config.hardware.nvidia.modesetting.enable;
   cfgHypr = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland;
 
   devices = filterAttrs (n: v: hasPrefix "device:" n) cfgHypr.settings;
@@ -44,7 +43,7 @@
       attrs);
 in {
   hyprConf = pkgs.writeText "greetd-hypr-config" (
-    (optionalString isNvidia
+    (optionalString config.nvidia.enable
       /*
       hyprlang
       */
diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix
index 1be6cba..4de9cce 100644
--- a/modules/hyprland/default.nix
+++ b/modules/hyprland/default.nix
@@ -7,8 +7,6 @@
 }: let
   inherit (lib) concatStringsSep optionals;
   inherit (config.vars) mainUser;
-
-  isNvidia = config.hardware.nvidia.modesetting.enable;
 in {
   # SYSTEM CONFIG
   imports = [
@@ -61,7 +59,7 @@ in {
               "$XDG_DATA_DIRS"
             ]}"
           ]
-          ++ (optionals isNvidia [
+          ++ (optionals config.nvidia.enable [
             "LIBVA_DRIVER_NAME, nvidia"
             "XDG_SESSION_TYPE, wayland"
             "GBM_BACKEND, nvidia-drm"
diff --git a/modules/hyprland/packages.nix b/modules/hyprland/packages.nix
index e7c6105..9cd2ac5 100644
--- a/modules/hyprland/packages.nix
+++ b/modules/hyprland/packages.nix
@@ -4,9 +4,8 @@
   pkgs,
   ...
 }: let
+  inherit (lib) makeLibraryPath optionalString;
   inherit (config.vars) mainUser;
-
-  isNvidia = config.hardware.nvidia.modesetting.enable;
 in {
   imports = [../dolphin.nix];
 
@@ -61,8 +60,8 @@ in {
         ];
         buildInputs = [makeWrapper];
         postBuild = ''
-          wrapProgram $out/bin/Discord ${lib.optionalString isNvidia
-            ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
+          wrapProgram $out/bin/Discord ${optionalString config.nvidia.enable
+            ''--prefix LD_LIBRARY_PATH : "${makeLibraryPath [
                 addOpenGLRunpath.driverLink
                 libglvnd
               ]}"''} \