1 files changed, 12 insertions, 5 deletions
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 []);