From 61658f1654db7a270322a026c2e207699a4b3346 Mon Sep 17 00:00:00 2001
From: Daniel Patterson <me@danielpatterson.dev>
Date: Thu, 16 May 2024 21:55:08 +0100
Subject: [PATCH] fix

---
 hosts/common/graphical/default.nix     | 15 +++++++--------
 hosts/pingbox/configuration.nix        | 11 +++++------
 users/configs/desktop/sway/default.nix |  4 ++--
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/hosts/common/graphical/default.nix b/hosts/common/graphical/default.nix
index 5ed1b61..fcc3537 100644
--- a/hosts/common/graphical/default.nix
+++ b/hosts/common/graphical/default.nix
@@ -66,6 +66,13 @@
 
   services = {
     gnome.gnome-keyring.enable = true;
+    libinput = {
+      enable = true;
+      mouse = {
+        accelProfile = "flat";
+        accelSpeed = "1";
+      };
+    };
 
     pipewire = {
       enable = true;
@@ -95,14 +102,6 @@
       enable = true;
       xkb.layout = "gb";
 
-      libinput = {
-        enable = true;
-        mouse = {
-          accelProfile = "flat";
-          accelSpeed = "1";
-        };
-      };
-
       displayManager = {
         gdm = {
           enable = true;
diff --git a/hosts/pingbox/configuration.nix b/hosts/pingbox/configuration.nix
index a93b66e..88ff8fc 100644
--- a/hosts/pingbox/configuration.nix
+++ b/hosts/pingbox/configuration.nix
@@ -47,6 +47,11 @@
         PCIE_ASPM_ON_BAT = "powersupersave";
       };
     };
+    libinput.touchpad = {
+      naturalScrolling = true;
+      horizontalScrolling = false;
+      tapping = true;
+    };
 
     xserver = {
       dpi = 144;
@@ -56,12 +61,6 @@
         Option "DRI" "2"
         Option "TearFree" "true"
       '';
-
-      libinput.touchpad = {
-        naturalScrolling = true;
-        horizontalScrolling = false;
-        tapping = true;
-      };
     };
 
     logind = {
diff --git a/users/configs/desktop/sway/default.nix b/users/configs/desktop/sway/default.nix
index 58a2dc5..bef0fa8 100644
--- a/users/configs/desktop/sway/default.nix
+++ b/users/configs/desktop/sway/default.nix
@@ -26,8 +26,8 @@ in {
       input = {
         "*" = {
           xkb_layout = "gb";
-          xkb_options= "caps:escape";
-        }
+          xkb_options = "caps:escape";
+        };
       };
       output = {
         eDP-1 = {