refactor slightly and cleanup tearfree option enable

1 files changed, 8 insertions, 9 deletions

diff --git a/archetypes/collections/desktop/xserver.nix b/archetypes/collections/desktop/xserver.nix
index 8e01a84..050c9d4 100644
--- a/archetypes/collections/desktop/xserver.nix
+++ b/archetypes/collections/desktop/xserver.nix
@@ -7,9 +7,14 @@ in {
 	};
 
 	config = lib.mkIf cfg.enable {
-		services.xserver.enable = true;
-		services.xserver.displayManager.startx.enable = true;
-		services.libinput.enable = true;  # Enable touchpad support
+		services = {
+			xserver = {
+				enable = true;
+				displayManager.startx.enable = true;
+				enableTearFree = true;
+			};
+			libinput.enable = true;  # Enable touchpad support
+		};
 
 		# Install basic X utilities
 		environment.systemPackages = with pkgs; lib.optionals cfg.utilities.enable [
@@ -25,11 +30,5 @@ in {
 			xorg.xset
 			xwallpaper
 		];
-
-		# Enable TearFree option by default
-		# Not all video drivers support this option
-		services.xserver.deviceSection = ''
-			Option "TearFree" "true"
-		'';
 	};
 }