From e9376727205a888806104f20eaeb812d19d84e0c Mon Sep 17 00:00:00 2001
From: Brian Picciano <me@mediocregopher.com>
Date: Sat, 6 Jan 2024 15:43:21 +0100
Subject: [PATCH] Fix input drivers on ubuntu

---
 awesome/default.nix | 7 ++++---
 config/default.nix  | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/awesome/default.nix b/awesome/default.nix
index 758d74c..3c47017 100644
--- a/awesome/default.nix
+++ b/awesome/default.nix
@@ -11,13 +11,14 @@
     name = "xorg-inner-env";
     paths = [
       pkgs.xorg.xorgserver
-      pkgs.xorg.xf86inputlibinput
 
       (pkgs.runCommand "xorg-conf-inner" {} ''
          mkdir -p "$out"/share/X11/xorg.conf.d/
          cp ${./xorg.conf} "$out"/share/X11/xorg.conf.d/99-loadout.conf
        '')
-    ];
+    ] ++ (
+       config.awesome.xorgInputDrivers pkgs
+    );
   };
 
   xorgConf = pkgs.runCommand "xorg-conf" {} ''
@@ -26,7 +27,7 @@ Section "Files"
     ModulePath "${xorgInnerEnv}/lib/xorg/modules"
 EndSection
 
-${config.xorgConfExtra}
+${config.awesome.xorgConfExtra}
 EOF
 
     for f in $(ls ${xorgInnerEnv}/share/X11/xorg.conf.d | sort); do
diff --git a/config/default.nix b/config/default.nix
index b2ff1e5..7ae8fd8 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -10,6 +10,10 @@
 
   awesome = {
     startupExtra = "";
+    xorgConfExtra = "";
+    xorgInputDrivers = pkgs: [
+      pkgs.xorg.xf86inputlibinput
+    ];
   };
 
   alacritty = {
@@ -26,6 +30,4 @@
   };
 
   binExtra = [];
-
-  xorgConfExtra = "";
 }