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

Compare commits

base: mediocregopher:64eb89235d395f711e8e3a5d8e4232d4a57d0900
Branches Tags
mediocregopher:main
..
compare: mediocregopher:8e64d42b7d5deb9e0df4ff4dc00f481b3ceab688
Branches Tags
mediocregopher:main

2 Commits
64eb89235d ... 8e64d42b7d

Author SHA1 Message Date
mediocregopher
8e64d42b7d Add ability to include extra xorg conf from the config 2023-12-17 17:15:50 +01:00
mediocregopher
6ecd5ca8ec Update edge in order to update lagrange, so that .config/lagrange copying works 2023-12-17 15:50:37 +01:00
4 changed files with 17 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
config/default.nix
View File

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

4
pkgs.nix
View File

@ -44,7 +44,7 @@ rec {
edge = mkPkgs (builtins.fetchTarball { edge = mkPkgs (builtins.fetchTarball {
name = "nixpkgs-edge"; name = "nixpkgs-edge";
url = "https://github.com/nixos/nixpkgs/archive/f9418c4c7fab906c52ae07cf27a618de7722d1e9.tar.gz"; url = "https://github.com/nixos/nixpkgs/archive/3ae06c380004ab1bb4146c986f38ed75ac3ec677.tar.gz";
sha256 = "sha256:067m1gzj1n06m3anshwgabd1liaja8gcvd90spmnyi3a6vhqdvq0"; sha256 = "sha256:0x4wjqa78ik21kja5lcy6421jjg7m7pzh2vz582rv646l69a94cl";
}); });
} }

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