Fix input drivers on ubuntu

This commit is contained in:
Brian Picciano 2024-01-06 15:43:21 +01:00
parent 570561ac73
commit e937672720
2 changed files with 8 additions and 5 deletions

View File

@ -11,13 +11,14 @@
name = "xorg-inner-env"; name = "xorg-inner-env";
paths = [ paths = [
pkgs.xorg.xorgserver pkgs.xorg.xorgserver
pkgs.xorg.xf86inputlibinput
(pkgs.runCommand "xorg-conf-inner" {} '' (pkgs.runCommand "xorg-conf-inner" {} ''
mkdir -p "$out"/share/X11/xorg.conf.d/ mkdir -p "$out"/share/X11/xorg.conf.d/
cp ${./xorg.conf} "$out"/share/X11/xorg.conf.d/99-loadout.conf cp ${./xorg.conf} "$out"/share/X11/xorg.conf.d/99-loadout.conf
'') '')
]; ] ++ (
config.awesome.xorgInputDrivers pkgs
);
}; };
xorgConf = pkgs.runCommand "xorg-conf" {} '' xorgConf = pkgs.runCommand "xorg-conf" {} ''
@ -26,7 +27,7 @@ Section "Files"
ModulePath "${xorgInnerEnv}/lib/xorg/modules" ModulePath "${xorgInnerEnv}/lib/xorg/modules"
EndSection EndSection
${config.xorgConfExtra} ${config.awesome.xorgConfExtra}
EOF EOF
for f in $(ls ${xorgInnerEnv}/share/X11/xorg.conf.d | sort); do for f in $(ls ${xorgInnerEnv}/share/X11/xorg.conf.d | sort); do

View File

@ -10,6 +10,10 @@
awesome = { awesome = {
startupExtra = ""; startupExtra = "";
xorgConfExtra = "";
xorgInputDrivers = pkgs: [
pkgs.xorg.xf86inputlibinput
];
}; };
alacritty = { alacritty = {
@ -26,6 +30,4 @@
}; };
binExtra = []; binExtra = [];
xorgConfExtra = "";
} }