diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-22 07:39:50 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-22 07:44:55 -0500 |
| commit | a96e047b31ca1f64cd80301f520471f4fd8de854 (patch) | |
| tree | 75acd16b127003de4f3c1e06ce3c075ce10c8b88 /nixos | |
| parent | 203c4926e3251c91299eb122d48d250e5232ba9a (diff) | |
| download | nixlib-a96e047b31ca1f64cd80301f520471f4fd8de854.tar nixlib-a96e047b31ca1f64cd80301f520471f4fd8de854.tar.gz nixlib-a96e047b31ca1f64cd80301f520471f4fd8de854.tar.bz2 nixlib-a96e047b31ca1f64cd80301f520471f4fd8de854.tar.lz nixlib-a96e047b31ca1f64cd80301f520471f4fd8de854.tar.xz nixlib-a96e047b31ca1f64cd80301f520471f4fd8de854.tar.zst nixlib-a96e047b31ca1f64cd80301f520471f4fd8de854.zip | |
nixos/sddm: replace `themes` option with `package` option
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/rename.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/sddm.nix | 11 |
3 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 7b75ca85219c..d9d399e3481d 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -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.") ]; } diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index e3fc3340c953..918841e8f168 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -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; }; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 6630b8257e4e..affc1261d196 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -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. ''; }; |