3 files changed, 9 insertions(+), 10 deletions(-)

M nixos/hosts/laptop-iapetus/default.nix
M nixos/hosts/laptop-phobos/default.nix
M nixos/modules/profiles/desktop/default.nix

@@ 82,7 82,7 @@
     auto-cpufreq.enable = true;
     blueman.enable = true;
 
-    xserver.libinput = {
+    libinput = {
       enable = true;
       touchpad = {
         naturalScrolling = true;

@@ 94,16 94,15 @@
 
   services = {
     logind.lidSwitch = "suspend";           # suspend on lid close
-
-    xserver = {
-      libinput = {
-        enable = true;
-        touchpad = {
-          naturalScrolling = true;
-          tapping = true;
-        };
+    libinput = {
+      enable = true;
+      touchpad = {
+        naturalScrolling = true;
+        tapping = true;
       };
+    };
 
+    xserver = {
       videoDrivers = [ "amdgpu" ];
       deviceSection = ''Option "TearFree" "true"'';
     };

@@ 19,6 19,7 @@
     ];
 
     services = {
+      libinput.enable = true;
       xserver = {
         enable = true;
 


@@ 29,7 30,6 @@
           variant = ",qwerty";
           options = "grp:alt_shift_toggle, ctrl:nocaps";
         };
-        libinput.enable = true;
         modules = [ pkgs.xf86_input_wacom ];        # Both needed for wacom tablet usage
         wacom.enable = true;
       };