From a63b8500667c7aa547ae8982eb5acae619d35423 Mon Sep 17 00:00:00 2001 From: Kyure_A <49436968+Kyure-A@users.noreply.github.com> Date: Tue, 30 Jul 2024 21:59:36 +0900 Subject: [PATCH] sheldon: change mkIf to be enclosed in parentheses --- modules/programs/sheldon.nix | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/modules/programs/sheldon.nix b/modules/programs/sheldon.nix index aaf904e1..d28457f2 100644 --- a/modules/programs/sheldon.nix +++ b/modules/programs/sheldon.nix @@ -47,48 +47,36 @@ in { }; programs.bash.initExtra = builtins.concatStringsSep "\n" [ - mkIf - (cfg.settings != { }) - '' + (mkIf (cfg.settings != { }) '' eval "$(sheldon source)" - '' - mkIf - cfg.enableBashCompletions - '' + '') + (mkIf cfg.enableBashCompletions '' if [[ $TERM != "dumb" ]]; then eval "$(${cmd} completions --shell=bash)" fi - '' + '') ]; programs.zsh.initExtra = builtins.concatStringsSep "\n" [ - mkIf - (cfg.settings != { }) - '' + (mkIf (cfg.settings != { }) '' eval "$(sheldon source)" - '' - mkIf - cfg.enableZshCompletions - '' + '') + (mkIf cfg.enableZshCompletions '' if [[ $TERM != "dumb" ]]; then eval "$(${cmd} completions --shell=zsh)" fi - '' + '') ]; programs.fish.interactiveShellInit = builtins.concatStringsSep "\n" [ - mkIf - (cfg.settings != { }) - '' + (mkIf (cfg.settings != { }) '' eval "$(sheldon source)" - '' - mkIf - cfg.enableFishCompletions - '' + '') + (mkIf cfg.enableFishCompletions '' if test "$TERM" != "dumb" eval "$(${cmd} completions --shell=fish)" end - '' + '') ]; }; }