summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/nixos/personal/gui.nix14
1 files changed, 10 insertions, 4 deletions
diff --git a/modules/nixos/personal/gui.nix b/modules/nixos/personal/gui.nix
index bfb6185..52e5713 100644
--- a/modules/nixos/personal/gui.nix
+++ b/modules/nixos/personal/gui.nix
@@ -43,11 +43,11 @@ in {
};
};
# Hardware
- libinput.enable = true;
xkb.layout = config.personal.hardware.keyboard.keyMap;
autoRepeatDelay = 200;
};
}
+ # fragile conf
(lib.mkIf cfg.i3.enable (
lib.mkMerge [
{
@@ -62,9 +62,15 @@ in {
};
}
(
- if (builtins.compareVersions lib.trivial.version "23.11" > 0)
- then {services.displayManager.defaultSession = "xfce+i3";}
- else {services.xserver.displayManager.defaultSession = "xfce+i3";}
+ 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;}
)
]
))