rrvsh/pantheon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(desktop): use optional instead of mkIf in firefox and media-player modules

Browse source
This commit is contained in:
Mohammad Rafiq 2025-06-14 15:16:04 +08:00
parent 88f0db3425
commit 4a50de5eed
No known key found for this signature in database
2 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/nixos/desktop/browser/firefox/default.nix
View file

@ -2,7 +2,7 @@
let let
inherit (lib) inherit (lib)
mkEnableOption mkEnableOption
mkIf optional
singleton singleton
; ;
cfg = config.desktop.browser.firefox; cfg = config.desktop.browser.firefox;
@ -10,11 +10,9 @@ in
{ {
options.desktop.browser.firefox.enable = mkEnableOption ""; options.desktop.browser.firefox.enable = mkEnableOption "";
config = mkIf cfg.enable { config.home-manager.sharedModules = optional cfg.enable {
home-manager.sharedModules = singleton {
persistDirs = singleton ".mozilla/firefox"; persistDirs = singleton ".mozilla/firefox";
programs.firefox.enable = true; programs.firefox.enable = true;
stylix.targets.firefox.colorTheme.enable = true; stylix.targets.firefox.colorTheme.enable = true;
}; };
};
} }

12
modules/nixos/desktop/media-player/default.nix
View file

@ -5,22 +5,14 @@
... ...
}: }:
let let
inherit (lib) inherit (lib) mkEnableOption optional singleton;
mkEnableOption
mkIf
mkMerge
singleton
;
inherit (pkgs) vlc; inherit (pkgs) vlc;
cfg = config.desktop.media-player; cfg = config.desktop.media-player;
addToHome = condition: attrs: mkIf condition { home-manager.sharedModules = singleton attrs; };
in in
{ {
options.desktop.media-player = { options.desktop.media-player = {
vlc.enable = mkEnableOption ""; vlc.enable = mkEnableOption "";
}; };
config = mkMerge [ config.home-manager.sharedModules = optional cfg.vlc.enable { home.packages = singleton vlc; };
(addToHome cfg.vlc.enable { home.packages = singleton vlc; })
];
} }