universedesktop: Migrate to desktop config to dedicated directory

machines/universedesktop/configuration.nix

@@ -13,6 +13,9 @@
       [ # Include the results of the hardware scan.
         ./hardware-configuration.nix
 
+        # Desktop/Graphical Things defined:
+        ./desktop/default.nix
+        
         # Secrets specified via:
         ./secrets.nix
 

machines/universedesktop/desktop/default.nix

@@ -0,0 +1,31 @@
+{ config, pkgs, lib, ... }: {
+  # Wayland support
+  hardware = {
+    opengl.enable = true;
+    opengl.driSupport = true;
+    opengl.driSupport32Bit = true;
+
+    nvidia = {
+      modesetting.enable = true;
+      powerManagement.enable = true;
+      open = false;
+    };
+  };
+  services.xserver.enable = true;
+  services.displayManager.sddm.enable = true;
+  services.xserver.desktopManager.plasma5.enable = true;
+  programs.xwayland.enable = true;
+  # Configure keymap in X11
+  services.xserver.xkb.layout = "us";
+  # Enable sound.
+  # rtkit is optional but recommended
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    # jack.enable = true;
+  };
+}

machines/universedesktop/programs/desktop.nix

@@ -9,36 +9,6 @@
     };
   })];
 
-  # Wayland support
-  hardware = {
-    opengl.enable = true;
-    opengl.driSupport = true;
-    opengl.driSupport32Bit = true;
-
-    nvidia = {
-      modesetting.enable = true;
-      powerManagement.enable = true;
-      open = false;
-    };
-  };
-  services.xserver.enable = true;
-  services.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-  programs.xwayland.enable = true;
-  # Configure keymap in X11
-  services.xserver.xkb.layout = "us";
-  # Enable sound.
-  # rtkit is optional but recommended
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    # jack.enable = true;
-  };
-
   # Bitwarden Outdaed Nodejs
   nixpkgs.config.permittedInsecurePackages = [
     "openssl-1.1.1v"