1 files changed, 28 insertions, 5 deletions
diff --git a/hosts/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix
index 3c508e5..0d24c12 100644
--- a/hosts/arrakis/hardware-configuration.nix
+++ b/hosts/arrakis/hardware-configuration.nix
@@ -21,6 +21,24 @@
     MOZ_DISABLE_RDD_SANDBOX = "1";
   };
 
+  fileSystems."/srv/caladan/downloads" = {
+    device = "/data/home/nipsy/downloads";
+    fsType = "none";
+    options = [
+      "bind"
+      "noauto"
+    ];
+  };
+
+  fileSystems."/srv/caladan/www" = {
+    device = "/data/home/nipsy/www";
+    fsType = "none";
+    options = [
+      "bind"
+      "noauto"
+    ];
+  };
+
   fileSystems."/srv/nfs/keepers" = {
     device = "/data/home/nipsy/downloads/keepers";
     fsType = "none";
@@ -50,16 +68,21 @@
 
   hardware = {
     bluetooth.enable = true;
+
     graphics = {
       enable = true;
-      extraPackages = with pkgs; [ nvidia-vaapi-driver ];
-      extraPackages32 = with pkgs.pkgsi686Linux; [ nvidia-vaapi-driver ];
+      extraPackages = [ pkgs.nvidia-vaapi-driver ];
+      extraPackages32 = [ pkgs.pkgsi686Linux.nvidia-vaapi-driver ];
     };
-    nvidia = {
+
+    nvidia = let
+      betaPkg = config.boot.kernelPackages.nvidiaPackages.beta;
+      pkgAfterFbc = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.fbc then pkgs.nvidia-patch.patch-fbc betaPkg else betaPkg;
+      finalPkg = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.nvenc then pkgs.nvidia-patch.patch-nvenc pkgAfterFbc else pkgAfterFbc;
+    in {
       modesetting.enable = true;
       open = true;
-      package = pkgs.nvidia-patch.patch-nvenc (pkgs.nvidia-patch.patch-fbc config.boot.kernelPackages.nvidiaPackages.beta);
-      #package = config.boot.kernelPackages.nvidiaPackages.beta;
+      package = if finalPkg == betaPkg then betaPkg else finalPkg;
     };
   };
 }