diff options
| author | aristote <quentin.aristote@irif.fr> | 2024-04-29 13:55:09 +0200 |
|---|---|---|
| committer | aristote <quentin.aristote@irif.fr> | 2024-04-29 13:55:09 +0200 |
| commit | 7d0ca9f0dc9e3794edec9894ff5a021000ed3dc3 (patch) | |
| tree | e0421f9d291bf057511c2e177e288c280efe9c61 /modules/nixos/personal/gui.nix | |
| parent | fa49ea3826bb4d0fb9967a4184a96e106bcdbb29 (diff) | |
nixos: services.xserver.libinput -> services.libinput
Diffstat (limited to 'modules/nixos/personal/gui.nix')
| -rw-r--r-- | modules/nixos/personal/gui.nix | 14 |
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;} ) ] )) |