From 26d72aa6864d659b5471d61949e5500141c0770f Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Fri, 20 Sep 2024 18:03:26 -0700 Subject: [PATCH] Adds a bunch of fixes. --- .rc.d/aliases.sh | 0 .rc.d/cargo.sh | 0 .rc.d/fzf.sh | 4 +++- .rc.d/fzf.sh.disabled | 16 ++++++++++++++++ .rc.d/icu.sh | 0 .rc.d/iterm2.sh | 0 .rc.d/ls-colors.sh | 0 .rc.d/nvm.sh | 2 +- .rc.d/qb64.sh | 0 .rc.d/yarn.sh | 2 +- .rc.d/zoxide.sh | 5 +++-- .rc.d/zsh-completions.sh | 0 12 files changed, 24 insertions(+), 5 deletions(-) mode change 100644 => 100755 .rc.d/aliases.sh mode change 100644 => 100755 .rc.d/cargo.sh mode change 100644 => 100755 .rc.d/fzf.sh create mode 100755 .rc.d/fzf.sh.disabled mode change 100644 => 100755 .rc.d/icu.sh mode change 100644 => 100755 .rc.d/iterm2.sh mode change 100644 => 100755 .rc.d/ls-colors.sh mode change 100644 => 100755 .rc.d/qb64.sh mode change 100644 => 100755 .rc.d/yarn.sh mode change 100644 => 100755 .rc.d/zoxide.sh mode change 100644 => 100755 .rc.d/zsh-completions.sh diff --git a/.rc.d/aliases.sh b/.rc.d/aliases.sh old mode 100644 new mode 100755 diff --git a/.rc.d/cargo.sh b/.rc.d/cargo.sh old mode 100644 new mode 100755 diff --git a/.rc.d/fzf.sh b/.rc.d/fzf.sh old mode 100644 new mode 100755 index fd57a83..c8b2aa7 --- a/.rc.d/fzf.sh +++ b/.rc.d/fzf.sh @@ -11,4 +11,6 @@ # To use fzf in Vim, add the following line to your .vimrc: # set rtp+=/opt/homebrew/opt/fzf -source <(fzf --zsh) +if [ -x "$(which fzf)" ]; then + source <(fzf --zsh) +fi diff --git a/.rc.d/fzf.sh.disabled b/.rc.d/fzf.sh.disabled new file mode 100755 index 0000000..c8b2aa7 --- /dev/null +++ b/.rc.d/fzf.sh.disabled @@ -0,0 +1,16 @@ +# To set up shell integration, add this to your shell configuration file: +# # bash +# eval "$(fzf --bash)" + +# # zsh +# source <(fzf --zsh) + +# # fish +# fzf --fish | source + +# To use fzf in Vim, add the following line to your .vimrc: +# set rtp+=/opt/homebrew/opt/fzf + +if [ -x "$(which fzf)" ]; then + source <(fzf --zsh) +fi diff --git a/.rc.d/icu.sh b/.rc.d/icu.sh old mode 100644 new mode 100755 diff --git a/.rc.d/iterm2.sh b/.rc.d/iterm2.sh old mode 100644 new mode 100755 diff --git a/.rc.d/ls-colors.sh b/.rc.d/ls-colors.sh old mode 100644 new mode 100755 diff --git a/.rc.d/nvm.sh b/.rc.d/nvm.sh index 6e00b8a..345a1c4 100755 --- a/.rc.d/nvm.sh +++ b/.rc.d/nvm.sh @@ -1,5 +1,5 @@ function { - $nvm_dir="$HOME/.nvm" + local nvm_dir="$HOME/.nvm" if [ -d $nvm_dir ]; then [ -s $nvm_dir/nvm.sh ] && \. $nvm_dir/nvm.sh # This loads nvm diff --git a/.rc.d/qb64.sh b/.rc.d/qb64.sh old mode 100644 new mode 100755 diff --git a/.rc.d/yarn.sh b/.rc.d/yarn.sh old mode 100644 new mode 100755 index 12b3191..95c4723 --- a/.rc.d/yarn.sh +++ b/.rc.d/yarn.sh @@ -1,6 +1,6 @@ function { if [[ $(command -v yarn) ]]; then local yarn_path="$(yarn global bin)" - $path=($yarn_path $path) + path=($yarn_path $path) fi } diff --git a/.rc.d/zoxide.sh b/.rc.d/zoxide.sh old mode 100644 new mode 100755 index 376b8db..5f15bf2 --- a/.rc.d/zoxide.sh +++ b/.rc.d/zoxide.sh @@ -1,9 +1,10 @@ # TODO: Check if zoxide_path exists. # TODO: Check shell better. +# -n $zoxide_path -a -n $zoxide_path function { zoxide_path=$(which zoxide) - if [ -n $zoxide_path -a ( $zoxide_path != "zoxide not found" ) ]; - if [ "$SHELL" = "/bin/zsh"]; then + if [ -n $zoxide_path -a $zoxide_path != "zoxide not found" ]; then + if [ "$SHELL" = "/bin/zsh" ]; then eval "$(zoxide init --cmd cd zsh)" fi fi diff --git a/.rc.d/zsh-completions.sh b/.rc.d/zsh-completions.sh old mode 100644 new mode 100755