punkfairie/marleyos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(home): Remove unneccesary mkIfs

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/home/options/my/default.nix
View file

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

16
modules/home/options/theme/default.nix
View file

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

2
modules/home/programs/bat/default.nix
View file

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

2
modules/home/programs/figlet/default.nix
View file

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

2
modules/home/programs/git/default.nix
View file

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

2
modules/home/programs/neo/default.nix
View file

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