diff options
| author | Domen Kožar <domen@dev.si> | 2014-11-08 19:32:46 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-11-08 19:32:46 +0100 |
| commit | 9ea81152ccdbdcd001a6652fb334d443bb2764ef (patch) | |
| tree | 0372752e1ab8b9dcfaf544e0beb98b29b3058ae1 /nixos | |
| parent | fa1cec1037d0dfe419ddb77341c46e5b19f09f30 (diff) | |
| parent | d6e87f17497a0aa577608a8e33eb8677a9dc461e (diff) | |
| download | nixlib-9ea81152ccdbdcd001a6652fb334d443bb2764ef.tar nixlib-9ea81152ccdbdcd001a6652fb334d443bb2764ef.tar.gz nixlib-9ea81152ccdbdcd001a6652fb334d443bb2764ef.tar.bz2 nixlib-9ea81152ccdbdcd001a6652fb334d443bb2764ef.tar.lz nixlib-9ea81152ccdbdcd001a6652fb334d443bb2764ef.tar.xz nixlib-9ea81152ccdbdcd001a6652fb334d443bb2764ef.tar.zst nixlib-9ea81152ccdbdcd001a6652fb334d443bb2764ef.zip | |
Merge pull request #4891 from pSub/prefer-xresources
Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 899c5a91fb33..6b01cde9e2b4 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -79,7 +79,9 @@ let ''} # Load X defaults. - if test -e ~/.Xdefaults; then + if test -e ~/.Xresources; then + ${xorg.xrdb}/bin/xrdb -merge ~/.Xresources + elif test -e ~/.Xdefaults; then ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults fi |