diff options
Diffstat (limited to 'modules/nixos')
| -rw-r--r-- | modules/nixos/personal/gui.nix | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/modules/nixos/personal/gui.nix b/modules/nixos/personal/gui.nix index 2c01ee0..b8119b4 100644 --- a/modules/nixos/personal/gui.nix +++ b/modules/nixos/personal/gui.nix @@ -48,18 +48,26 @@ in { autoRepeatDelay = 200; }; } - (lib.mkIf cfg.i3.enable { - services = { - xserver = { - desktopManager.xfce = { - noDesktop = true; - enableXfwm = false; + (lib.mkIf cfg.i3.enable ( + lib.mkMerge [ + { + services = { + xserver = { + desktopManager.xfce = { + noDesktop = true; + enableXfwm = false; + }; + windowManager.i3.enable = true; + }; }; - windowManager.i3.enable = true; - }; - displayManager.defaultSession = "xfce+i3"; - }; - }) + } + ( + if (builtins.compareVersions lib.trivial.version "23.11" > 0) + then {services.defaultSession = "xfce+i3";} + else {services.xserver.displayManager.defaultSession = "xfce+i3";} + ) + ] + )) (lib.mkIf cfg.stylix.enable ({ assertions = let missingArgAssertion = name: { |