diff options
Diffstat (limited to 'modules/nixos/personal/gui.nix')
| -rw-r--r-- | modules/nixos/personal/gui.nix | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/modules/nixos/personal/gui.nix b/modules/nixos/personal/gui.nix index e313117..3b02b39 100644 --- a/modules/nixos/personal/gui.nix +++ b/modules/nixos/personal/gui.nix @@ -48,32 +48,19 @@ in { }; } # fragile conf - (lib.mkIf cfg.i3.enable ( - lib.mkMerge [ - { - services = { - xserver = { - desktopManager.xfce = { - noDesktop = true; - enableXfwm = false; - }; - windowManager.i3.enable = true; - }; + (lib.mkIf cfg.i3.enable { + services = { + displayManager.defaultSession = "xfce+i3"; + libinput.enable = true; + xserver = { + desktopManager.xfce = { + noDesktop = true; + enableXfwm = false; }; - } - ( - let - conf = { - displayManager.defaultSession = "xfce+i3"; - libinput.enable = true; - }; - in - if (builtins.compareVersions lib.trivial.version "23.11" > 0) - then {services = conf;} - else {services.xserver = conf;} - ) - ] - )) + windowManager.i3.enable = true; + }; + }; + }) (lib.mkIf cfg.stylix.enable ({ assertions = let missingArgAssertion = name: { |