diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2020-02-27 14:43:29 -0800 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2020-02-27 14:43:29 -0800 |
| commit | 0b67340fd2fe9330d8487491e1983ad1a111fb2b (patch) | |
| tree | fe9cdff80e98deced5c63e79110593d430802adb /plugins/fzf/fzf.plugin.zsh | |
| parent | 93a2003db7738e2255a4589ef2073df1be34fe02 (diff) | |
| parent | 2b499e1a9e8788d607768ecef67851e8234b72b3 (diff) | |
| download | zsh-0b67340fd2fe9330d8487491e1983ad1a111fb2b.tar.gz zsh-0b67340fd2fe9330d8487491e1983ad1a111fb2b.tar.bz2 zsh-0b67340fd2fe9330d8487491e1983ad1a111fb2b.zip | |
Merge branch 'master' of https://github.com/ohmyzsh/ohmyzsh
Diffstat (limited to 'plugins/fzf/fzf.plugin.zsh')
| -rw-r--r-- | plugins/fzf/fzf.plugin.zsh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh index c8aefd7ab..53bdcbc97 100644 --- a/plugins/fzf/fzf.plugin.zsh +++ b/plugins/fzf/fzf.plugin.zsh @@ -10,6 +10,7 @@ function setup_using_base_dir() { if [[ -z "${fzf_base}" ]]; then fzfdirs=( "${HOME}/.fzf" + "${HOME}/.nix-profile/share/fzf" "/usr/local/opt/fzf" "/usr/share/fzf" "/usr/local/share/examples/fzf" @@ -31,8 +32,8 @@ function setup_using_base_dir() { fi if [[ -d "${fzf_base}" ]]; then - # Fix fzf shell directory for Archlinux package - if [[ ! -d "${fzf_base}/shell" ]] && [[ -f /etc/arch-release ]]; then + # Fix fzf shell directory for Arch Linux, NixOS or Void Linux packages + if [[ ! -d "${fzf_base}/shell" ]]; then fzf_shell="${fzf_base}" else fzf_shell="${fzf_base}/shell" |