aboutsummaryrefslogtreecommitdiff
path: root/nix/modules/xserver.nix
diff options
context:
space:
mode:
authorPreston Pan <ret2pop@gmail.com>2025-02-01 18:44:15 -0800
committerPreston Pan <ret2pop@gmail.com>2025-02-01 18:44:15 -0800
commit9e4f938d03c72bdcd81b020ab5276b969023a7e3 (patch)
tree172da674e125d39a8a862e279b281ccb8cd14f30 /nix/modules/xserver.nix
parent6cc309ef83350418f4d7f11672de83d1e8019e85 (diff)
new flake lock
Diffstat (limited to 'nix/modules/xserver.nix')
-rw-r--r--nix/modules/xserver.nix8
1 files changed, 0 insertions, 8 deletions
diff --git a/nix/modules/xserver.nix b/nix/modules/xserver.nix
index c47cf65..0298f12 100644
--- a/nix/modules/xserver.nix
+++ b/nix/modules/xserver.nix
@@ -7,18 +7,10 @@
};
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 = {