Merge branch 'master' of git.epichack.com:barak/dotfiles

2014-01-06 10:49:48 -05:00 · 2014-01-06 10:49:48 -05:00 · 762d2fbb3b
commit 762d2fbb3b
parent b74e05b11c e3d5d5d91f
23 changed files with 27 additions and 18 deletions
--- a/.bashrc
+++ b/.bashrc
@ -8,6 +8,7 @@
 BLOCKSIZE=K;	export BLOCKSIZE
 EDITOR=vim;   	export EDITOR
 PAGER=less;  	export PAGER
+_JAVA_AWT_WM_NONREPARENTING=1; export _JAVA_AWT_WM_NONREPARENTING

 #Foo
 # set ENV to a file invoked each time sh is started for interactive use.
--- a/.taskrc
+++ b/.taskrc
@ -27,3 +27,6 @@ push.default.uri=barak@miranda.barakmich.com:/fs/home/barak/.task/
 #include /usr/share/doc/task/rc/dark-yellow-green.theme
 #include /usr/share/doc/task/rc/dark-gray-256.theme

+taskd.server=localhost:6544
+taskd.credentials=Barakmich.com\/barak\/6982469b-087e-4243-a1b7-1f411bc68194
+taskd.certificate=\/home\/barak\/.task\/client.cert.pem
--- a/.vim/after/ftplugin/go.vim
+++ b/.vim/after/ftplugin/go.vim
@ -0,0 +1 @@
+setlocal tabstop=2 shiftwidth=2 nolist
--- a/.vim/autoload/airline/themes/barak.vim
+++ b/.vim/autoload/airline/themes/barak.vim
@ -31,6 +31,9 @@ let g:airline#themes#barak#palette = {}
 let g:airline#themes#barak#palette.inactive = {
      \ 'airline_a' : [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ] }

+let g:airline#themes#barak#palette.accents = {
+      \ 'red': [ '#ff7400' , '' , 196 , '' , '' ],
+      \ }

 let g:airline#themes#barak#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
 let g:airline#themes#barak#palette.normal_modified = {
