Commit 41b8a3b3f487

Vincent Demeester <vincent@sbr.pm>
2026-02-23 11:05:47
fix(lazyworktree): source per-shell function files
Changed from functions.shell (no longer exists) to functions.zsh and functions.bash to match upstream package layout.
main
1 parent cd9bcdb
Changed files (1)
home
modules
lazyworktree.nix
home/modules/lazyworktree.nix
@@ -54,10 +54,15 @@ in
   config = mkIf cfg.enable {
     programs =
       let
-        # Source upstream shell functions from the package
-        sourceUpstream = ''
+        # Source upstream shell functions from the package (per-shell)
+        sourceUpstreamZsh = ''
           # lazyworktree shell integration
-          source ${cfg.package}/share/lazyworktree/functions.shell
+          source ${cfg.package}/share/lazyworktree/functions.zsh
+        '';
+
+        sourceUpstreamBash = ''
+          # lazyworktree shell integration
+          source ${cfg.package}/share/lazyworktree/functions.bash
         '';
 
         # Alias definitions that wrap worktree_jump
@@ -176,12 +181,12 @@ in
       in
       {
         bash.initExtra = mkIf cfg.enableBashIntegration ''
-          ${sourceUpstream}
+          ${sourceUpstreamBash}
           ${aliasDefinitions}
         '';
 
         zsh.initContent = mkIf cfg.enableZshIntegration ''
-          ${sourceUpstream}
+          ${sourceUpstreamZsh}
           ${aliasDefinitions}
           ${zshAliasCompletions}
           ${dynamicAliasesSetup}