refactor(desktop): use optional instead of mkIf in firefox and media-player modules
This commit is contained in:
parent
88f0db3425
commit
4a50de5eed
2 changed files with 7 additions and 17 deletions
|
@ -2,7 +2,7 @@
|
|||
let
|
||||
inherit (lib)
|
||||
mkEnableOption
|
||||
mkIf
|
||||
optional
|
||||
singleton
|
||||
;
|
||||
cfg = config.desktop.browser.firefox;
|
||||
|
@ -10,11 +10,9 @@ in
|
|||
{
|
||||
options.desktop.browser.firefox.enable = mkEnableOption "";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home-manager.sharedModules = singleton {
|
||||
persistDirs = singleton ".mozilla/firefox";
|
||||
programs.firefox.enable = true;
|
||||
stylix.targets.firefox.colorTheme.enable = true;
|
||||
};
|
||||
config.home-manager.sharedModules = optional cfg.enable {
|
||||
persistDirs = singleton ".mozilla/firefox";
|
||||
programs.firefox.enable = true;
|
||||
stylix.targets.firefox.colorTheme.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,22 +5,14 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib)
|
||||
mkEnableOption
|
||||
mkIf
|
||||
mkMerge
|
||||
singleton
|
||||
;
|
||||
inherit (lib) mkEnableOption optional singleton;
|
||||
inherit (pkgs) vlc;
|
||||
cfg = config.desktop.media-player;
|
||||
addToHome = condition: attrs: mkIf condition { home-manager.sharedModules = singleton attrs; };
|
||||
in
|
||||
{
|
||||
options.desktop.media-player = {
|
||||
vlc.enable = mkEnableOption "";
|
||||
};
|
||||
|
||||
config = mkMerge [
|
||||
(addToHome cfg.vlc.enable { home.packages = singleton vlc; })
|
||||
];
|
||||
config.home-manager.sharedModules = optional cfg.vlc.enable { home.packages = singleton vlc; };
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue