diff --git a/config/default.nix b/config/default.nix index 2e50b3e..b2ff1e5 100644 --- a/config/default.nix +++ b/config/default.nix @@ -26,4 +26,6 @@ }; binExtra = []; + + xorgConfExtra = ""; } diff --git a/x/default.nix b/x/default.nix index 1807368..b6d8f98 100644 --- a/x/default.nix +++ b/x/default.nix @@ -26,11 +26,14 @@ Section "Files" ModulePath "${innerEnv}/lib/xorg/modules" EndSection + +${config.xorgConfExtra} EOF for f in $(ls ${innerEnv}/share/X11/xorg.conf.d | sort); do cat ${innerEnv}/share/X11/xorg.conf.d/"$f" >> "$out" done + ''; startx = pkgs.writeShellScriptBin "startx" '' diff --git a/x/xorg.conf b/x/xorg.conf index 04f72e6..18d2cea 100644 --- a/x/xorg.conf +++ b/x/xorg.conf @@ -4,3 +4,13 @@ Section "InputClass" Option "XkbLayout" "us" Option "XkbOptions" "caps:swapescape" EndSection + +Section "OutputClass" + Identifier "nvidia" + MatchDriver "nvidia-drm" + Driver "nvidia" + Option "AllowEmptyInitialConfiguration" + ModulePath "/usr/lib/nvidia/xorg" + ModulePath "/usr/lib/xorg/modules" +EndSection +