From dd5cbd0ac4707b3cef237a09d8ab525bbdaca8d4 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Mon, 4 Jul 2022 23:28:38 -0400
Subject: [PATCH] refactor(locale,form): enable libinput globally

---
 modules/modules/hardware/form.nix | 9 +++------
 modules/modules/locale.nix        | 1 +
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/modules/hardware/form.nix b/modules/modules/hardware/form.nix
index a75d635..a8f556b 100644
--- a/modules/modules/hardware/form.nix
+++ b/modules/modules/hardware/form.nix
@@ -30,12 +30,9 @@ in
       };
 
       services = {
-        xserver.libinput = {
-          enable = true;
-          touchpad = {
-            clickMethod = "clickfinger";
-            naturalScrolling = true;
-          };
+        xserver.libinput.touchpad = {
+          clickMethod = "clickfinger";
+          naturalScrolling = true;
         };
 
         logind.lidSwitch = mkDefault "ignore";
diff --git a/modules/modules/locale.nix b/modules/modules/locale.nix
index a560109..41bf86c 100644
--- a/modules/modules/locale.nix
+++ b/modules/modules/locale.nix
@@ -22,6 +22,7 @@ in
     services.xserver = {
       layout = mkDefault cfg.keymap;
       xkbOptions = "compose:ralt";
+      libinput.enable = true;
     };
 
     i18n.defaultLocale = cfg.locale;