Merge pull request #4891 from pSub/prefer-xresources

Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670
2014-11-08 19:32:46 +01:00 · 2014-11-08 19:32:46 +01:00 · 9ea81152cc
commit 9ea81152cc
parent fa1cec1037 d6e87f1749
1 changed files with 3 additions and 1 deletions
--- 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