diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2014-11-07 21:21:21 +0100 |
|---|---|---|
| committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2014-11-08 15:25:40 +0100 |
| commit | d6e87f17497a0aa577608a8e33eb8677a9dc461e (patch) | |
| tree | e8d6e7246bce7cbf762eab78a9e1100f46bd46fc /nixos/modules/services/x11/display-managers/default.nix | |
| parent | 647f58bfafc80a972fbadb8fac84baa73261fd69 (diff) | |
| download | nixpkgs-d6e87f17497a0aa577608a8e33eb8677a9dc461e.tar nixpkgs-d6e87f17497a0aa577608a8e33eb8677a9dc461e.tar.gz nixpkgs-d6e87f17497a0aa577608a8e33eb8677a9dc461e.tar.bz2 nixpkgs-d6e87f17497a0aa577608a8e33eb8677a9dc461e.tar.lz nixpkgs-d6e87f17497a0aa577608a8e33eb8677a9dc461e.tar.xz nixpkgs-d6e87f17497a0aa577608a8e33eb8677a9dc461e.tar.zst nixpkgs-d6e87f17497a0aa577608a8e33eb8677a9dc461e.zip | |
Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670
Diffstat (limited to 'nixos/modules/services/x11/display-managers/default.nix')
| -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 899c5a91fb3..6b01cde9e2b 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 |