From 90491bcf5b1f79e3e5877444bcc74b07ac478742 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sun, 16 Sep 2018 14:19:29 -0700 Subject: [PATCH] [zsh] Fix a bug in zsh vi function --- rc | 10 +++++----- rc.darwin | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/rc b/rc index f251a91..d9fe661 100644 --- a/rc +++ b/rc @@ -45,11 +45,11 @@ function g function vi { - if which nvim 1>/dev/null 2>&1; then + if whence -cp nvim 1>/dev/null 2>&1; then command nvim $@ - elif which vim 1>/dev/null 2>&1; then + elif whence -cp vim 1>/dev/null 2>&1; then command vim $@ - elif which vi 1>/dev/null 2>&1; then + elif whence -cp vi 1>/dev/null 2>&1; then command vi $@ fi } @@ -102,8 +102,8 @@ function configure_ls binary_exists nethack && export NETHACKOPTIONS="color" # Default ledger file -[[ -e "$HOME/Documents/Financial/personal.ledger" ]] && \ - LEDGER_FILE=$HOME/Documents/Financial/personal.ledger +[[ -e "$HOME/Documents/Ledger/personal.ledger" ]] && \ + LEDGER_FILE=$HOME/Documents/Ledger/personal.ledger if [[ -e "$HOME/.rc.$SYS" ]]; then print_info -l 2 "Sourcing $SYS interactive shell setup" diff --git a/rc.darwin b/rc.darwin index 6e348f3..cc45db7 100644 --- a/rc.darwin +++ b/rc.darwin @@ -3,7 +3,6 @@ # Interactive shell setup for Darwin systems # Eryn Wells - alias acls='command ls -le' # These things might have been installed by Homebrew, and I like the GNU versions better.