added nvim

1 files changed, 64 insertions, 18 deletions

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 28b95cf..46edd7c 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -62,7 +62,7 @@ ZSH_THEME="pygmalion"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git zsh-autosuggestions vi-mode)
+plugins=(git zsh-autosuggestions vi-mode fzf)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -91,11 +91,55 @@ source $ZSH/oh-my-zsh.sh
 
 bindkey '^ ' autosuggest-accept
 
-export KEYTIMEOUT=1
+# ENVIRONMENT VARS
+
+# nnn ENV Vars
+export NNN_BMS='h:~;d:~/Documents;D:~/Downloads;w:~/Downloads/wallpapers'
+export NNN_USE_EDITOR=1
+export NNN_COLORS='2136'
+export LC_COLLATE="C"
+NNN_PLUGS="x:_chmod +x $nnn;\
+          g:_git log;\
+          o:fzopen;\
+          f:fzcd"
+#export NNN_PLUG=`echo $NNN_PLUGS | sed -e 's/;\s*/;/g'`
+export NNN_PLUG="$(echo "$NNN_PLUGS" | sed -e 's/;\s*/;/g')"
+
+
+n ()
+{
+    # Block nesting of nnn in subshells
+    if [ -n $NNNLVL ] && [ "${NNNLVL:-0}" -ge 1 ]; then
+        echo "nnn is already running"
+        return
+    fi
+
+    # The default behaviour is to cd on quit (nnn checks if NNN_TMPFILE is set)
+    # To cd on quit only on ^G, remove the "export" as in:
+    #     NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
+    # NOTE: NNN_TMPFILE is fixed, should not be modified
+    export NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
+
+    # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
+    # stty start undef
+    # stty stop undef
+    # stty lwrap undef
+    # stty lnext undef
+
+    nnn "$@"
+
+    if [ -f "$NNN_TMPFILE" ]; then
+            . "$NNN_TMPFILE"
+            rm -f "$NNN_TMPFILE" > /dev/null
+    fi
+}
+
+[ -n "$NNNLVL" ] && PS1="N$NNNLVL $PS1"
+
 
 
 # Example aliases
-alias v="vim"
+alias v="nvim"
 #alias r="vifm ."
 alias r="ranger"
 alias ls='ls++'
@@ -123,20 +167,22 @@ alias D="cd ~/Downloads && ls -a"
 alias s="cd ~/.config/Scripts && ls -a"
 alias c="cd ~/Dropbox/winter2019 && ls -a"
 alias w="cd ~/Downloads/wallpapers && ls -a"
-alias cfb="vim ~/.bashrc"
-alias cfv="vim ~/.config/Scripts/vimrc"
-alias cfr="vim ~/.config/vifm/vifmrc"
-alias cfR="vim ~/.config/ranger/rc.conf"
-alias cfi="vim ~/.config/i3/config"
-alias cfm="vim ~/.config/mutt/muttrc"
-alias cff="vim ~/.config/Scripts/folders"
-alias cfc="vim ~/.config/Scripts/configs"
-alias cfT="vim ~/.config/Scripts/tmux.conf"
-alias cfa="vim ~/.config/mutt/aliases"
-alias cfp="vim ~/.config/polybar/mybar"
-alias cfs="vim ~/.config/sxhkd/sxhkdrc"
-alias cfsb="vim ~/.config/sxhkd/sxhkdrc_bspwm"
-alias cfB="vim ~/.config/bspwm/bspwmrc"
-alias cfz="vim ~/.zshrc"
+alias cfb="nvim ~/.bashrc"
+alias cfv="nvim ~/.config/nvim/init.vim"
+alias cfr="nvim ~/.config/vifm/vifmrc"
+alias cfR="nvim ~/.config/ranger/rc.conf"
+alias cfi="nvim ~/.config/i3/config"
+alias cfm="nvim ~/.config/mutt/muttrc"
+alias cff="nvim ~/.config/Scripts/folders"
+alias cfc="nvim ~/.config/Scripts/configs"
+alias cfT="nvim ~/.config/Scripts/tmux.conf"
+alias cfa="nvim ~/.config/mutt/aliases"
+alias cfp="nvim ~/.config/polybar/mybar"
+alias cfs="nvim ~/.config/sxhkd/sxhkdrc"
+alias cfsb="nvim ~/.config/sxhkd/sxhkdrc_bspwm"
+alias cfB="nvim ~/.config/bspwm/bspwmrc"
+alias cfz="nvim ~/.zshrc"
 
 alias auto="ssh kdamani@10.65.17.184"
+
+#[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh