mediocregopher/loadout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ability to include extra xorg conf from the config

Browse Source
This commit is contained in:
mediocregopher 2023-12-17 17:15:50 +01:00
parent 6ecd5ca8ec
commit 8e64d42b7d
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/default.nix
View File

@ -26,4 +26,6 @@
}; };
binExtra = []; binExtra = [];
xorgConfExtra = "";
} }

3
x/default.nix
View File

@ -26,11 +26,14 @@
Section "Files" Section "Files"
ModulePath "${innerEnv}/lib/xorg/modules" ModulePath "${innerEnv}/lib/xorg/modules"
EndSection EndSection
${config.xorgConfExtra}
EOF EOF
for f in $(ls ${innerEnv}/share/X11/xorg.conf.d | sort); do for f in $(ls ${innerEnv}/share/X11/xorg.conf.d | sort); do
cat ${innerEnv}/share/X11/xorg.conf.d/"$f" >> "$out" cat ${innerEnv}/share/X11/xorg.conf.d/"$f" >> "$out"
done done
''; '';
startx = pkgs.writeShellScriptBin "startx" '' startx = pkgs.writeShellScriptBin "startx" ''

10
x/xorg.conf
View File

@ -4,3 +4,13 @@ Section "InputClass"
Option "XkbLayout" "us" Option "XkbLayout" "us"
Option "XkbOptions" "caps:swapescape" Option "XkbOptions" "caps:swapescape"
EndSection EndSection
Section "OutputClass"
Identifier "nvidia"
MatchDriver "nvidia-drm"
Driver "nvidia"
Option "AllowEmptyInitialConfiguration"
ModulePath "/usr/lib/nvidia/xorg"
ModulePath "/usr/lib/xorg/modules"
EndSection