From 15119a0e0fc2b35141678683a3ca2965572cff5b Mon Sep 17 00:00:00 2001
From: Evan Reichard <evan.reichard@expel.io>
Date: Fri, 1 Jan 2021 20:31:52 -0500
Subject: [PATCH] Update dotfiles

---
 .bashrc  | 22 ++++++++++++++--------
 .inputrc |  6 ++++++
 .vimrc   | 35 +++++++++++++++++++++++++++--------
 3 files changed, 47 insertions(+), 16 deletions(-)
 create mode 100644 .inputrc

diff --git a/.bashrc b/.bashrc
index 72c109e..584b070 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,9 +1,16 @@
+if [ -e /Users/evanreichard/.nix-profile/etc/profile.d/nix.sh ]; then . /Users/evanreichard/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
+
+# ------------------------------------------------------------------------------
+# ---------------------------------- VI MODE -----------------------------------
+# ------------------------------------------------------------------------------
+set -o vi
+
 # ------------------------------------------------------------------------------
 # ---------------------------------- ALIASES -----------------------------------
 # ------------------------------------------------------------------------------
-alias grep="grep --color"
-alias vim="/Applications/MacVim.app/Contents/bin/mvim -v"
 alias vi="/Applications/MacVim.app/Contents/bin/mvim -v"
+alias vim="/Applications/MacVim.app/Contents/bin/mvim -v"
+alias grep="grep --color"
 alias urldecode='python -c "import sys, urllib as ul; \
   print ul.unquote_plus(sys.argv[1])"'
 alias urlencode='python -c "import sys, urllib as ul; \
@@ -24,12 +31,11 @@ function cache {
     fi
     cat ~/.bash-cache/$name.out
 }
+
 function sfind(){
     find . -name "$1" -print0 | xargs -0 grep "$2"
 }
-function phow(){
-    curl https://cht.sh/$1/$2?Q
-}
+
 function csv2mdt(){
     cat $1 | sed 1p | LC_ALL=C sed -e 's/,/ |\&nbsp\;\&nbsp\; /g' -e 's/^/| /g' -e 's/$/ |/g' -e '2 s/[^|]/-/g' | LC_ALL=C tr -d $'\r'
 }
@@ -37,9 +43,9 @@ function csv2mdt(){
 # ------------------------------------------------------------------------------
 # ---------------------------------- EXPORTS -----------------------------------
 # ------------------------------------------------------------------------------
-export PATH=$HOME/.local/bin:$HOME/Library/Python/3.7/bin:$HOME/Library/Python/2.7/bin:/opt/local/bin:/opt/local/sbin:$PATH
-export TERM=xterm-256color
+export PATH=$HOME/.local/bin:$PATH
 export KUBE_EDITOR="/Applications/MacVim.app/Contents/bin/mvim -v"
+export NIX_PYTHONPATH=$(python3 -c "import sys; print(sys.base_prefix)")
 
 # ------------------------------------------------------------------------------
 # --------------------------------- POWERLINE ----------------------------------
@@ -47,7 +53,7 @@ export KUBE_EDITOR="/Applications/MacVim.app/Contents/bin/mvim -v"
 powerline-daemon -q
 POWERLINE_BASH_CONTINUATION=1
 POWERLINE_BASH_SELECT=1
-. /Users/evanreichard/Library/Python/2.7/lib/python/site-packages/powerline/bindings/bash/powerline.sh
+. $HOME/.local/lib/python2.7/site-packages/powerline/bindings/bash/powerline.sh
 
 # ------------------------------------------------------------------------------
 # ------------------------------ TMUX & NEOFETCH -------------------------------
diff --git a/.inputrc b/.inputrc
new file mode 100644
index 0000000..7ffe57a
--- /dev/null
+++ b/.inputrc
@@ -0,0 +1,6 @@
+set show-mode-in-prompt on
+# set vi-cmd-mode-string "\1\e[1;48;5;246;38;5;237m\2 CMD \1\e[48;5;239;38;5;246m\2\1\e[0m\2"
+# set vi-ins-mode-string "\1\e[1;48;5;109;38;5;237m\2 INS \1\e[48;5;239;38;5;109m\2\1\e[0m\2"
+
+set vi-ins-mode-string \1\e[48;5;117;1m\2 INS \1\e[38;5;117;48;5;31;1m\2\1\e[0m\2
+set vi-cmd-mode-string \1\e[48;5;166;1m\2 CMD \1\e[38;5;166;48;5;31;1m\2\1\e[0m\2
diff --git a/.vimrc b/.vimrc
index 1f2a2de..0d6f372 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,4 +1,10 @@
-set nocompatible
+" Python Settings - Needed for Nix Python
+set pythondll=$HOME/.nix-profile/bin/python3
+set pythonhome=$NIX_PYTHONPATH
+set pythonthreedll=$HOME/.nix-profile/bin/python3
+set pythonthreehome=$NIX_PYTHONPATH
+
+" Vundle & Plugins
 set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
 Plugin 'ctrlp.vim'
@@ -7,26 +13,37 @@ Plugin 'VundleVim/Vundle.vim'
 Plugin 'Valloric/YouCompleteMe'
 Plugin 'chrisbra/csv.vim'
 Plugin 'dracula/vim'
-Bundle 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
+Bundle 'powerline/powerline', {'rtp': 'powerline/bindings/vim/'}
 Plugin 'psf/black'
 call vundle#end()
 
+" filetype off
+filetype plugin indent on
+
 " Highlight IP Addresses
 syn match ipaddr /\(\(25\_[0-5]\|2\_[0-4]\_[0-9]\|\_[01]\?\_[0-9]\_[0-9]\?\)\.\)\{3\}\(25\_[0-5]\|2\_[0-4]\_[0-9]\|\_[01]\?\_[0-9]\_[0-9]\?\)/
 hi link ipaddr Identifier
 
-" Theme
-" color dracula
-
 " Powerline
 set laststatus=2
 set t_Co=256
 let g:Powerline_symbols = "fancy"
 
+" Disable Modeline
+set modelines=0
+set nomodeline
+
+" Set Mouse Select & Scroll
+set mouse=a
+
+" MiniBufExpl
+let g:miniBufExplMapWindowNavVim = 1
+let g:miniBufExplMapWindowNavArrows = 1
+let g:miniBufExplMapCTabSwitchBufs = 1
+let g:miniBufExplModSelTarget = 1
+
 " Turn syntax highlighting on
 syntax on
-" filetype off
-filetype plugin indent on
 " No line wrapping
 set nowrap
 " Line numbers
@@ -37,6 +54,8 @@ set hlsearch
 set backspace=2
 " Disable swap files (no recovery if you dont save!)
 set noswapfile
+" Set vertical red line at the 80 char column
+" set colorcolumn=80
 " Set tab = 4 spaces
 set tabstop=4
 " Addects >> << ++ and automatic indentation
@@ -62,8 +81,8 @@ let b:csv_arrange_align = 'l*'
 let g:netrw_banner = 0
 let g:netrw_liststyle = 4
 let g:netrw_chgwin = 2
-
 let g:netrw_browse_split = 3
+
 " remap shift-enter to fire up the sidebar
 " the same remap as above - may be necessary in some distros
 nnoremap <silent> <C-M> :leftabove 25vs<CR>:e .<CR>