diff options
Diffstat (limited to 'nix/modules/xserver.nix')
| -rw-r--r-- | nix/modules/xserver.nix | 8 |
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 = { |