From 4ecbe74eba37aa1e498e0524c8288bddde5c0cfb Mon Sep 17 00:00:00 2001
From: pSox <psox(at)st8l.com>
Date: Fri, 3 Jul 2020 09:37:06 +0100
Subject: [PATCH] update vim support and upgrade submodules

---
 oh-my-zsh                                  | 2 +-
 tmux/plugins/tpm                           | 2 +-
 zsh-custom/plugins/zsh-completions         | 2 +-
 zsh-custom/plugins/zsh-syntax-highlighting | 2 +-
 zshrc                                      | 5 +++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/oh-my-zsh b/oh-my-zsh
index 06b0276..62648d7 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 06b0276675e978d80535259915fbb44011e10101
+Subproject commit 62648d71bb05116287206d83181f9daa5a59ba67
diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm
index 06d4122..5c4f37a 160000
--- a/tmux/plugins/tpm
+++ b/tmux/plugins/tpm
@@ -1 +1 @@
-Subproject commit 06d41226af02ca4f5bcf58169dd4f0a2aa42218c
+Subproject commit 5c4f37a52d05022d689fb4364a53cfe78d83dc75
diff --git a/zsh-custom/plugins/zsh-completions b/zsh-custom/plugins/zsh-completions
index 41828e2..3b247d3 160000
--- a/zsh-custom/plugins/zsh-completions
+++ b/zsh-custom/plugins/zsh-completions
@@ -1 +1 @@
-Subproject commit 41828e2df4289e325e64f475efbe36e9c9dd7cd6
+Subproject commit 3b247d3071b8f1b723f288aec10e91758a109045
diff --git a/zsh-custom/plugins/zsh-syntax-highlighting b/zsh-custom/plugins/zsh-syntax-highlighting
index f1b9fbb..fb929ed 160000
--- a/zsh-custom/plugins/zsh-syntax-highlighting
+++ b/zsh-custom/plugins/zsh-syntax-highlighting
@@ -1 +1 @@
-Subproject commit f1b9fbbaf0123fb7b14b4a11bc18c86fd4b2305b
+Subproject commit fb929edc30192407a9298aad64f55ca1b19a464e
diff --git a/zshrc b/zshrc
index bdef80b..69c04f9 100755
--- a/zshrc
+++ b/zshrc
@@ -139,7 +139,7 @@ plugins=(
 ( [[ -e /etc/arch-release ]] ) && plugins+=( archlinux )
 ( [[ -e /etc/suse-release ]] ) && plugins+=( suse )
 ( [[ "$(uname)" == "Darwin" ]] ) && plugins+=( osx )
-( which vim 2>/dev/null >/dev/null ) && plugins+=( vim-interaction )
+#( which vim 2>/dev/null >/dev/null ) && plugins+=( vim-interaction )
 ( which ssh 2>/dev/null >/dev/null ) && [[ -d ~/.ssh ]] && plugins+=( ssh-agent )
 plugins+=( 
   zsh-completions
@@ -149,7 +149,7 @@ plugins+=(
   $post_plugins
 )
 
-if [[ "$OSTYPE" == "linux-gnu" || "$OSTYPE" == "darwin17.0.0" || "$OSTYPE" == "cygwin" ]]
+if [[ "$OSTYPE" =~ "linux*" || "$OSTYPE" =~ "darwin*" || "$OSTYPE" == "cygwin" ]]
 then
   export VIMINIT='source $MYVIMRC'
   export MYVIMRC=$PSOXIZSH/vimrc
@@ -221,6 +221,7 @@ alias zshconfig="vim $PSOXIZSH/zshrc"
 alias ohmyzsh="vim $PSOXIZSH/oh-my-zsh"
 alias curlj="curl -H 'Content-Type: application/json' "
 which nvim >/dev/null 2>&1 && alias vim="$(which nvim)"
+alias v=vim
 [[ -x /usr/bin/yay ]] && [[ "$(whoami)" != "pacman" ]] && alias yay='sudo -iupacman /usr/bin/yay'
 
 typeset -A key