From 54f26d3426bdc7689af288456a39894d2d20f3d8 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Thu, 15 May 2014 13:26:53 -0400 Subject: [PATCH] lear and proto whitespace --- .bash_aliases | 2 +- .config/awesome/rc.lua | 2 +- .vim/bundle/NrrwRgn | 2 +- .vim/bundle/YouCompleteMe | 2 +- .vim/bundle/ack.vim | 2 +- .vim/bundle/calendar-vim | 2 +- .vim/bundle/delimitMate | 2 +- .vim/bundle/ghcmod-vim | 2 +- .vim/bundle/neco-ghc | 2 +- .vim/bundle/syntastic | 2 +- .vim/bundle/tagbar | 2 +- .vim/bundle/ultisnips | 2 +- .vim/bundle/vim-airline | 2 +- .vim/bundle/vim-angry | 2 +- .vim/bundle/vim-fugitive | 2 +- .vim/bundle/vim-gitgutter | 2 +- .vim/bundle/vim-gocode | 2 +- .vim/bundle/vim-sparkup | 2 +- .vim/bundle/vim-unimpaired | 2 +- .vim/bundle/vimproc | 2 +- .vim/filetype.vim | 1 + 21 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.bash_aliases b/.bash_aliases index 4e304bc..72bd4f1 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -56,7 +56,7 @@ alias ppjson="python -mjson.tool" #alias tmux-pwn='tmux list-clients | sed "s|^\(/dev/ttys[0-9]\+\).*\[\([0-9]\+x[0-9]\+\).*$|\2 \1|" | sort -r -n | tail -n +2 | cut -d " " -f 2 | xargs -n 1 tmux detach-client -t' #machines -alias miranda="ssh -D 7777 -Y barak@miranda.barakmich.com" +alias lear="ssh -D 7777 -Y barak@lear.barakmich.com" alias hero="ssh -D 7777 -Y barak@hero.barakmich.com" #Cosmetic/useful diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 6060ba2..3a62467 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -48,7 +48,7 @@ beautiful.init(confdir .. "/btheme/theme.lua") --beautiful.border_normal = "#222222" --beautiful.border_focus = "#00bfff" --beautiful.font = "sans 12" -naughty.config.default_preset.font = "Inconsolata 14" +naughty.config.default_preset.font = "Inconsolata 22" -- This is used later as the default terminal and editor to run. terminal = "run_terminal" diff --git a/.vim/bundle/NrrwRgn b/.vim/bundle/NrrwRgn index 0fb0fe9..161d734 160000 --- a/.vim/bundle/NrrwRgn +++ b/.vim/bundle/NrrwRgn @@ -1 +1 @@ -Subproject commit 0fb0fe948cedda7cbea330303c5a28e7375d268c +Subproject commit 161d73499845fd0d9b24d76ecbcb00d7d00d6120 diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe index 9d3258d..b1bba2e 160000 --- a/.vim/bundle/YouCompleteMe +++ b/.vim/bundle/YouCompleteMe @@ -1 +1 @@ -Subproject commit 9d3258df19b9d940576eda42899dbdbf9084f04a +Subproject commit b1bba2e2012efa81444bedafa12ddbdae2cccd93 diff --git a/.vim/bundle/ack.vim b/.vim/bundle/ack.vim index 0292109..f183a34 160000 --- a/.vim/bundle/ack.vim +++ b/.vim/bundle/ack.vim @@ -1 +1 @@ -Subproject commit 0292109f1f87497c7cf9b0994db47c8e95bd252c +Subproject commit f183a345a0c10caed7684d07dabae33e007c7590 diff --git a/.vim/bundle/calendar-vim b/.vim/bundle/calendar-vim index b340c43..523c5b5 160000 --- a/.vim/bundle/calendar-vim +++ b/.vim/bundle/calendar-vim @@ -1 +1 @@ -Subproject commit b340c438355e70ba3a648ccfc0e2be9b94662808 +Subproject commit 523c5b532cc8ca509fc86c33ca1ca6b61ee18978 diff --git a/.vim/bundle/delimitMate b/.vim/bundle/delimitMate index 38487bb..35280c1 160000 --- a/.vim/bundle/delimitMate +++ b/.vim/bundle/delimitMate @@ -1 +1 @@ -Subproject commit 38487bbec8ba50834e257940b357de03991fa8f9 +Subproject commit 35280c1444bf62d651f56ccaf03ad8db29c02383 diff --git a/.vim/bundle/ghcmod-vim b/.vim/bundle/ghcmod-vim index 6a88e49..788b193 160000 --- a/.vim/bundle/ghcmod-vim +++ b/.vim/bundle/ghcmod-vim @@ -1 +1 @@ -Subproject commit 6a88e49d5766edf32592c9c4b24921ba42f619c8 +Subproject commit 788b193dbeb1bebe303b0d0c6b17c09fdd1ebabb diff --git a/.vim/bundle/neco-ghc b/.vim/bundle/neco-ghc index 00985af..41c7160 160000 --- a/.vim/bundle/neco-ghc +++ b/.vim/bundle/neco-ghc @@ -1 +1 @@ -Subproject commit 00985af541d8880a6a54d39dc5778ec7e00c053e +Subproject commit 41c7160ee129209b758c5a9f0fc196ffeeb866f9 diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic index f6d584b..f23ddae 160000 --- a/.vim/bundle/syntastic +++ b/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit f6d584bc639c2b799d5d7897d1e681b4e57cd476 +Subproject commit f23ddae1a7982b40dbfbe55033c1817480f0a0ed diff --git a/.vim/bundle/tagbar b/.vim/bundle/tagbar index b2c5f0b..ace45ad 160000 --- a/.vim/bundle/tagbar +++ b/.vim/bundle/tagbar @@ -1 +1 @@ -Subproject commit b2c5f0b9284f85e92d98efc97c780ad01ba81e0c +Subproject commit ace45adc51d0e08d45761bb515a9ff23906cba65 diff --git a/.vim/bundle/ultisnips b/.vim/bundle/ultisnips index 4b4ee48..ae611cc 160000 --- a/.vim/bundle/ultisnips +++ b/.vim/bundle/ultisnips @@ -1 +1 @@ -Subproject commit 4b4ee488580f7586e82a76bb392e4f79027ce049 +Subproject commit ae611ccf950a93f93cab64542cbe48029f1e9c02 diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline index 5a2daf6..5f1c245 160000 --- a/.vim/bundle/vim-airline +++ b/.vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit 5a2daf6dfbd6e0df21612a20f95b4285ae8a2603 +Subproject commit 5f1c24528c143c80e40016995fc902fb8b74eeee diff --git a/.vim/bundle/vim-angry b/.vim/bundle/vim-angry index 08e9e9a..8705ee2 160000 --- a/.vim/bundle/vim-angry +++ b/.vim/bundle/vim-angry @@ -1 +1 @@ -Subproject commit 08e9e9a50e6683ac7b0c1d6fddfb5f1235c75700 +Subproject commit 8705ee2c4e619016a5abba2fb3c8886a6eb93426 diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive index d6f1760..546a6bf 160000 --- a/.vim/bundle/vim-fugitive +++ b/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit d6f17608ddbae06ed5867f58e322a16806fa7248 +Subproject commit 546a6bf2197529ed1bd402244cbf6e72ed62b2ca diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter index 0ca3f7e..ae81dcc 160000 --- a/.vim/bundle/vim-gitgutter +++ b/.vim/bundle/vim-gitgutter @@ -1 +1 @@ -Subproject commit 0ca3f7e3cdbd3edf69d685ed463a6746fb0e8134 +Subproject commit ae81dccb679a423f871809d83c6829442760748a diff --git a/.vim/bundle/vim-gocode b/.vim/bundle/vim-gocode index 5a12617..05b9cc1 160000 --- a/.vim/bundle/vim-gocode +++ b/.vim/bundle/vim-gocode @@ -1 +1 @@ -Subproject commit 5a12617f085a32deec5eed80598e2165dc918615 +Subproject commit 05b9cc1b9e7497eef0add18d5adb034ecfeebec8 diff --git a/.vim/bundle/vim-sparkup b/.vim/bundle/vim-sparkup index 0377b10..8078aff 160000 --- a/.vim/bundle/vim-sparkup +++ b/.vim/bundle/vim-sparkup @@ -1 +1 @@ -Subproject commit 0377b100382c19295b42018289fe8d42a7d57e80 +Subproject commit 8078affa985f12b6fd35a715ced779c3fccaa0df diff --git a/.vim/bundle/vim-unimpaired b/.vim/bundle/vim-unimpaired index f4a9143..9a8be36 160000 --- a/.vim/bundle/vim-unimpaired +++ b/.vim/bundle/vim-unimpaired @@ -1 +1 @@ -Subproject commit f4a914308ab32b118441418fdc64ac41fa7dc53c +Subproject commit 9a8be3696bc50064b9d9d146041ec4264e36e341 diff --git a/.vim/bundle/vimproc b/.vim/bundle/vimproc index 92b34f1..11bd685 160000 --- a/.vim/bundle/vimproc +++ b/.vim/bundle/vimproc @@ -1 +1 @@ -Subproject commit 92b34f1ed9d2f2900f6a2db964526d6f94fa3d86 +Subproject commit 11bd6853b25f73f3729cccbb9282fecade2bf50a diff --git a/.vim/filetype.vim b/.vim/filetype.vim index 68fbaf1..be116c1 100644 --- a/.vim/filetype.vim +++ b/.vim/filetype.vim @@ -80,4 +80,5 @@ autocmd FileType perl let b:auto_trim_whitespace=1 autocmd FileType borg let b:auto_trim_whitespace=1 autocmd FileType javascript let b:auto_trim_whitespace=1 autocmd FileType python let b:auto_trim_whitespace=1 +autocmd FileType proto let b:auto_trim_whitespace=1