From 13b6a97d74f74f9cf1748bbe821238c38cdfaf96 Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Thu, 13 Jun 2024 20:24:01 -0400
Subject: [PATCH] updating to plasma6

---
 systems/bob/configuration.nix               | 10 +---------
 systems/rhapsody-in-green/configuration.nix | 12 ++----------
 users/richie/global/desktop.nix             | 12 ++++++++++++
 3 files changed, 15 insertions(+), 19 deletions(-)
 create mode 100644 users/richie/global/desktop.nix

diff --git a/systems/bob/configuration.nix b/systems/bob/configuration.nix
index 2fab140..8e8f3ba 100644
--- a/systems/bob/configuration.nix
+++ b/systems/bob/configuration.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ../../users/richie/global/desktop.nix
     ../../users/richie/global/syncthing_base.nix
     ../../users/richie/global/zerotier.nix
     ./hardware.nix
@@ -33,15 +34,6 @@
 
     displayManager.sddm.enable = true;
 
-    xserver = {
-      enable = true;
-      desktopManager.plasma5.enable = true;
-      xkb = {
-        layout = "us";
-        variant = "";
-      };
-    };
-
     openssh.ports = [ 262 ];
 
     printing.enable = true;
diff --git a/systems/rhapsody-in-green/configuration.nix b/systems/rhapsody-in-green/configuration.nix
index eb337e5..52e4f45 100644
--- a/systems/rhapsody-in-green/configuration.nix
+++ b/systems/rhapsody-in-green/configuration.nix
@@ -1,8 +1,9 @@
 {
   imports = [
-    ./hardware.nix
+    ../../users/richie/global/desktop.nix
     ../../users/richie/global/syncthing_base.nix
     ../../users/richie/global/zerotier.nix
+    ./hardware.nix
     ./steam.nix
   ];
 
@@ -32,15 +33,6 @@
 
     displayManager.sddm.enable = true;
 
-    xserver = {
-      enable = true;
-      desktopManager.plasma5.enable = true;
-      xkb = {
-        layout = "us";
-        variant = "";
-      };
-    };
-
     openssh.ports = [ 922 ];
 
     printing.enable = true;
diff --git a/users/richie/global/desktop.nix b/users/richie/global/desktop.nix
new file mode 100644
index 0000000..6b14bbb
--- /dev/null
+++ b/users/richie/global/desktop.nix
@@ -0,0 +1,12 @@
+{
+  services = {
+    desktopManager.plasma6.enable = true;
+    xserver = {
+      enable = true;
+      xkb = {
+        layout = "us";
+        variant = "";
+      };
+    };
+  };
+}