summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorquentin@aristote.fr <quentin@aristote.fr>2024-04-27 21:54:38 +0200
committerquentin@aristote.fr <quentin@aristote.fr>2024-04-27 21:54:38 +0200
commit84e3b5b66bac0549919336567515c9e87623c38f (patch)
tree13b90889c6bf46594a31cf4dcdd5ce90f177a60c
parent32d87db8e2ab85b6a08964d5490952a00c904edb (diff)
nixos: gui: defaultSession: accomodate for <= 23.11
fix bug introduced in 3dac1b87810540c3dd913a4f60962b1ef3bc5fa2
-rw-r--r--modules/nixos/personal/gui.nix30
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: {