Merge pull request #32578 from michaelpj/imp/plymouth-theme-defaut

plymouth: add breeze-plymouth as default theme
This commit is contained in:
Orivej Desh 2017-12-15 20:20:24 +00:00 committed by GitHub
commit b256afac58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 12 deletions

View file

@ -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

View file

@ -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.