From 63bf9d1456239a06b47a58819155037f52737871 Mon Sep 17 00:00:00 2001
From: Frantisek Bohacek <rutherther@proton.me>
Date: Fri, 3 May 2024 18:47:26 +0200
Subject: [PATCH] chore: move renamed options

---
 nixos/hosts/laptop-iapetus/default.nix     |  2 +-
 nixos/hosts/laptop-phobos/default.nix      | 15 +++++++--------
 nixos/modules/profiles/desktop/default.nix |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/hosts/laptop-iapetus/default.nix b/nixos/hosts/laptop-iapetus/default.nix
index ec13370..a5a05cd 100644
--- a/nixos/hosts/laptop-iapetus/default.nix
+++ b/nixos/hosts/laptop-iapetus/default.nix
@@ -82,7 +82,7 @@
     auto-cpufreq.enable = true;
     blueman.enable = true;
 
-    xserver.libinput = {
+    libinput = {
       enable = true;
       touchpad = {
         naturalScrolling = true;
diff --git a/nixos/hosts/laptop-phobos/default.nix b/nixos/hosts/laptop-phobos/default.nix
index 01dfe77..fdaeda4 100644
--- a/nixos/hosts/laptop-phobos/default.nix
+++ b/nixos/hosts/laptop-phobos/default.nix
@@ -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"'';
     };
diff --git a/nixos/modules/profiles/desktop/default.nix b/nixos/modules/profiles/desktop/default.nix
index fec2571..810ce89 100644
--- a/nixos/modules/profiles/desktop/default.nix
+++ b/nixos/modules/profiles/desktop/default.nix
@@ -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;
       };
-- 
2.48.1