From b7998f82d1942a7041b6695c39904ad0cbca3dd9 Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Sat, 10 Jan 2015 23:20:42 -0500
Subject: [PATCH] Made some neat changes. Sync only runs git if command exists,
 same with zsh

---
 scripts/sync.sh         | 26 +++++++++++++++-----------
 shells/zshrc            |  1 +
 tmux/tmux.conf          |  2 +-
 vim/vimrc               |  8 +++++---
 vimperator/vimperatorrc |  3 ++-
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/scripts/sync.sh b/scripts/sync.sh
index 42539da..141a3a1 100755
--- a/scripts/sync.sh
+++ b/scripts/sync.sh
@@ -47,9 +47,9 @@ while getopts ":hbsdpcw" VALUE "$@"; do
   if [ "$VALUE" = "c" ] ; then
     echo "Syncing config files"
     if which trash >/dev/null; then
-      trash ~/.gitconfig ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.bashrc ~/.pylintrc ~/.zshrc ~/.tmux.conf ~/.config/synapse/gtkrc
+      trash ~/.gitconfig ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.bashrc ~/.pylintrc ~/.zshrc ~/.tmux.conf ~/.config/synapse/gtkrc ~/.config/liquidpromptrc
     else
-      rm ~/.gitconfig ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.bashrc ~/.pylintrc ~/.zshrc ~/.tmux.conf ~/.config/synapse/gtkrc
+      rm ~/.gitconfig ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.bashrc ~/.pylintrc ~/.zshrc ~/.tmux.conf ~/.config/synapse/gtkrc ~/.config/liquidpromptrc
     fi
     # Install on all systems
     ln -s $ABSPATH/tmux/tmux.conf ~/.tmux.conf
@@ -59,16 +59,20 @@ while getopts ":hbsdpcw" VALUE "$@"; do
     ln -s $ABSPATH/vimperator/vimPgray.vimp ~/.vimperator/colors/vimPgray.vimp
     ln -s $ABSPATH/git/gitconfig ~/.gitconfig
     ln -s $ABSPATH/shells/bashrc ~/.bashrc
-    ln -s $ABSPATH/shells/zshrc ~/.zshrc
-    if [ ! -d ~/.fzf ] ; then
-      git clone https://github.com/stonewareslord/fzf.git ~/.fzf
-      ~/.fzf/install -y
+    if which git >/dev/null; then
+      if which zsh >/dev/null; then
+        ln -s $ABSPATH/shells/zshrc ~/.zshrc
+        if [ ! -d ~/.antigen ] ; then
+          git clone https://github.com/zsh-users/antigen ~/.antigen
+        fi
+        # Install antigen bundles
+        zsh -c "source ~/.zshrc;exit"
+      fi
+      if [ ! -d ~/.fzf ] ; then
+        git clone https://github.com/stonewareslord/fzf.git ~/.fzf
+        ~/.fzf/install -y
+      fi
     fi
-    if [ ! -d ~/.antigen ] ; then
-      git clone https://github.com/zsh-users/antigen ~/.antigen
-    fi
-    # Install antigen bundles
-    zsh -c "source ~/.zshrc;exit"
     mkdir -p ~/.config
     ln -s $ABSPATH/shells/liquidpromptrc ~/.config/liquidpromptrc
     if [ "$(uname)" != "Darwin" ]; then
diff --git a/shells/zshrc b/shells/zshrc
index 5afa585..78ac246 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -109,6 +109,7 @@ alias -s docx="libreoffice"
 alias -g F='`fzf --no-mouse -m -1 -x`'
 alias -g nify=" > /dev/null 2>&1 &"
 alias -g nifyd=" > /dev/null 2>&1 & disown"
+alias -g L="2>&1|less"
 alias -g G='|& egrep -i'
 alias -g AW='austenwares.com'
 export FZF_COMPLETION_OPTS='--no-mouse -m -1 -x'
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index fdf6d7d..1eaf201 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -31,7 +31,7 @@ bind-key F5 source ~/.tmux.conf
 bind-key x detach
 bind-key -n M-Space new-window \; rename-window "-"
 bind-key -n M-[ previous-window
-bind-key -n M-S-] break-pane
+# bind-key -n M-S-] break-pane
 bind-key -n M-] next-window
 bind-key -n M-f resize-pane -Z
 
diff --git a/vim/vimrc b/vim/vimrc
index 72cabe2..8908cf6 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -119,7 +119,7 @@ nnoremap <Down> <C-w>W
 nnoremap <Left> :bp<CR>
 nnoremap <Right> :bn<CR>
 nnoremap <C-w>z <C-w>_<C-w>\|
-nnoremap <Leader>bun G?Plugin<CR>yyjp$hdi'"+gP0Wl3d/\/<CR>xjyyP$"+gp<Esc>:nohlsearch<CR>:up<CR>:PluginInstall
+nnoremap <Leader>bun G?Plug <CR>yyjp$hdi'"+gP0Wl3d/\/<CR>xjyyP$"+gp<Esc>:nohlsearch<CR>:up<CR>:PluginInstall
 nnoremap <Leader><C-p> :CtrlPFunky<CR>
 nnoremap <F2> :set invpaste<CR>
 nnoremap <C-Up> [e
@@ -323,9 +323,11 @@ Plug 'Rykka/colorv.vim'
 Plug 'mhinz/vim-signify'
   "Git information inline | https://github.com/mhinz/vim-signify
 Plug 'jamessan/vim-gnupg'
-  " | https://github.com/jamessan/vim-gnupg
+  "GPG support | https://github.com/jamessan/vim-gnupg
 Plug 'stonewareslord/zeavim.vim'
-  " | 
+  "Zeal support | 
+Plug 'vim-scripts/DirDiff.vim'
+  "Directory diff | https://github.com/vim-scripts/DirDiff.vim
   "DO NOT DELETE LINE ABOVE OR \bun WILL BREAK
 call plug#end()
 filetype plugin indent on
diff --git a/vimperator/vimperatorrc b/vimperator/vimperatorrc
index e159003..f0ce2ac 100644
--- a/vimperator/vimperatorrc
+++ b/vimperator/vimperatorrc
@@ -24,7 +24,8 @@ inoremap <C-H> <Home>
 inoremap <C-b> <C-Left>
 inoremap <C-w> <C-Right>
 inoremap <C-d><C-d> <Home><S-End><BS>
-inoremap <C-a> <End><S-Home>
+inoremap <C-a> i<C-a>
+noremap <Leader><Leader> gi !gi <CR>
 vnoremap L $
 vnoremap H ^
 "set animations=true