--- a/.vim/bundle/DrawIt
+++ b/.vim/bundle/DrawIt
@ -1 +1 @@
-Subproject commit 22ed0633219d2068eb44fb8c9b621b69ad78ee07
+Subproject commit 4e824fc939cec81dc2a8f4d91aaeb6151d1cc140
--- a/.vim/bundle/NrrwRgn
+++ b/.vim/bundle/NrrwRgn
@ -1 +1 @@
-Subproject commit 02449ddaafdc0bc1cdd8df44c198fd96193083f3
+Subproject commit 161d73499845fd0d9b24d76ecbcb00d7d00d6120
--- a/.vim/bundle/VimOrganizer
+++ b/.vim/bundle/VimOrganizer
@ -1 +1 @@
-Subproject commit ce15d1acdad51c3bdb9d7537f0fd36bcf9685e32
+Subproject commit 76b360c3b29fa7b0058d8c9d3cb1c4a29c93c9e8
--- a/.vim/bundle/YouCompleteMe
+++ b/.vim/bundle/YouCompleteMe
@ -1 +1 @@
-Subproject commit df0be9fb2c78716dc82d86b11a27710d53567624
+Subproject commit b1d71bbb916d591c434eb0c564fabcb6ce7348d8
--- a/.vim/bundle/calendar-vim
+++ b/.vim/bundle/calendar-vim
@ -1 +1 @@
-Subproject commit 0284450ee16dfab2300f6b68c68b9e718f4f98bd
+Subproject commit 523c5b532cc8ca509fc86c33ca1ca6b61ee18978
--- a/.vim/bundle/lusty
+++ b/.vim/bundle/lusty
@ -1 +1 @@
-Subproject commit 6118864a4d84521028e8079317f838cef1c32869
+Subproject commit 131b3d612eca9accd624cf72bccb049a5c90d800
--- a/.vim/bundle/syntastic
+++ b/.vim/bundle/syntastic
@ -1 +1 @@
-Subproject commit 3a03fee48c24d0116c529769664750a43a206ee7
+Subproject commit edcb2f2baf1ad677cc5b5b2c9e939b915451096d
--- a/.vim/bundle/tagbar
+++ b/.vim/bundle/tagbar
@ -1 +1 @@
-Subproject commit 97d7b04bdd10cae424f8cb6be50ae7893b106ff4
+Subproject commit 88d74640793d58e7880feea508ccf3fd71201d65
--- a/.vim/bundle/vim-airline
+++ b/.vim/bundle/vim-airline
@ -1 +1 @@
-Subproject commit 08f87f2103a26ac3c0fdd8021eb51c0a7966e8dd
+Subproject commit 233e3c60ce3a357550f0878a91d94e79c3963728
--- a/.vim/bundle/vim-bufferline
+++ b/.vim/bundle/vim-bufferline
@ -1 +1 @@
-Subproject commit 526e4e2c58d317f88ae84298922c2915bd0b1ecb
+Subproject commit 17881383a670e9383a0cdc0fedf2107b2416ec01
--- a/.vim/bundle/vim-coffee-script
+++ b/.vim/bundle/vim-coffee-script
@ -1 +1 @@
-Subproject commit 8f6be8704f13bbf4dbf1f08bdd52a710889e1181
+Subproject commit 18c68524ab8a043a566bbe227ea8f81ab922d092
--- a/.vim/bundle/vim-fugitive
+++ b/.vim/bundle/vim-fugitive
@ -1 +1 @@
-Subproject commit 124550cfee33a1bb9a227e78ccc709317a89dae9
+Subproject commit 6b338bdbcfc379af06ae1be7efdf533a82600477
--- a/.vim/bundle/vim-gitgutter
+++ b/.vim/bundle/vim-gitgutter
@ -1 +1 @@
-Subproject commit 878c3422c9ad9edc7b907948515b3118d91a67d1
+Subproject commit 702d27a84fb6a4e62d96b56b4141f9af9e506794
--- a/.vim/bundle/vim-gocode
+++ b/.vim/bundle/vim-gocode
@ -1 +1 @@
-Subproject commit 881857067e3da7baa5c819257cef3cfe419eb974
+Subproject commit 684bd9f405e77dc6489a9c7f70b978a539710950
--- a/.vim/bundle/vim-puppet
+++ b/.vim/bundle/vim-puppet
@ -1 +1 @@
-Subproject commit 4e784293f6e36494d6c4578634abc6aca3d2028d
+Subproject commit 27d2af11223349088f5c7fb3187bb3184364ea12
--- a/.vim/bundle/vim-sparkup
+++ b/.vim/bundle/vim-sparkup
@ -1 +1 @@
-Subproject commit 5a4cf9ab26b14a1cdb625f4dc957f620e6f3f4f2
+Subproject commit 8078affa985f12b6fd35a715ced779c3fccaa0df
--- a/.vim/bundle/vim-unimpaired
+++ b/.vim/bundle/vim-unimpaired
@ -1 +1 @@
-Subproject commit a029dc28ebc1ba5953cd5b0ef9a50bd0ffba3aa4
+Subproject commit 3e01087414a72a894e6851aa4f06473ffa4fbf83
--- a/.vimrc
+++ b/.vimrc
@ -417,7 +417,7 @@ xnoremap <Down> gj
 xnoremap <Up> gk
 inoremap <Down> <C-o>gj
 inoremap <Up> <C-o>gk
-"nnoremap <C-i> <C-a>
+nnoremap <C-i> <C-a>
 " Years of using bash and zsh have caused my fingers to expect these Emacs-like
 " mappings to exist. Make them exist in vim as well. But eye them with
 " suspicion, as they come from Emacs.
--- a/.zshrc
+++ b/.zshrc
@ -4,6 +4,7 @@

 # don't put duplicate lines in the history. See bash(1) for more options
 export HISTCONTROL=ignoredups
+_JAVA_AWT_WM_NONREPARENTING=1; export _JAVA_AWT_WM_NONREPARENTING

 # make less more friendly for non-text input files, see lesspipe(1)
 [ -x /usr/bin/lesspipe ] && eval "$(lesspipe)"