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:
parent
8970bed250
commit
e4facfab9a
6 changed files with 13 additions and 13 deletions
|
@ -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;
|
||||
};
|
||||
|
|
|
@ -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;
|
||||
});
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ in
|
|||
BATDIFF_USE_DELTA = "true";
|
||||
};
|
||||
|
||||
programs.fish = lib.mkIf config.programs.fish.enable {
|
||||
programs.fish = {
|
||||
functions = {
|
||||
cat = {
|
||||
wraps = "bat";
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -17,7 +17,7 @@ in
|
|||
neo
|
||||
];
|
||||
|
||||
programs.fish.functions = mkIf config.programs.fish.enable {
|
||||
programs.fish.functions = {
|
||||
neo = {
|
||||
wraps = "neo";
|
||||
body = # fish
|
||||
|
|
Loading…
Reference in a new issue