Compare commits
No commits in common. "8e64d42b7d5deb9e0df4ff4dc00f481b3ceab688" and "64eb89235d395f711e8e3a5d8e4232d4a57d0900" have entirely different histories.
8e64d42b7d
...
64eb89235d
@ -26,6 +26,4 @@
|
||||
};
|
||||
|
||||
binExtra = [];
|
||||
|
||||
xorgConfExtra = "";
|
||||
}
|
||||
|
4
pkgs.nix
4
pkgs.nix
@ -44,7 +44,7 @@ rec {
|
||||
|
||||
edge = mkPkgs (builtins.fetchTarball {
|
||||
name = "nixpkgs-edge";
|
||||
url = "https://github.com/nixos/nixpkgs/archive/3ae06c380004ab1bb4146c986f38ed75ac3ec677.tar.gz";
|
||||
sha256 = "sha256:0x4wjqa78ik21kja5lcy6421jjg7m7pzh2vz582rv646l69a94cl";
|
||||
url = "https://github.com/nixos/nixpkgs/archive/f9418c4c7fab906c52ae07cf27a618de7722d1e9.tar.gz";
|
||||
sha256 = "sha256:067m1gzj1n06m3anshwgabd1liaja8gcvd90spmnyi3a6vhqdvq0";
|
||||
});
|
||||
}
|
||||
|
@ -26,14 +26,11 @@
|
||||
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" ''
|
||||
|
10
x/xorg.conf
10
x/xorg.conf
@ -4,13 +4,3 @@ 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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user