summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2020-01-23 02:54:48 +0100
committerSilvan Mosberger <contact@infinisil.com>2020-01-23 05:01:39 +0100
commit78d83650df6e6fbb0f94749787b89817c4269c8b (patch)
tree0496eb9b8d8194f38c68078030855eba4b345172 /nixos
parent7a7b8d904bf82b2dc5949dc7927818f7208ffc47 (diff)
downloadnixpkgs-78d83650df6e6fbb0f94749787b89817c4269c8b.tar
nixpkgs-78d83650df6e6fbb0f94749787b89817c4269c8b.tar.gz
nixpkgs-78d83650df6e6fbb0f94749787b89817c4269c8b.tar.bz2
nixpkgs-78d83650df6e6fbb0f94749787b89817c4269c8b.tar.lz
nixpkgs-78d83650df6e6fbb0f94749787b89817c4269c8b.tar.xz
nixpkgs-78d83650df6e6fbb0f94749787b89817c4269c8b.tar.zst
nixpkgs-78d83650df6e6fbb0f94749787b89817c4269c8b.zip
nixos/desktop-manager: Don't fall back to black background
Previously if ~/.background-image wasn't present, the background would
be set to black, which would override what the user could
set in e.g. services.xserver.windowManager.i3.extraSessionCommands
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/desktop-managers/default.nix3
1 files changed, 0 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 281e91e4013..ea6aac9f6c9 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -74,9 +74,6 @@ in
           + optionalString (needBGCond d) ''
             if [ -e $HOME/.background-image ]; then
               ${pkgs.feh}/bin/feh --bg-${cfg.wallpaper.mode} ${optionalString cfg.wallpaper.combineScreens "--no-xinerama"} $HOME/.background-image
-            else
-              # Use a solid black background as fallback
-              ${pkgs.xorg.xsetroot}/bin/xsetroot -solid black
             fi
           '';
         });