diff --git a/common/optional/desktop.nix b/common/optional/desktop.nix
index 1cfeb07..3fe8057 100644
--- a/common/optional/desktop.nix
+++ b/common/optional/desktop.nix
@@ -1,10 +1,18 @@
+{ pkgs, ... }:
 {
-  imports = [
-    ./desktop_kernel.nix
-    ./pipewire.nix
-  ];
+  boot = {
+    kernelPackages = pkgs.linuxPackages_6_12;
+    zfs.package = pkgs.zfs;
+  };
+
   services = {
+    displayManager.sddm = {
+      enable = true;
+      wayland.enable = true;
+    };
+
     desktopManager.plasma6.enable = true;
+
     xserver = {
       enable = true;
       xkb = {
@@ -12,5 +20,13 @@
         variant = "";
       };
     };
+
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      wireplumber.enable = true;
+    };
   };
 }
diff --git a/common/optional/desktop_kernel.nix b/common/optional/desktop_kernel.nix
deleted file mode 100644
index 976bf87..0000000
--- a/common/optional/desktop_kernel.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  boot = {
-    kernelPackages = pkgs.linuxPackages_6_12;
-    zfs.package = pkgs.zfs;
-  };
-}
diff --git a/common/optional/pipewire.nix b/common/optional/pipewire.nix
deleted file mode 100644
index 39fdd15..0000000
--- a/common/optional/pipewire.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-
-{
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    wireplumber.enable = true;
-  };
-}
diff --git a/systems/bob/default.nix b/systems/bob/default.nix
index c015cc8..c556570 100644
--- a/systems/bob/default.nix
+++ b/systems/bob/default.nix
@@ -34,8 +34,6 @@
 
   services = {
 
-    displayManager.sddm.enable = true;
-
     openssh.ports = [ 262 ];
 
     printing.enable = true;
diff --git a/systems/muninn/default.nix b/systems/muninn/default.nix
index dc14f2e..5ade601 100644
--- a/systems/muninn/default.nix
+++ b/systems/muninn/default.nix
@@ -4,7 +4,7 @@
     ../../users/gaming
     ../../users/richie
     ../../common/global
-    ../../common/optional/desktop_kernel.nix
+    ../../common/optional/desktop.nix
     ../../common/optional/steam.nix
     ../../common/optional/systemd-boot.nix
     ../../common/optional/update.nix
@@ -36,29 +36,19 @@
 
   services = {
     displayManager = {
-      sddm = {
-        enable = true;
-        wayland.enable = true;
-      };
       enable = true;
       autoLogin = {
         user = "gaming";
         enable = true;
       };
       defaultSession = "steam";
+      # defaultSession = "plasma";
     };
 
     openssh.ports = [ 295 ];
 
     printing.enable = true;
 
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
-
     snapshot_manager.enable = true;
 
     zfs = {
diff --git a/systems/rhapsody-in-green/default.nix b/systems/rhapsody-in-green/default.nix
index c39cb1f..551779b 100644
--- a/systems/rhapsody-in-green/default.nix
+++ b/systems/rhapsody-in-green/default.nix
@@ -34,8 +34,6 @@
 
   services = {
 
-    displayManager.sddm.enable = true;
-
     openssh.ports = [ 922 ];
 
     printing.enable = true;