public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/desktop-managers: Remove needBGPackages thing

Browse Source 
This value isn't used since 71a8dbb956f5735030cd3982263d72f1bffdae23
This commit is contained in:
Silvan Mosberger 2020-01-23 02:24:16 +01:00
parent 764aba4c1b
commit 7a7b8d904b
No known key found for this signature in database
GPG Key ID: E8F1E9EAD284E17D
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nixos/modules/services/x11/desktop-managers/default.nix
View File

@ -68,21 +68,18 @@ in
scripts before forwarding the value to the scripts before forwarding the value to the
<varname>displayManager</varname>. <varname>displayManager</varname>.
''; '';
apply = list: { apply = map (d: d // {
list = map (d: d // { manage = "desktop";
manage = "desktop"; start = d.start
start = d.start + optionalString (needBGCond d) ''
+ optionalString (needBGCond d) '' if [ -e $HOME/.background-image ]; then
if [ -e $HOME/.background-image ]; then ${pkgs.feh}/bin/feh --bg-${cfg.wallpaper.mode} ${optionalString cfg.wallpaper.combineScreens "--no-xinerama"} $HOME/.background-image
${pkgs.feh}/bin/feh --bg-${cfg.wallpaper.mode} ${optionalString cfg.wallpaper.combineScreens "--no-xinerama"} $HOME/.background-image else
else # Use a solid black background as fallback
# Use a solid black background as fallback ${pkgs.xorg.xsetroot}/bin/xsetroot -solid black
${pkgs.xorg.xsetroot}/bin/xsetroot -solid black fi
fi '';
''; });
}) list;
needBGPackages = [] != filter needBGCond list;
};
}; };
default = mkOption { default = mkOption {
@ -100,5 +97,5 @@ in
}; };
config.services.xserver.displayManager.session = cfg.session.list; config.services.xserver.displayManager.session = cfg.session;
} }