merge master

.gitconfig

@@ -12,3 +12,5 @@
         date = format:%Y-%m-%d %H:%M:%S
 [format]
         pretty = format:'%C(yellow)%h %Cred%ad %Cblue%an %Cgreen%d %Creset%s'
+[diff]
+        tool = vimdiff

.tmux.conf

@@ -4,3 +4,10 @@ bind -r h select-pane -L  # move left
 bind -r j select-pane -D  # move down
 bind -r k select-pane -U  # move up
 bind -r l select-pane -R  # move right
+
+#plugin manager for install tmux-resurrect
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+
+# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+run '~/.tmux/plugins/tpm/tpm'

.vimrc

@@ -36,9 +36,9 @@ let g:netrw_altv = 1
 let g:netrw_winsize = 25
 "----airline tabs for buffers-------
 let g:airline#extensions#tabline#enabled = 1
-let g:airline_theme = 'cobalt2'
-let g:tmuxline_powerline_separators = 0
-let g:airline_powerline_fonts = 0
+let g:airline_theme = 'dark'
+let g:tmuxline_powerline_separators = 1
+let g:airline_powerline_fonts = 1
 let mapleader = ";"
 set showcmd
 map <Leader>a :bn<cr>

setup.sh

@@ -30,6 +30,62 @@ do
     ln -s $dir/$file ~/$file
 done
 
+#----------------------------------------------------------install  go and go-powerline--------------------------------------------------------------------
+
+if [ -z "$GOPATH" ]
+then
+    while true; do
+        read -p "do you want to install golang and go-powerline?" yn
+        case $yn in
+            [Yy]* ) 
+                sudo apt-get install golang;
+                go get -u github.com/justjanne/powerline-go;
+                break;;
+            [Nn]* ) 
+                exit;;
+            * ) echo "Please answer yes or no.";;
+        esac
+    done
+fi
+
+#----------------------------------------------------------install power line fonts------------------------------------------------------------------------
+
+if [ ! -d ~/fonts ]
+then
+    while true; do
+        read -p "do you want to install powerline fonts from https://github.com/powerline/fonts?" yn
+        case $yn in
+            [Yy]* ) 
+                git clone https://github.com/powerline/fonts ~/fonts;
+                cd fonts;
+                ./install.sh;
+                break;;
+            [Nn]* ) 
+                exit;;
+            * ) echo "Please answer yes or no.";;
+        esac
+    done
+fi
+
+
+#----------------------------------------------------------install tmux plugin manager and tmux resurrect--------------------------------------------------
+
+if [ ! -d ~/.tmux/plugins/tpm ]
+then
+    while true; do
+        read -p "do you want to install the tmux plugin manager from https://github.com/tmux-plugins/tpm" yn
+        case $yn in
+            [Yy]* ) 
+                git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm;
+                break;;
+            [Nn]* ) 
+                exit;;
+            * ) echo "Please answer yes or no.";;
+        esac
+    done
+fi
+
+
 #----------------------------------------------------------see if Vundle has been cloned yet and do so-----------------------------------------------------
 
 if [ ! -d ~/.vim ]