From 9fa3ab675820cfceab78ad6a6c56075e6848cbe7 Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Tue, 19 Nov 2024 20:24:21 -0500
Subject: [PATCH] added desktop_kernel

---
 common/optional/desktop.nix        | 8 +++-----
 common/optional/desktop_kernel.nix | 7 +++++++
 systems/muninn/default.nix         | 8 ++------
 3 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 common/optional/desktop_kernel.nix

diff --git a/common/optional/desktop.nix b/common/optional/desktop.nix
index 9d2fdeb..34d73f3 100644
--- a/common/optional/desktop.nix
+++ b/common/optional/desktop.nix
@@ -1,9 +1,7 @@
-{ lib, pkgs, ... }:
 {
-  boot = {
-    kernelPackages = lib.mkDefault pkgs.linuxPackages_zen;
-    zfs.package = pkgs.zfs_unstable;
-  };
+  imports = [
+    ./desktop_kernel.nix
+  ];
   services = {
     desktopManager.plasma6.enable = true;
     xserver = {
diff --git a/common/optional/desktop_kernel.nix b/common/optional/desktop_kernel.nix
new file mode 100644
index 0000000..f4cc48e
--- /dev/null
+++ b/common/optional/desktop_kernel.nix
@@ -0,0 +1,7 @@
+{ lib, pkgs, ... }:
+{
+  boot = {
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_zen;
+    zfs.package = pkgs.zfs_unstable;
+  };
+}
diff --git a/systems/muninn/default.nix b/systems/muninn/default.nix
index 2576b69..930257c 100644
--- a/systems/muninn/default.nix
+++ b/systems/muninn/default.nix
@@ -3,20 +3,16 @@
 
 
   imports = [
-    ../../users/richie
     ../../users/gaming
+    ../../users/richie
     ../../common/global
+    ../../common/optional/desktop_kernel.nix
     ../../common/optional/steam.nix
     ../../common/optional/systemd-boot.nix
     ../../common/optional/update.nix
     ./hardware.nix
   ];
 
-  boot = {
-    kernelPackages = pkgs.linuxPackages_zen;
-    zfs.package = pkgs.zfs_unstable;
-  };
-
   environment.loginShellInit = ''[[ "$(tty)" = "/dev/tty1" ]] && ${./gamescope.sh}'';
 
   networking = {