dotfiles

commit 269b747d3c0eb7b85cfdf599cdc0725e366c252e
parent a62afdfe323fc3e5f0249f032d82a94887004459
Author: Chris Bracken <chris@bracken.jp>
Date:   Fri,  3 Nov 2023 15:52:03 -0700

Clean up zsh functions fpath

Previously these were defined in a mix of .zshenv and .zshrc but
completions are only useful in interactive sessions, so this moves
everything to .zshrc.

This also adds quoting and uses zsh array notation.

Diffstat:
M
.config/zsh/.zshenv
 | 
3
---
M
.config/zsh/.zshrc
 | 
2
+-
R
.config/zsh/zfunc/_cargo -> .config/zsh/site-functions/_cargo
 | 
0

3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
@@ -28,9 +28,6 @@ fi
 # Set location for remainder of zsh config files to avoid cluttering $HOME.
 export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
 
-# Add zsh completions directory.
-export FPATH="$ZDOTDIR/zfunc:$FPATH"
-
 # Basics
 export EDITOR=vim
 export PAGER=less
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
@@ -17,7 +17,7 @@ bindkey '^Y' push-line
 bindkey '^R' history-incremental-search-backward
 
 # Add zsh completion definition dirs.
-fpath=($HOME/.local/zsh/site-functions $fpath)
+fpath=("$HOME/.local/zsh/site-functions" "$ZDOTDIR/site-functions" "${fpath[@]}")
 
 # Specify where compinstall writes cfg commands. Default, but saves checks.
 zstyle ':compinstall' filename "$HOME/.zshrc"
diff --git a/.config/zsh/zfunc/_cargo b/.config/zsh/site-functions/_cargo