nixos/sddm: replace themes
option with package
option
This commit is contained in:
parent
203c4926e3
commit
a96e047b31
|
@ -202,5 +202,7 @@ with lib;
|
|||
"See the 16.09 release notes for more information.")
|
||||
(mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "")
|
||||
(mkRemovedOptionModule [ "services" "dovecot2" "package" ] "")
|
||||
(mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]
|
||||
"Set the option `services.xserver.displayManager.sddm.package' instead.")
|
||||
];
|
||||
}
|
||||
|
|
|
@ -208,10 +208,7 @@ in
|
|||
|
||||
services.xserver.displayManager.sddm = {
|
||||
theme = "breeze";
|
||||
themes = [
|
||||
plasma5.plasma-workspace
|
||||
pkgs.breeze-icons
|
||||
];
|
||||
package = pkgs.sddmPlasma5;
|
||||
};
|
||||
|
||||
security.pam.services.kde = { allowNullPassword = true; };
|
||||
|
|
|
@ -9,7 +9,7 @@ let
|
|||
cfg = dmcfg.sddm;
|
||||
xEnv = config.systemd.services."display-manager".environment;
|
||||
|
||||
sddm = pkgs.sddm.override { inherit (cfg) themes; };
|
||||
sddm = cfg.package;
|
||||
|
||||
xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
|
||||
#!/bin/sh
|
||||
|
@ -105,11 +105,12 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
themes = mkOption {
|
||||
type = types.listOf types.package;
|
||||
default = [];
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.sddm;
|
||||
description = ''
|
||||
Extra packages providing themes.
|
||||
The SDDM package to install.
|
||||
The default package can be overridden to provide extra themes.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue