Add some shell completions

home-manager/bash.nix

@@ -121,6 +121,8 @@
 
         source "${pkgs.fzf-git-sh}/share/fzf-git-sh/fzf-git.sh"
         source "${pkgs.podman}/share/bash-completion/completions/podman"
+        source "${pkgs.zellij}/share/bash-completion/completions/zellij.bash"
+        source "${homemade-pkgs.cargo-make-completions}/share/bash-completion/completions/makers-completion.bash"
 
         source "${../dependencies/dprint/completions.bash}"
         source "${../dependencies/goldwarden/completions.bash}"

home-manager/zsh.nix

@@ -139,6 +139,9 @@
     completionInit = ''
       # `autoload` enable to use compinit
       autoload -Uz compinit && _compinit_with_interval
+      # for cargo-make
+      # AFAIK, it does not take path options. And fast for now, so needless to be cached
+      autoload -U +X bashcompinit && bashcompinit
     '';
 
     # Setting bindkey
@@ -203,6 +206,52 @@
 
       source "${pkgs.fzf-git-sh}/share/fzf-git-sh/fzf-git.sh"
       source "${pkgs.podman}/share/zsh/site-functions/_podman"
+      # cargo-make recommends to use bash completions for zsh
+      source "${homemade-pkgs.cargo-make-completions}/share/bash-completion/completions/makers-completion.bash"
+
+      # fzf completions are also possible to be used in bash, but it overrides default completions with the registering
+      # So currently injecting only in zsh
+
+      _fzf_complete_zellij() {
+        local -r subcmd=''${1#* }
+        if [[ "$subcmd" == kill-session* ]]; then
+          _fzf_complete --multi --reverse --prompt="zellij(active)> " --ansi --nth 1 -- "$@" < <(
+            ${lib.getExe pkgs.zellij} list-sessions | ${lib.getExe pkgs.ripgrep} --invert-match --fixed-strings -e 'EXITED'
+          )
+        else
+          _fzf_complete --multi --reverse --prompt="zellij> " --ansi --nth 1 -- "$@" < <(
+            ${lib.getExe pkgs.zellij} list-sessions
+          )
+        fi
+      }
+
+      _fzf_complete_zellij_post() {
+        ${lib.getBin pkgs.coreutils}/bin/cut --delimiter=' ' --fields=1
+      }
+
+      # Do not use absolute path for makers to respect current version in each repository
+      # No need adding for `cargo-make`, it requires subcommand as `cargo-make make`. I'm avoiding the style
+      _fzf_complete_makers() {
+        _fzf_complete --multi --reverse --prompt="makers> " --nth 1 -- "$@" < <(
+          # Don't use `--output-format autocomplete`, it truncates task description
+          makers --list-all-steps | ${lib.getExe pkgs.ripgrep} --regexp='^\w+ -'
+        )
+      }
+
+      _fzf_complete_makers_post() {
+        ${lib.getBin pkgs.coreutils}/bin/cut --delimiter=' ' --fields=1
+      }
+
+      # Do not use absolute path for go-task to respect current version in each repository
+      _fzf_complete_task() {
+        _fzf_complete --multi --reverse --prompt="task> " -- "$@" < <(
+          task --list-all | ${lib.getExe pkgs.ripgrep} --regexp='^\* (.+)' --replace='$1'
+        )
+      }
+
+      _fzf_complete_task_post() {
+        ${lib.getExe pkgs.ripgrep} --regexp='(\S+?): ' --replace='$1'
+      }
 
       source "${../dependencies/dprint/completions.zsh}"
       source "${../dependencies/goldwarden/completions.zsh}"

pkgs/cargo-make-completions/default.nix

@@ -0,0 +1,31 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  installShellFiles,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cargo-make-completions";
+  version = "0.37.16";
+
+  src = fetchFromGitHub {
+    owner = "sagiegurari";
+    repo = "cargo-make";
+    rev = version;
+    hash = "sha256-OC1HzoEb9OyusYGC5jmEC4qW4U3oGApYvpy5XkZttSg=";
+  };
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  installPhase = ''
+    installShellCompletion extra/shell/*.bash
+  '';
+
+  meta = with lib; {
+    description = "cargo-make shell completions which missing in nixpkgs";
+    homepage = "https://github.com/sagiegurari/cargo-make";
+    license = licenses.asl20;
+    platforms = platforms.all;
+  };
+}

pkgs/default.nix

@@ -62,6 +62,8 @@
   micro-kdl = pkgs.callPackage ./micro-kdl { };
   micro-nordcolors = pkgs.callPackage ./micro-nordcolors { };
 
+  cargo-make-completions = pkgs.callPackage ./cargo-make-completions { };
+
   kdl-vim = pkgs.callPackage ./kdl.vim { };
 
   nix-hash-url = pkgs.callPackage ./nix-hash-url { };

pkgs/posix_shared_functions/default.nix

@@ -8,6 +8,9 @@
 # - Prefer `fname() {}` style: https://unix.stackexchange.com/a/73854
 # - Do not add shebang and options. It means you shouldn't select `writeShellApplication` here
 #
+# NOTE: You should remember difference of bash and zsh for the arguments handling in completions
+# https://rcmdnk.com/blog/2015/05/15/computer-linux-mac-zsh/
+#
 # How to stop blinking cursor in Linux console?
 # => https://web-archive-org.translate.goog/web/20220318101402/https://nutr1t07.github.io/post/disable-cursor-blinking-on-linux-console/?_x_tr_sl=auto&_x_tr_tl=ja&_x_tr_hl=ja
 let
@@ -35,6 +38,17 @@ pkgs.writeText "posix_shared_functions.sh" (
       cd "$(${pkgs.coreutils}/bin/mktemp --directory)"
     }
 
+    cdnix() {
+      if [ $# -lt 1 ]; then
+        echo "Specify Nix injected command you want to dive"
+        return 2
+      fi
+      # TODO: Check exit code and Nix or not
+      local -r command="$(command -v "$1")"
+      # shellcheck disable=SC2164
+      cd "$(${pkgs.coreutils}/bin/dirname "$(${pkgs.coreutils}/bin/dirname "$(${pkgs.coreutils}/bin/readlink --canonicalize "$command")")")"
+    }
+
     gch() {
       fc -nrl 1 | ${lib.getExe fzf-bind-posix-shell-history-to-git-commit-message}
     }

pkgs/posix_shared_functions/non_nix.bash

@@ -1,23 +1,15 @@
-cdnix() {
-	if [ $# -lt 1 ]; then
-		echo "Specify Nix injected command you want to dive"
-		return 2
-	fi
-	# TODO: Check exit code and Nix or not
-	local -r command="$(command -v "$1")"
-	# shellcheck disable=SC2164
-	cd "$(dirname "$(dirname "$(readlink --canonicalize "$command")")")"
+# Actually this file is not a bash script, but dash mode is unuseful. Expecting mostly bash code will work even in zsh...
+
+disable_blinking_cursor() {
+	echo -en '\033[?16;5;140c'
 }
 
 cdwin() {
 	if ! command -v wslpath &>/dev/null; then
+		# TODO: Consider inject only in WSL environment
 		echo "This command works only in WSL2"
 	fi
 
 	# shellcheck disable=SC2164
 	cd "$(wslpath "$1")"
 }
-
-disable_blinking_cursor() {
-	echo -en '\033[?16;5;140c'
-}

treefmt.toml

@@ -34,7 +34,13 @@ includes = ["*.go"]
 
 [formatter.shfmt]
 command = "shfmt"
-options = ["--language-dialect", "bash", "--write"]
+options = [
+  "--language-dialect",
+  # shfmt is not supporting zsh even through specified "auto"
+  # https://github.com/mvdan/sh/issues/120
+  "bash",
+  "--write",
+]
 includes = ["*.sh", "*.bash", "*.envrc"]
 
 [formatter.stylua]