2 files changed, 16 insertions, 9 deletions
diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix
index 4be0d1d..c01595e 100644
--- a/hosts/ginaz/default.nix
+++ b/hosts/ginaz/default.nix
@@ -1,19 +1,19 @@
 { config, inputs, outputs, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "amdgpu" "zfs" ];
-    kernelPackages = pkgs.linuxPackages_6_12;
+    kernelPackages = pkgs.master.linuxPackages_6_15;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
       timeout = 3;
     };
     supportedFilesystems = [ "zfs" ];
-    #zfs.package = pkgs.master.zfs;
+    zfs.package = pkgs.master.zfs;
   };
 
-  environment.systemPackages = with pkgs; [
-    signal-desktop
-    #master.wsmancli
+  environment.systemPackages = [
+    pkgs.signal-desktop
+    #pkgs.master.wsmancli
   ];
 
   imports = [
@@ -33,6 +33,7 @@
     ../common/optional/services/tlp.nix
     ../common/optional/services/xorg.nix
     ../common/optional/sound.nix
+    ../common/optional/wdt.nix
     ../common/optional/zfs.nix
     ../common/users/nipsy
     ../common/users/root
@@ -49,6 +50,7 @@
     config.allowUnfree = true;
     hostPlatform = "x86_64-linux";
     overlays = [
+      inputs.nvidia-patch.overlays.default
       outputs.overlays.additions
       outputs.overlays.modifications
       outputs.overlays.master-packages
@@ -66,6 +68,7 @@
     secrets = {
       "nftables/ssh" = {};
       "nix-access-token-github" = {};
+      "ssh_config".path = "/root/.ssh/config";
     };
   };
 
diff --git a/hosts/ginaz/hardware-configuration.nix b/hosts/ginaz/hardware-configuration.nix
index adc71fd..670a58c 100644
--- a/hosts/ginaz/hardware-configuration.nix
+++ b/hosts/ginaz/hardware-configuration.nix
@@ -23,14 +23,18 @@
 
     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 = config.boot.kernelPackages.nvidiaPackages.beta;
+      package = if finalPkg == betaPkg then betaPkg else finalPkg;
       prime = {
         amdgpuBusId = "PCI:4:0:0";
         nvidiaBusId = "PCI:1:0:0";