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

nixos/sddm: replace `themes` option with `package` option

This commit is contained in:
Thomas Tuegel 2017-03-22 07:39:50 -05:00
parent 203c4926e3
commit a96e047b31
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/rename.nix
View File

@ -202,5 +202,7 @@ with lib;
"See the 16.09 release notes for more information.") "See the 16.09 release notes for more information.")
(mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "") (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "")
(mkRemovedOptionModule [ "services" "dovecot2" "package" ] "") (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "")
(mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]
"Set the option `services.xserver.displayManager.sddm.package' instead.")
]; ];
} }

5
nixos/modules/services/x11/desktop-managers/plasma5.nix
View File

@ -208,10 +208,7 @@ in
services.xserver.displayManager.sddm = { services.xserver.displayManager.sddm = {
theme = "breeze"; theme = "breeze";
themes = [ package = pkgs.sddmPlasma5;
plasma5.plasma-workspace
pkgs.breeze-icons
];
}; };
security.pam.services.kde = { allowNullPassword = true; }; security.pam.services.kde = { allowNullPassword = true; };

11
nixos/modules/services/x11/display-managers/sddm.nix
View File

@ -9,7 +9,7 @@ let
cfg = dmcfg.sddm; cfg = dmcfg.sddm;
xEnv = config.systemd.services."display-manager".environment; xEnv = config.systemd.services."display-manager".environment;
sddm = pkgs.sddm.override { inherit (cfg) themes; }; sddm = cfg.package;
xserverWrapper = pkgs.writeScript "xserver-wrapper" '' xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
#!/bin/sh #!/bin/sh
@ -105,11 +105,12 @@ in
''; '';
}; };
themes = mkOption { package = mkOption {
type = types.listOf types.package; type = types.package;
default = []; default = pkgs.sddm;
description = '' description = ''
Extra packages providing themes. The SDDM package to install.
The default package can be overridden to provide extra themes.
''; '';
}; };