From 7c5496c2d676c57b06be330fdb11d59a711177f0 Mon Sep 17 00:00:00 2001
From: Joey Payne <jyapayne@gmail.com>
Date: Tue, 23 Oct 2018 14:03:20 -0600
Subject: [PATCH] Add more tweaks

---
 .bash_aliases |  2 +-
 .tmux.conf    |  3 ++-
 .vimrc        | 28 +++++++++++++++++++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/.bash_aliases b/.bash_aliases
index 9dc9860..8750001 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -32,7 +32,7 @@ alias dc="docker-compose"
 export WINEPREFIX=~/.WineItunes
 export WINEARCH=win32
 
-PS1="\n\[\e[30;01m\](\[\e[31;01m\]\w\[\e[30;01m\])-(\[\e[33;1m\]\$(/bin/ls -1 | /usr/bin/wc -l | /bin/sed 's: ::g') files, \$(/bin/ls -lah | /bin/grep -m 1 total | /bin/sed 's/total //')B\[\e[30;1m\])\[\e[30;1m\]\n\[\e[30;1m\](\[\e[34m\]\$(/bin/date +'%a %b %e %-I:%M:%S %Z %Y')\[\e[30;1m\])\n\[\e[30;1m\](\[\e[32;1m\]\u @ \h\[\e[30;1m\])-> \[\e[0m\]"
+PS1="\n\[\e[30;01m\](\[\e[31;01m\]\w\[\e[30;01m\])\[\e[30;1m\]\n\[\e[30;1m\](\[\e[34m\]\$(/bin/date +'%a %b %e %-I:%M:%S %Z %Y')\[\e[30;1m\])\n\[\e[30;1m\](\[\e[32;1m\]\u @ \h\[\e[30;1m\])-> \[\e[0m\]"
 
 export LANG=en_US.UTF-8
 
diff --git a/.tmux.conf b/.tmux.conf
index 761b4c8..420fb11 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -150,7 +150,7 @@ if -b '! command -v xsel > /dev/null 2>&1 && command -v xclip > /dev/null 2>&1'
 # copy to Windows clipboard
 if -b 'command -v clip.exe > /dev/null 2>&1' 'bind y run -b "tmux save-buffer - | clip.exe"'
 if -b '[ -c /dev/clipboard ]' 'bind y run -b "tmux save-buffer - > /dev/clipboard"'
-
+set -s escape-time 0
 
 # -- buffers -------------------------------------------------------------------
 
@@ -169,6 +169,7 @@ set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin 'tmux-plugins/tmux-copycat'
 set -g @plugin 'nhdaly/tmux-better-mouse-mode'
 set -g @plugin 'christoomey/vim-tmux-navigator'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
 
 # Smart pane switching with awareness of Vim splits.
 # See: https://github.com/christoomey/vim-tmux-navigator
diff --git a/.vimrc b/.vimrc
index 588a2d2..d4dcf43 100644
--- a/.vimrc
+++ b/.vimrc
@@ -19,6 +19,8 @@ augroup Binary
 augroup END
 
 
+set wildmenu
+set wildmode=full
 set shell=/bin/bash\ --login
 set smartindent
 set ruler
@@ -157,6 +159,14 @@ nmap <C-Down> ]e
 vmap <C-Up> [egv
 vmap <C-Down> ]egv
 
+" make escape key not delay
+set timeoutlen=1000 ttimeoutlen=0
+
+" nmap <C-k> [e
+" nmap <C-j> ]e
+vmap <C-k> [egv
+vmap <C-j> ]egv
+
 vnoremap # :s#^#\##<cr>
 vnoremap -# :s#^\###<cr>
 
@@ -172,7 +182,7 @@ endf
 nn <C-g> :call JumpToDef()<cr>
 ino <C-g> <esc>:call JumpToDef()<cr>i
 
-nmap <C-t> :MerlinTypeOf<cr>
+autocmd FileType ocaml nmap <C-t> :MerlinTypeOf<cr>
 
 " replace currently selected text with default register
 " without yanking it
@@ -199,6 +209,22 @@ execute "set rtp+=" . g:opamshare . "/merlin/vim"
 
 au FileType ocaml call SuperTabSetDefaultCompletionType("<c-x><c-o>")
 
+execute "set <A-h>=h"
+execute "set <A-j>=j"
+execute "set <A-k>=k"
+execute "set <A-l>=l"
+
+noremap <A-k> :tabr<cr>
+noremap <A-j> :tabl<cr>
+noremap <A-h> gT
+noremap <A-l> gt
+
+inoremap <A-k> <Esc>:tabr<cr>i
+inoremap <A-j> <Esc>:tabl<cr>i
+inoremap <A-h> <Esc>gTi
+inoremap <A-l> <Esc>gti
+
+
 "set statusline+=%#warningmsg#
 "set statusline+=%{SyntasticStatuslineFlag()}
 "set statusline+=%*