From 6cc309ef83350418f4d7f11672de83d1e8019e85 Mon Sep 17 00:00:00 2001
From: Preston Pan <ret2pop@gmail.com>
Date: Wed, 29 Jan 2025 23:04:58 -0800
Subject: finish config for workstation

---
 nix/modules/xserver.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'nix/modules/xserver.nix')

diff --git a/nix/modules/xserver.nix b/nix/modules/xserver.nix
index eb251de..c47cf65 100644
--- a/nix/modules/xserver.nix
+++ b/nix/modules/xserver.nix
@@ -3,25 +3,32 @@
   services.xserver = {
     enable = lib.mkDefault true;
     displayManager = {
-      startx.enable = true;
+	startx.enable = true;
     };
 
     windowManager = {
+<<<<<<< Updated upstream
       # Backup in case wayland isn't sufficient
       i3 = {
 	enable = true;
 	package = pkgs.i3-gaps;
       };
+=======
+	i3 = {
+	  enable = true;
+	  package = pkgs.i3-gaps;
+	};
+>>>>>>> Stashed changes
     };
 
     desktopManager = {
-      runXdgAutostartIfNone = true;
+	runXdgAutostartIfNone = true;
     };
 
     xkb = {
-      layout = "us";
-      variant = "";
-      options = "caps:escape";
+	layout = "us";
+	variant = "";
+	options = "caps:escape";
     };
 
     videoDrivers = (if config.monorepo.profiles.cuda.enable then [ "nvidia" ] else []);
-- 
cgit