From 7d0ca9f0dc9e3794edec9894ff5a021000ed3dc3 Mon Sep 17 00:00:00 2001
From: aristote <quentin.aristote@irif.fr>
Date: Mon, 29 Apr 2024 13:55:09 +0200
Subject: nixos: services.xserver.libinput -> services.libinput

---
 modules/nixos/personal/gui.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'modules/nixos/personal')

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;}
         )
       ]
     ))
-- 
cgit v1.2.3