From fe53feed59e1040abe9386ab98d59495e888a45e Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Tue, 17 Dec 2024 21:39:14 -0500
Subject: [PATCH] moved all systems to linuxPackages_6_12 moved desktops off
 master

---
 common/global/default.nix          | 7 ++++++-
 common/optional/desktop_kernel.nix | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/global/default.nix b/common/global/default.nix
index 5ff59db..0bd2910 100644
--- a/common/global/default.nix
+++ b/common/global/default.nix
@@ -2,6 +2,7 @@
   inputs,
   lib,
   outputs,
+  pkgs,
   ...
 }:
 {
@@ -18,7 +19,11 @@
     ./snapshot_manager.nix
   ];
 
-  boot.tmp.useTmpfs = true;
+  boot = {
+    tmp.useTmpfs = true;
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_6_12;
+    zfs.package = lib.mkDefault pkgs.zfs;
+  };
 
   hardware.enableRedistributableFirmware = true;
 
diff --git a/common/optional/desktop_kernel.nix b/common/optional/desktop_kernel.nix
index 585e4de..976bf87 100644
--- a/common/optional/desktop_kernel.nix
+++ b/common/optional/desktop_kernel.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   boot = {
-    kernelPackages = pkgs.master.linuxPackages_6_12;
-    zfs.package = pkgs.master.zfs;
+    kernelPackages = pkgs.linuxPackages_6_12;
+    zfs.package = pkgs.zfs;
   };
 }