diff options
| author | Michael Peyton Jones <me@michaelpj.com> | 2017-12-11 20:42:00 +0000 |
|---|---|---|
| committer | Michael Peyton Jones <me@michaelpj.com> | 2017-12-11 20:42:00 +0000 |
| commit | 638d24950dabafd6221a1c015df0db568c1ece5c (patch) | |
| tree | 815da0ba474bc677d98190d7ed6512c4f67caa5b | |
| parent | 3eccd0b11d176489d69c778f2fcb544438f3ab56 (diff) | |
| download | nixpkgs-638d24950dabafd6221a1c015df0db568c1ece5c.tar nixpkgs-638d24950dabafd6221a1c015df0db568c1ece5c.tar.gz nixpkgs-638d24950dabafd6221a1c015df0db568c1ece5c.tar.bz2 nixpkgs-638d24950dabafd6221a1c015df0db568c1ece5c.tar.lz nixpkgs-638d24950dabafd6221a1c015df0db568c1ece5c.tar.xz nixpkgs-638d24950dabafd6221a1c015df0db568c1ece5c.tar.zst nixpkgs-638d24950dabafd6221a1c015df0db568c1ece5c.zip | |
plymouth: add breeze-plymouth as default theme
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 10 | ||||
| -rw-r--r-- | nixos/modules/system/boot/plymouth.nix | 9 |
2 files changed, 7 insertions, 12 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index bb4f4e868fe..685a93d952b 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -193,16 +193,6 @@ in theme = mkDefault "breeze"; }; - boot.plymouth = { - theme = mkDefault "breeze"; - themePackages = mkDefault [ - (pkgs.breeze-plymouth.override { - nixosBranding = true; - nixosVersion = config.system.nixosRelease; - }) - ]; - }; - security.pam.services.kde = { allowNullPassword = true; }; # Doing these one by one seems silly, but we currently lack a better diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 4b0c498424b..e78fdf1311d 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -8,9 +8,14 @@ let cfg = config.boot.plymouth; + breezePlymouth = pkgs.breeze-plymouth.override { + nixosBranding = true; + nixosVersion = config.system.nixosRelease; + }; + themesEnv = pkgs.buildEnv { name = "plymouth-themes"; - paths = [ plymouth ] ++ cfg.themePackages; + paths = [ plymouth breezePlymouth ] ++ cfg.themePackages; }; configFile = pkgs.writeText "plymouthd.conf" '' @@ -38,7 +43,7 @@ in }; theme = mkOption { - default = "fade-in"; + default = "breeze"; type = types.str; description = '' Splash screen theme. |