From b82c3c5921d233a0609b99bcf8a438731bbbabef Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Wed, 6 Nov 2013 13:52:01 -0500 Subject: [PATCH 1/5] change my settings --- .taskrc | 3 +++ .vim/after/ftplugin/go.vim | 1 + .vimrc | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .vim/after/ftplugin/go.vim diff --git a/.taskrc b/.taskrc index afc243b..2d7e54e 100644 --- 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 diff --git a/.vim/after/ftplugin/go.vim b/.vim/after/ftplugin/go.vim new file mode 100644 index 0000000..8e50908 --- /dev/null +++ b/.vim/after/ftplugin/go.vim @@ -0,0 +1 @@ +setlocal tabstop=2 shiftwidth=2 nolist diff --git a/.vimrc b/.vimrc index ca95e36..437e69d 100644 --- a/.vimrc +++ b/.vimrc @@ -417,7 +417,7 @@ xnoremap gj xnoremap gk inoremap gj inoremap gk -"nnoremap +nnoremap " 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. From 20c2a1c7519d0d16989a5eb410d2c72ab30aaab3 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Wed, 6 Nov 2013 13:52:46 -0500 Subject: [PATCH 2/5] update all branches --- .vim/bundle/NrrwRgn | 2 +- .vim/bundle/VimOrganizer | 2 +- .vim/bundle/YouCompleteMe | 2 +- .vim/bundle/calendar-vim | 2 +- .vim/bundle/lusty | 2 +- .vim/bundle/syntastic | 2 +- .vim/bundle/tagbar | 2 +- .vim/bundle/vim-airline | 2 +- .vim/bundle/vim-bufferline | 2 +- .vim/bundle/vim-coffee-script | 2 +- .vim/bundle/vim-fugitive | 2 +- .vim/bundle/vim-gocode | 2 +- .vim/bundle/vim-sparkup | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.vim/bundle/NrrwRgn b/.vim/bundle/NrrwRgn index 02449dd..de27db4 160000 --- a/.vim/bundle/NrrwRgn +++ b/.vim/bundle/NrrwRgn @@ -1 +1 @@ -Subproject commit 02449ddaafdc0bc1cdd8df44c198fd96193083f3 +Subproject commit de27db45830cb7b24ac9606c22fe36b37136665b diff --git a/.vim/bundle/VimOrganizer b/.vim/bundle/VimOrganizer index ce15d1a..76b360c 160000 --- a/.vim/bundle/VimOrganizer +++ b/.vim/bundle/VimOrganizer @@ -1 +1 @@ -Subproject commit ce15d1acdad51c3bdb9d7537f0fd36bcf9685e32 +Subproject commit 76b360c3b29fa7b0058d8c9d3cb1c4a29c93c9e8 diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe index df0be9f..4aa207c 160000 --- a/.vim/bundle/YouCompleteMe +++ b/.vim/bundle/YouCompleteMe @@ -1 +1 @@ -Subproject commit df0be9fb2c78716dc82d86b11a27710d53567624 +Subproject commit 4aa207c2adfaa03721e54c97a47792c4549a9f88 diff --git a/.vim/bundle/calendar-vim b/.vim/bundle/calendar-vim index 0284450..8c0d60f 160000 --- a/.vim/bundle/calendar-vim +++ b/.vim/bundle/calendar-vim @@ -1 +1 @@ -Subproject commit 0284450ee16dfab2300f6b68c68b9e718f4f98bd +Subproject commit 8c0d60f64e5fbfaead88f464b598fb36a46895bd diff --git a/.vim/bundle/lusty b/.vim/bundle/lusty index 6118864..131b3d6 160000 --- a/.vim/bundle/lusty +++ b/.vim/bundle/lusty @@ -1 +1 @@ -Subproject commit 6118864a4d84521028e8079317f838cef1c32869 +Subproject commit 131b3d612eca9accd624cf72bccb049a5c90d800 diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic index 3a03fee..f22a2b1 160000 --- a/.vim/bundle/syntastic +++ b/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 3a03fee48c24d0116c529769664750a43a206ee7 +Subproject commit f22a2b164dd3351ff531edc8d853f0cb5ac868fd diff --git a/.vim/bundle/tagbar b/.vim/bundle/tagbar index 97d7b04..1a2c4ec 160000 --- a/.vim/bundle/tagbar +++ b/.vim/bundle/tagbar @@ -1 +1 @@ -Subproject commit 97d7b04bdd10cae424f8cb6be50ae7893b106ff4 +Subproject commit 1a2c4ec9580b74570549374089babd0a4a689e8c diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline index 08f87f2..3c9f8bb 160000 --- a/.vim/bundle/vim-airline +++ b/.vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit 08f87f2103a26ac3c0fdd8021eb51c0a7966e8dd +Subproject commit 3c9f8bb979a0bc451811c33a73c26df3ca3ea58e diff --git a/.vim/bundle/vim-bufferline b/.vim/bundle/vim-bufferline index 526e4e2..1788138 160000 --- a/.vim/bundle/vim-bufferline +++ b/.vim/bundle/vim-bufferline @@ -1 +1 @@ -Subproject commit 526e4e2c58d317f88ae84298922c2915bd0b1ecb +Subproject commit 17881383a670e9383a0cdc0fedf2107b2416ec01 diff --git a/.vim/bundle/vim-coffee-script b/.vim/bundle/vim-coffee-script index 8f6be87..eb81ecc 160000 --- a/.vim/bundle/vim-coffee-script +++ b/.vim/bundle/vim-coffee-script @@ -1 +1 @@ -Subproject commit 8f6be8704f13bbf4dbf1f08bdd52a710889e1181 +Subproject commit eb81ecc1eee61368f0839567dd343263c5854f42 diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive index 124550c..34e2d25 160000 --- a/.vim/bundle/vim-fugitive +++ b/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 124550cfee33a1bb9a227e78ccc709317a89dae9 +Subproject commit 34e2d2538a634a0a820a56994333ffa1fec1bc58 diff --git a/.vim/bundle/vim-gocode b/.vim/bundle/vim-gocode index 8818570..08106f8 160000 --- a/.vim/bundle/vim-gocode +++ b/.vim/bundle/vim-gocode @@ -1 +1 @@ -Subproject commit 881857067e3da7baa5c819257cef3cfe419eb974 +Subproject commit 08106f86b01805165874c2aba6e2b892187d65ca diff --git a/.vim/bundle/vim-sparkup b/.vim/bundle/vim-sparkup index 5a4cf9a..8078aff 160000 --- a/.vim/bundle/vim-sparkup +++ b/.vim/bundle/vim-sparkup @@ -1 +1 @@ -Subproject commit 5a4cf9ab26b14a1cdb625f4dc957f620e6f3f4f2 +Subproject commit 8078affa985f12b6fd35a715ced779c3fccaa0df From cea751281d30de5fcb7cb22efe65c22c72378d87 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Sat, 7 Dec 2013 18:30:18 -0500 Subject: [PATCH 3/5] Fix java under awesome --- .bashrc | 1 + .zshrc | 1 + 2 files changed, 2 insertions(+) diff --git a/.bashrc b/.bashrc index e1cf881..065799a 100644 --- 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. diff --git a/.zshrc b/.zshrc index 2d7adb0..a3e5fd8 100644 --- 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)" From be5f571821d17e86557cc52e6e115384614bc4fb Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Sat, 21 Dec 2013 21:40:48 -0500 Subject: [PATCH 4/5] update submodules --- .vim/bundle/DrawIt | 2 +- .vim/bundle/NrrwRgn | 2 +- .vim/bundle/YouCompleteMe | 2 +- .vim/bundle/calendar-vim | 2 +- .vim/bundle/syntastic | 2 +- .vim/bundle/tagbar | 2 +- .vim/bundle/vim-airline | 2 +- .vim/bundle/vim-coffee-script | 2 +- .vim/bundle/vim-fugitive | 2 +- .vim/bundle/vim-gitgutter | 2 +- .vim/bundle/vim-gocode | 2 +- .vim/bundle/vim-puppet | 2 +- .vim/bundle/vim-unimpaired | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.vim/bundle/DrawIt b/.vim/bundle/DrawIt index 22ed063..4e824fc 160000 --- a/.vim/bundle/DrawIt +++ b/.vim/bundle/DrawIt @@ -1 +1 @@ -Subproject commit 22ed0633219d2068eb44fb8c9b621b69ad78ee07 +Subproject commit 4e824fc939cec81dc2a8f4d91aaeb6151d1cc140 diff --git a/.vim/bundle/NrrwRgn b/.vim/bundle/NrrwRgn index de27db4..161d734 160000 --- a/.vim/bundle/NrrwRgn +++ b/.vim/bundle/NrrwRgn @@ -1 +1 @@ -Subproject commit de27db45830cb7b24ac9606c22fe36b37136665b +Subproject commit 161d73499845fd0d9b24d76ecbcb00d7d00d6120 diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe index 4aa207c..b1d71bb 160000 --- a/.vim/bundle/YouCompleteMe +++ b/.vim/bundle/YouCompleteMe @@ -1 +1 @@ -Subproject commit 4aa207c2adfaa03721e54c97a47792c4549a9f88 +Subproject commit b1d71bbb916d591c434eb0c564fabcb6ce7348d8 diff --git a/.vim/bundle/calendar-vim b/.vim/bundle/calendar-vim index 8c0d60f..523c5b5 160000 --- a/.vim/bundle/calendar-vim +++ b/.vim/bundle/calendar-vim @@ -1 +1 @@ -Subproject commit 8c0d60f64e5fbfaead88f464b598fb36a46895bd +Subproject commit 523c5b532cc8ca509fc86c33ca1ca6b61ee18978 diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic index f22a2b1..edcb2f2 160000 --- a/.vim/bundle/syntastic +++ b/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit f22a2b164dd3351ff531edc8d853f0cb5ac868fd +Subproject commit edcb2f2baf1ad677cc5b5b2c9e939b915451096d diff --git a/.vim/bundle/tagbar b/.vim/bundle/tagbar index 1a2c4ec..88d7464 160000 --- a/.vim/bundle/tagbar +++ b/.vim/bundle/tagbar @@ -1 +1 @@ -Subproject commit 1a2c4ec9580b74570549374089babd0a4a689e8c +Subproject commit 88d74640793d58e7880feea508ccf3fd71201d65 diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline index 3c9f8bb..233e3c6 160000 --- a/.vim/bundle/vim-airline +++ b/.vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit 3c9f8bb979a0bc451811c33a73c26df3ca3ea58e +Subproject commit 233e3c60ce3a357550f0878a91d94e79c3963728 diff --git a/.vim/bundle/vim-coffee-script b/.vim/bundle/vim-coffee-script index eb81ecc..18c6852 160000 --- a/.vim/bundle/vim-coffee-script +++ b/.vim/bundle/vim-coffee-script @@ -1 +1 @@ -Subproject commit eb81ecc1eee61368f0839567dd343263c5854f42 +Subproject commit 18c68524ab8a043a566bbe227ea8f81ab922d092 diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive index 34e2d25..6b338bd 160000 --- a/.vim/bundle/vim-fugitive +++ b/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 34e2d2538a634a0a820a56994333ffa1fec1bc58 +Subproject commit 6b338bdbcfc379af06ae1be7efdf533a82600477 diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter index 878c342..702d27a 160000 --- a/.vim/bundle/vim-gitgutter +++ b/.vim/bundle/vim-gitgutter @@ -1 +1 @@ -Subproject commit 878c3422c9ad9edc7b907948515b3118d91a67d1 +Subproject commit 702d27a84fb6a4e62d96b56b4141f9af9e506794 diff --git a/.vim/bundle/vim-gocode b/.vim/bundle/vim-gocode index 08106f8..684bd9f 160000 --- a/.vim/bundle/vim-gocode +++ b/.vim/bundle/vim-gocode @@ -1 +1 @@ -Subproject commit 08106f86b01805165874c2aba6e2b892187d65ca +Subproject commit 684bd9f405e77dc6489a9c7f70b978a539710950 diff --git a/.vim/bundle/vim-puppet b/.vim/bundle/vim-puppet index 4e78429..27d2af1 160000 --- a/.vim/bundle/vim-puppet +++ b/.vim/bundle/vim-puppet @@ -1 +1 @@ -Subproject commit 4e784293f6e36494d6c4578634abc6aca3d2028d +Subproject commit 27d2af11223349088f5c7fb3187bb3184364ea12 diff --git a/.vim/bundle/vim-unimpaired b/.vim/bundle/vim-unimpaired index a029dc2..3e01087 160000 --- a/.vim/bundle/vim-unimpaired +++ b/.vim/bundle/vim-unimpaired @@ -1 +1 @@ -Subproject commit a029dc28ebc1ba5953cd5b0ef9a50bd0ffba3aa4 +Subproject commit 3e01087414a72a894e6851aa4f06473ffa4fbf83 From e3d5d5d91ff0cf74b39060f07d67ca71193be59e Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Sat, 21 Dec 2013 21:47:06 -0500 Subject: [PATCH 5/5] fix airline by adding accents (someday update them) --- .vim/autoload/airline/themes/barak.vim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vim/autoload/airline/themes/barak.vim b/.vim/autoload/airline/themes/barak.vim index 4d39d39..056fc45 100644 --- 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 = {