From f5ac12063b92b1affef6ec8fa399ae8649c502bd Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Sun, 5 May 2024 00:48:23 -0400
Subject: [PATCH] flake: refactor for input bump

---
 modules/global/nix.nix            |  4 ++--
 modules/modules/hardware/form.nix |  2 +-
 modules/modules/locale.nix        | 10 ++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/global/nix.nix b/modules/global/nix.nix
index 00e466c..58095d7 100644
--- a/modules/global/nix.nix
+++ b/modules/global/nix.nix
@@ -2,14 +2,14 @@
 with lib;
 {
   nix = {
-    package = pkgs.nixVersions.unstable;
+    package = pkgs.nixVersions.latest;
 
     settings = {
       allowed-users = [ "*" ];
       trusted-users = [ "root" "@wheel" "remotebuild" ];
 
       system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
-      experimental-features = [ "flakes" "nix-command" "impure-derivations" "no-url-literals" "repl-flake" ];
+      experimental-features = [ "flakes" "nix-command" "impure-derivations" "no-url-literals" ];
 
       auto-optimise-store = true;
       fallback = true;
diff --git a/modules/modules/hardware/form.nix b/modules/modules/hardware/form.nix
index 65d7ff7..03dd0b6 100644
--- a/modules/modules/hardware/form.nix
+++ b/modules/modules/hardware/form.nix
@@ -32,7 +32,7 @@ in
       };
 
       services = {
-        xserver.libinput.touchpad = {
+        libinput.touchpad = {
           clickMethod = "clickfinger";
           naturalScrolling = true;
         };
diff --git a/modules/modules/locale.nix b/modules/modules/locale.nix
index 87c3ef9..4dc8d00 100644
--- a/modules/modules/locale.nix
+++ b/modules/modules/locale.nix
@@ -19,13 +19,11 @@ in
 
   config = {
     console.keyMap = mkDefault cfg.keymap;
-    services.xserver = {
-      xkb = {
-        layout = mkDefault cfg.keymap;
-        options = "compose:ralt";
-      };
-      libinput.enable = true;
+    services.xserver.xkb = {
+      layout = mkDefault cfg.keymap;
+      options = "compose:ralt";
     };
+    services.libinput.enable = true;
 
     i18n.defaultLocale = cfg.locale;