Update the system

2024-04-22 17:15:05 -05:00
parent 239990a8c0
commit 5ef24c2a43
4 changed files with 63 additions and 66 deletions
@@ -13,16 +13,10 @@ in with lib; {
 		services = {
 			xserver = {
 				enable = true;
-				displayManager = {
-					defaultSession = "plasma";
-					sddm.enable = true;
-				};
 				xkb.layout = "us";
 				# Trackpad support
 				libinput.enable = true;
-			} // (optionalAttrs (builtins.hasAttr "plasma6" options.services.xserver.desktopManager) {
-				desktopManager.plasma6.enable = true;
-			});
+			};

 			pipewire = {
 				enable = true;
@@ -30,7 +24,13 @@ in with lib; {
 				alsa.support32Bit = true;
 				pulse.enable = true;
 			};
-		};
+		} // (optionalAttrs (builtins.hasAttr "plasma6" options.services.xserver.desktopManager) {
+			desktopManager.plasma6.enable = true;
+			displayManager = {
+				defaultSession = "plasma";
+				sddm.enable = true;
+			};
+		});

 		programs.dconf.enable = true;
 		programs.sway.enable = true;  # Gives us Wayland