fix(home): Remove unneccesary mkIfs

Don't need to check if the module is enabled for settings within that
module.... they won't be applied if it's not enabled by default
This commit is contained in:
punkfairie 2024-11-23 15:15:30 -08:00
parent 8970bed250
commit e4facfab9a
Signed by: punkfairie
GPG key ID: A509E8F77FB9D696
6 changed files with 13 additions and 13 deletions

View file

@ -64,7 +64,7 @@ in
home.username = mkDefault cfg.name;
programs.git = mkIf config.programs.git.enable {
programs.git = {
userName = mkDefault cfg.git.name;
userEmail = mkDefault cfg.git.email;
};

View file

@ -139,19 +139,19 @@ in
# icons
(mkIf (cfg.icons != null) {
gtk = mkIf config.gtk.enable (mkDefault {
gtk = mkDefault {
iconTheme = {
inherit (cfg.icons) name;
package = mkIf (cfg.icons.package != null) cfg.icons.package;
};
});
};
services.dunst = mkIf config.services.dunst.enable (mkDefault {
services.dunst = mkDefault {
iconTheme = {
inherit (cfg.icons) name;
package = mkIf (cfg.icons.package != null) cfg.icons.package;
};
});
};
})
# pinentry
@ -160,13 +160,13 @@ in
cfg.pinentry
];
programs.rbw = mkIf config.programs.rbw.enable (mkDefault {
programs.rbw = mkDefault {
settings.pinentry = cfg.pinentry;
});
};
services.gpg-agent = mkIf config.services.gpg-agent.enable (mkDefault {
services.gpg-agent = mkDefault {
pinentryPackage = cfg.pinentry;
});
};
})
];
}

View file

@ -34,7 +34,7 @@ in
BATDIFF_USE_DELTA = "true";
};
programs.fish = lib.mkIf config.programs.fish.enable {
programs.fish = {
functions = {
cat = {
wraps = "bat";

View file

@ -17,7 +17,7 @@ in
marleyos.figlet-xero-fonts
];
programs.fish.functions = lib.mkIf config.programs.fish.enable {
programs.fish.functions = {
figlet = {
wraps = "figlet";
body = # fish

View file

@ -192,7 +192,7 @@ in
g = "git";
};
programs.fish.functions = lib.mkIf config.programs.fish.enable {
programs.fish.functions = {
git_develop_branch = # fish
''
command git rev-parse --git-dir &>/dev/null || return

View file

@ -17,7 +17,7 @@ in
neo
];
programs.fish.functions = mkIf config.programs.fish.enable {
programs.fish.functions = {
neo = {
wraps = "neo";
body = # fish