From aaaf61e69d4255cf107bbbed7eb945578f4f3b22 Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Sat, 20 Mar 2021 17:13:08 -0400 Subject: [PATCH] Remove vim stuff, fix sdkman? --- zsh/zshrc | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/zsh/zshrc b/zsh/zshrc index 6325112..f1786d5 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -113,28 +113,6 @@ function _send_to_pane { } compctl -K _send_to_pane send-to-pane -if [[ -n $TMUX ]]; then - export NVIM_LISTEN_ADDRESS="/tmp/nvim_${USER}_$(tmux display -p '#{session_name}')" -fi - -function nv() { - if [[ ! -z "$TMUX" ]]; then - local ids="$(tmux list-panes -a -F '#{pane_current_command} #{window_id} #{pane_id}' | awk '/^nvim / {print $2" "$3; exit}')" - local window_id="$ids[(w)1]" - local pane_id="$ids[(w)2]" - [[ ! -z "$pane_id" ]] && tmux select-window -t "$window_id" && tmux select-pane -t "$pane_id" - fi - nvr -s $@ -} - -function vim() { - if [[ $(whence -p nvim 2> /dev/null) ]]; then - nvim ${@} - else - /usr/bin/vim ${@} - fi -} - function root() { if [[ -n $(git rev-parse --show-toplevel) ]] then @@ -157,7 +135,7 @@ export PATH ##THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! export SDKMAN_DIR="$HOME/.sdkman" -[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && znap eval sdkman-init "cat $HOME/.sdkman/bin/sdkman-init.sh" +[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && znap eval sdkman-init "cat $HOME/.sdkman/bin/sdkman-init.sh; echo \"echo \"SDKMAN: $SDKMAN_VERSION\"\"" if [[ -a $HOME/.zshsrc ]]; then source $HOME/.zshsrc