diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix
index 08b4101..1e85cce 100644
--- a/modules/home/zsh/default.nix
+++ b/modules/home/zsh/default.nix
@@ -14,10 +14,12 @@ in
       exclude = mkOption {
         type = with types; listOf str;
         default = [
+          "bat"
           "delta"
           "direnv reload"
           "fg"
           "git (?!push|pull|fetch)"
+          "home-manager (?!switch|build|news)"
           "htop"
           "less"
           "man"
diff --git a/pkgs/comma/comma b/pkgs/comma/comma
index 857b9c9..b03a7f2 100755
--- a/pkgs/comma/comma
+++ b/pkgs/comma/comma
@@ -14,7 +14,7 @@ find_program() {
     local CANDIDATE
     CANDIDATE="$(nix-locate --minimal --at-root --whole-name "/bin/$1")"
     if [ "$(printf '%s\n' "$CANDIDATE" | wc -l)" -gt 1 ]; then
-        CANDIDATE="$(printf '%s' "$CANDIDATE" | fzf-tmux)"
+        CANDIDATE="$(printf '%s' "$CANDIDATE" | "${COMMA_PICKER:-fzf-tmux}")"
     fi
     printf '%s' "$CANDIDATE"
 }