From b9fbcb58648f9a13b72924d89bb7c11e9cf81432 Mon Sep 17 00:00:00 2001
From: David Crompton <davidcrompton@duck.com>
Date: Sat, 4 May 2024 16:20:05 -0400
Subject: [PATCH] Move Desktop things to Desktop.nix

---
 machines/universedesktop/configuration.nix    | 80 +------------------
 machines/universedesktop/programs/desktop.nix | 30 +++++++
 2 files changed, 31 insertions(+), 79 deletions(-)

diff --git a/machines/universedesktop/configuration.nix b/machines/universedesktop/configuration.nix
index cce2b72..8860717 100644
--- a/machines/universedesktop/configuration.nix
+++ b/machines/universedesktop/configuration.nix
@@ -82,71 +82,6 @@
 
     users.users.brltty.isSystemUser = true;
     
-    # Enable the X11 windowing system.
-    services.xserver.enable = true;
-
-    # Enable the GNOME Desktop Environment.
-    services.xserver.displayManager.sddm.enable = true;
-    services.xserver.desktopManager.plasma5.enable = true;
-    programs.xwayland.enable = true;
-
-    # Configure keymap in X11
-    services.xserver.layout = "us";
-    # services.xserver.xkbOptions = "grp:switch";
-    # services.xserver.extraLayouts = {
-    #   bqn = {
-    #     description = "BQN Symbol Modifiers";
-    #     languages = ["eng"];
-    #     symbolsFile = pkgs.fetchurl {
-    #       url = "https://raw.githubusercontent.com/mlochbaum/BQN/master/editors/bqn";
-    #       sha256 = "F2fgLlWghcOrMu0BXGiyNHa0qh9YUyQE80GK0BWU2EY=";
-    #     };
-    #   };
-    # };
-    # # services.xserver.xkbOptions = {
-    # };
-
-    # Enable CUPS to print documents.
-    services.printing.enable = true;
-
-    # Enable sound.
-    #sound.enable = true;
-    #hardware.pulseaudio.enable = true;
-    # 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;
-    };
-#    services.pipewire.extraConfig.pipewire."92-low-latency" = {
-#      context.properties = {
-#        default.clock.rate = 48000;
-#        default.clock.quantum = 32;
-#        default.clock.min-quantum = 32;
-#        default.clock.max-quantum = 32;
-#      };
-#      context.modules = [
-#        {
-#          name = "libpipewire-module-protocol-pulse";
-#          args = {
-#            pulse.min.req = "32/48000";
-#            pulse.default.req = "32/48000";
-#            pulse.max.req = "32/48000";
-#            pulse.min.quantum = "32/48000";
-#            pulse.max.quantum = "32/48000";
-#          };
-#        }
-#      ];
-#      stream.properties = {
-#        node.latency = "32/48000";
-#        resample.quality = 1;
-#      };
-#    };
-    
     # Enable touchpad support (enabled default in most desktopManager).
     # services.xserver.libinput.enable = true;
     users.groups.net = {};
@@ -172,20 +107,7 @@
     
     nixpkgs.config.allowUnfree = true;
     services.xserver.videoDrivers = [ "nvidia" ];
-    
-    # Wayland support
-    hardware = {
-      opengl.enable = true;
-      opengl.driSupport = true;
-      opengl.driSupport32Bit = true;
-
-      nvidia = {
-        modesetting.enable = true;
-        powerManagement.enable = true;
-        open = false;
-      };
-    };
-    
+        
     services.fwupd.enable = true;
         
     programs.adb.enable = true;
diff --git a/machines/universedesktop/programs/desktop.nix b/machines/universedesktop/programs/desktop.nix
index 232b71a..39711c8 100644
--- a/machines/universedesktop/programs/desktop.nix
+++ b/machines/universedesktop/programs/desktop.nix
@@ -9,6 +9,36 @@
     };
   })];
 
+  # 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.xserver.displayManager.sddm.enable = true;
+  services.xserver.desktopManager.plasma5.enable = true;
+  programs.xwayland.enable = true;
+  # Configure keymap in X11
+  services.xserver.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"