dotfiles

commit 723e03df4549442a528fdfe9a231266c055dddbc
parent 7a701e4425ed7c99e90c822ef56c540b21c16112
Author: Ed van Bruggen <edvb54@gmail.com>
Date:   Thu, 24 Mar 2016 22:12:23 -0700

Merge

Diffstat:
bashrc
 | 
7
-------
vim/bundle/Vundle.vim
 | 
2
+-
vim/bundle/neocomplete.vim
 | 
2
+-
vim/bundle/tmux-complete.vim
 | 
2
+-
vim/bundle/vim-buftabline
 | 
2
+-
vim/bundle/vim-commentary
 | 
2
+-
vim/bundle/vim-easy-align
 | 
2
+-
vim/bundle/vim-endwise
 | 
2
+-
vim/bundle/vim-fugitive
 | 
2
+-
vim/bundle/vim-gitgutter
 | 
2
+-
vim/bundle/vim-polyglot
 | 
2
+-
vim/bundle/vim-repeat
 | 
2
+-
vim/bundle/vim-signature
 | 
2
+-
vim/bundle/vim-sleuth
 | 
2
+-
vim/bundle/vim-surround
 | 
2
+-
vim/bundle/vim-tmux-navigator
 | 
2
+-
vim/bundle/vim-unimpaired
 | 
2
+-
vimrc
 | 
3
+++

18 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/bashrc b/bashrc
@@ -68,19 +68,12 @@ PS2='\[${White}\]\$\[${Color_Off}\] '
 
 # basic {{{1
 export EDITOR='vim'
-# export EDITOR='emacs'
-
-export gh='https://github.com'
-export ghed='https://github.com/edvb54'
 
 # allow for color support in terminal
 if [ "$TERM" == "xterm" ]; then
     export TERM=xterm-256color
 fi
 
-# update TMUX if ssh'ed into computer in TMUX
-# [[ -z "$TMUX" ]] && exec tmux -2
-
 # load other files
 source ~/bin/ED.sh
 source ~/bin/checkium.sh
diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim
@@ -1 +1 @@
-Subproject commit 5f70ae6025e951f0154e3940d123138adffa4c88
+Subproject commit cfd3b2d388a8c2e9903d7a9d80a65539aabfe933
diff --git a/vim/bundle/neocomplete.vim b/vim/bundle/neocomplete.vim
@@ -1 +1 @@
-Subproject commit cd16e177ff3978391f48717852528bb3e28c3582
+Subproject commit a76e4a7fa75c9f174d51b5f4825a4ef6fe1836e6
diff --git a/vim/bundle/tmux-complete.vim b/vim/bundle/tmux-complete.vim
@@ -1 +1 @@
-Subproject commit dac745de92252eeda60101908ef6e02f75cf4aeb
+Subproject commit e5b69217a2d9c25a72d626e03bc340414a7d5fc9
diff --git a/vim/bundle/vim-buftabline b/vim/bundle/vim-buftabline
@@ -1 +1 @@
-Subproject commit 4e3e3eb2eda281c59e94a9f208c0ab9259eac6f4
+Subproject commit 73c48fb9727693be07f29b953350c43ca64bda9a
diff --git a/vim/bundle/vim-commentary b/vim/bundle/vim-commentary
@@ -1 +1 @@
-Subproject commit e0f4850d78137a35b9461c530078bd77f39e4dce
+Subproject commit 9c685131a5facfa0d643feca3a61b41c007d8170
diff --git a/vim/bundle/vim-easy-align b/vim/bundle/vim-easy-align
@@ -1 +1 @@
-Subproject commit 7cb559eb70600bbd81afbb2d7f60d98334f631e2
+Subproject commit c62d124be614de65922b15d468c4049d1eee9353
diff --git a/vim/bundle/vim-endwise b/vim/bundle/vim-endwise
@@ -1 +1 @@
-Subproject commit f06abe3d6eca6f6ebfc31ea3163a51575f450df6
+Subproject commit bba43b831ae0485cf9b86d16340a6a314b927391
diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit b5188a1b4f9aabd1454f7b8dd621d467ca7ee3a7
+Subproject commit 4cc201cbe3a0c3faa4cde1b82ba941d410e5e81c
diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter
@@ -1 +1 @@
-Subproject commit a30ee7f23e93c827b4857d337f04c1ddf3c0c16e
+Subproject commit 937930e647b89c1095c0683af16d7d5e8efcbd09
diff --git a/vim/bundle/vim-polyglot b/vim/bundle/vim-polyglot
@@ -1 +1 @@
-Subproject commit aec5e42bdbdb24bc816ae7a56ace189246c74097
+Subproject commit acd7ce59503b22ac7663fc25776efe25e266f1d4
diff --git a/vim/bundle/vim-repeat b/vim/bundle/vim-repeat
@@ -1 +1 @@
-Subproject commit 7a6675f092842c8f81e71d5345bd7cdbf3759415
+Subproject commit c4f9f159e66a00e148b05d3c97c20072777d559f
diff --git a/vim/bundle/vim-signature b/vim/bundle/vim-signature
@@ -1 +1 @@
-Subproject commit d563023386183c96cebd7487856724fc79514058
+Subproject commit f8c6ad88d13787e1fed5e0655d94886bb35e00c8
diff --git a/vim/bundle/vim-sleuth b/vim/bundle/vim-sleuth
@@ -1 +1 @@
-Subproject commit a17462708aa40a7fc0afd4effa559087d8a2c908
+Subproject commit 1db371f776215ab0d1c49c9780e008a6d41d3faf
diff --git a/vim/bundle/vim-surround b/vim/bundle/vim-surround
@@ -1 +1 @@
-Subproject commit 2d05440ad23f97a7874ebd9b5de3a0e65d25d85c
+Subproject commit 772ab9587b7d1e2c3bae75395c9123803059ba8a
diff --git a/vim/bundle/vim-tmux-navigator b/vim/bundle/vim-tmux-navigator
@@ -1 +1 @@
-Subproject commit 176452ead44118174ddad3502709a247d9c24bb4
+Subproject commit 928a52fbda90ec70b2eb6edaf570654df4521af0
diff --git a/vim/bundle/vim-unimpaired b/vim/bundle/vim-unimpaired
@@ -1 +1 @@
-Subproject commit 23f471ad0f00e2fab097f9d67ffd770881d4b35a
+Subproject commit 3548479cc154154cbdbb6737ca08a47937cc7113
diff --git a/vimrc b/vimrc
@@ -220,6 +220,9 @@ function! C_Syntax()
   syntax match _Semicolon "[;]"
   hi link _Operator Operator
   hi _Semicolon ctermfg=red
+  set sw=4
+  set ts=4
+  set noexpandtab
 endfunction
 autocmd! BufRead,BufNewFile,BufEnter *.{c,cpp,h,hpp,} call C_Syntax()