From abfc68ac8f5fa9ee066a2d3c0ccd792f04bc380a Mon Sep 17 00:00:00 2001
From: Kyure_A <49436968+Kyure-A@users.noreply.github.com>
Date: Tue, 30 Jul 2024 21:29:22 +0900
Subject: [PATCH] sheldon: fix how commands are combined

---
 modules/programs/sheldon.nix | 63 ++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/modules/programs/sheldon.nix b/modules/programs/sheldon.nix
index a87634ac..e44f11f6 100644
--- a/modules/programs/sheldon.nix
+++ b/modules/programs/sheldon.nix
@@ -46,28 +46,49 @@ in {
       source = tomlFormat.generate "sheldon-config" cfg.settings;
     };
 
-    programs.bash.initExtra = mkIf (cfg.settings != { }) ''
-      eval "$(sheldon source)"
-    '' + mkIf cfg.enableBashCompletions ''
-      if [[ $TERM != "dumb" ]]; then
-         eval "$(${cmd} completions --shell=bash)"
-      fi
-    '';
+    programs.bash.initExtra = concatStringsSep "\n" [
+      mkIf
+      (cfg.settings != { })
+      ''
+        eval "$(sheldon source)"
+      ''
+      mkIf
+      cfg.enableBashCompletions
+      ''
+        if [[ $TERM != "dumb" ]]; then
+           eval "$(${cmd} completions --shell=bash)"
+        fi
+      ''
+    ];
 
-    programs.zsh.initExtra = mkIf (cfg.settings != { }) ''
-      eval "$(sheldon source)"
-    '' + mkIf cfg.enableZshCompletions ''
-      if [[ $TERM != "dumb" ]]; then
-         eval "$(${cmd} completions --shell=zsh)"
-      fi
-    '';
+    programs.zsh.initExtra = concatStringsSep "\n" [
+      mkIf
+      (cfg.settings != { })
+      ''
+        eval "$(sheldon source)"
+      ''
+      mkIf
+      cfg.enableZshCompletions
+      ''
+        if [[ $TERM != "dumb" ]]; then
+           eval "$(${cmd} completions --shell=zsh)"
+        fi
+      ''
+    ];
 
-    programs.fish.interactiveShellInit = mkIf (cfg.settings != { }) ''
-      eval "$(sheldon source)"
-    '' + mkIf cfg.enableFishCompletions ''
-      if test "$TERM" != "dumb"
-         eval "$(${cmd} completions --shell=fish)"
-      end
-    '';
+    programs.fish.interactiveShellInit = concatStringsSep "\n" [
+      mkIf
+      (cfg.settings != { })
+      ''
+        eval "$(sheldon source)"
+      ''
+      mkIf
+      cfg.enableFishCompletions
+      ''
+        if test "$TERM" != "dumb"
+           eval "$(${cmd} completions --shell=fish)"
+        end
+      ''
+    ];
   };
 }