30b080bdd80d
Merge.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Thu, 01 Nov 2012 16:54:16 -0400 |
| parents | 6ed2c7b06e73 (diff) 1b487daa9aab (current diff) |
| children | f4c88441426f e96c194bd3f7 |
| branches/tags | (none) |
| files | vim/vimrc |
Changes
--- a/.hgsub Thu Nov 01 16:53:25 2012 -0400 +++ b/.hgsub Thu Nov 01 16:54:16 2012 -0400 @@ -1,7 +1,7 @@ mercurial/hg-prompt = [hg]https://bitbucket.org/sjl/hg-prompt mercurial/histedit = [hg]https://bitbucket.org/durin42/histedit mercurial/templates = [hg]https://bitbucket.org/sjl/mercurial-cli-templates -vim/bundle/AnsiEsc.vim = [git]git://github.com/vim-scripts/AnsiEsc.vim.git +vim/bundle/AnsiEsc.vim = [git]git://github.com/sjl/AnsiEsc.vim.git vim/bundle/ack = [git]git://github.com/mileszs/ack.vim.git vim/bundle/badwolf = [hg]https://bitbucket.org/sjl/badwolf/ vim/bundle/clam = [hg]https://bitbucket.org/sjl/clam.vim/
--- a/.hgsubstate Thu Nov 01 16:53:25 2012 -0400 +++ b/.hgsubstate Thu Nov 01 16:54:16 2012 -0400 @@ -1,9 +1,9 @@ 661dbd42f386611a1c03f3eaf82927d3f1b874d8 mercurial/hg-prompt b0da16490f168f68072973b45dbc27a74fb7b529 mercurial/histedit 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates -d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim +64981213be2efd939e6e6e109e2b32c24e95fd95 vim/bundle/AnsiEsc.vim 9895285042a2fd5691b2f6582aa979e4d1bdffea vim/bundle/ack -65adfb4b8907a83556b4d43234b115bacd958472 vim/bundle/badwolf +89b93b086f099050eb5c5c5121cb18cc01b61f3e vim/bundle/badwolf 8533fffd9fbb690dfc8e334f91a10c72e35a6dce vim/bundle/clam dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary 3c6182371db8e8ede3789d21b52386569eda2208 vim/bundle/ctrlp @@ -16,11 +16,11 @@ dcdab0cd55da5e0b8655c000d99d96624cd6404c vim/bundle/markdown a1433c485eb254838c1db52e087d5ec4d1e77cfd vim/bundle/nerdtree f45b4529dd282393f2e08306ae161d77de0051a0 vim/bundle/orgmode -20ab08c9a8fe6cdfb7c303aa3063f211d72f8b2f vim/bundle/powerline +2af074850fde676743f655775e3e151925751adf vim/bundle/powerline 49ae47e66f51c92b0f467f9817d5d8745f627132 vim/bundle/python-mode 613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat 61a7567a3cdd68cb65ceb3061071ce66d8110e65 vim/bundle/salt -949c1014e9378fe2654818dbcd936d93e8b6ba7d vim/bundle/slimv +b1591aa1c7057c163bf5d7dd552f044422667bc2 vim/bundle/slimv 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup 3a2ab096c039516a8f43e6acd0264d8a81cd0544 vim/bundle/splice
--- a/bash_profile Thu Nov 01 16:53:25 2012 -0400 +++ b/bash_profile Thu Nov 01 16:54:16 2012 -0400 @@ -15,7 +15,7 @@ fi } -export PATH=~/bin:~/lib/dotfiles/bin:/usr/local/share/python:$PATH +export PATH=~/bin:~/lib/dotfiles/bin:/usr/local/share/python:/usr/local/bin/:$PATH alias h='hg' alias g='git'
--- a/dotcss/github.com.css Thu Nov 01 16:53:25 2012 -0400 +++ b/dotcss/github.com.css Thu Nov 01 16:54:16 2012 -0400 @@ -14,3 +14,4 @@ div.repository-lang-stats-graph { display: none; } div.recently-touched-branches-wrapper { display: none; } p.last-commit { display: none; } +pre, code, tt { font-family: Menlo; }
--- a/fish/config.fish Thu Nov 01 16:53:25 2012 -0400 +++ b/fish/config.fish Thu Nov 01 16:54:16 2012 -0400 @@ -103,6 +103,13 @@ set -g T_TASK_COUNT (count_t_tasks) end +function packfor + cp ~/Dropbox/tasks/pack-archive ~/Dropbox/tasks/pack.txt +end +function p + ~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=pack.txt $argv +end + # }}} # Bind Keys {{{ @@ -125,6 +132,11 @@ end end end +set -gx PATH "/usr/X11R6/bin" +prepend_to_path "/sbin" +prepend_to_path "/usr/sbin" +prepend_to_path "/bin" +prepend_to_path "/usr/bin" prepend_to_path "/usr/local/bin" prepend_to_path "/usr/local/share/python" prepend_to_path "/usr/local/sbin"
--- a/pentadactylrc Thu Nov 01 16:53:25 2012 -0400 +++ b/pentadactylrc Thu Nov 01 16:54:16 2012 -0400 @@ -3,10 +3,10 @@ highlight Hint font-size: 14px; background: rgba(210,1,133,0.8) !important; border: 2px solid rgb(165,1,105); padding: 4px; border-radius: 3px; font-weight: bold; margin-left: -25px; color: white; font-family: Helvetica; line-height:1em; highlight HintActive background: rgba(145,197,43,0.8) !important; highlight HintElem background: rgba(255, 209, 20, 0.7) !important; -highlight StatusLine -moz-appearance: none !important; font-weight: bold; background: transparent !important; border: 0px !important; min-height: 22px !important; text-shadow: none !important; font: normal 16px/1 'Menlo' !important; padding: 3px 0px 3px 5px !important; -highlight CmdLine padding: 1px !important; font: normal 16px 'Menlo' !important; -highlight CmdOutput font: normal 14px 'Menlo' !important; -highlight CompItem font: normal 14px 'Menlo' !important; +highlight StatusLine -moz-appearance: none !important; font-weight: bold; background: transparent !important; border: 0px !important; min-height: 22px !important; text-shadow: none !important; font: normal 14px/1 'Menlo' !important; padding: 3px 0px 3px 5px !important; +highlight CmdLine padding: 1px !important; font: normal 14px 'Menlo' !important; +highlight CmdOutput font: normal 13px 'Menlo' !important; +highlight CompItem font: normal 13px 'Menlo' !important; highlight Find background: #d6c149; color: #000;
--- a/tmux/tmux.conf Thu Nov 01 16:53:25 2012 -0400 +++ b/tmux/tmux.conf Thu Nov 01 16:54:16 2012 -0400 @@ -46,6 +46,11 @@ bind 8 select-pane -t 8 bind 9 select-pane -t 9 +# Layouts +set -g main-pane-width 260 +bind M select-layout main-vertical +bind E select-layout even-horizontal + # Pane resizing bind -r C-h resize-pane -L 5 bind -r C-j resize-pane -D 5
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vim/autoload/Powerline/Colorschemes/badwolf.vim Thu Nov 01 16:54:16 2012 -0400 @@ -0,0 +1,166 @@ +call Pl#Hi#Allocate({ + \ 'black' : 16, + \ 'white' : 231, + \ + \ 'darkestgreen' : 22, + \ 'darkgreen' : 28, + \ 'mediumgreen' : 70, + \ 'brightgreen' : 148, + \ + \ 'darkestcyan' : 23, + \ 'mediumcyan' : 117, + \ + \ 'darkestblue' : 24, + \ 'darkblue' : 31, + \ + \ 'darkestred' : 52, + \ 'darkred' : 88, + \ 'mediumred' : 124, + \ 'brightred' : 160, + \ 'brightestred' : 196, + \ + \ 'darkestpurple' : 55, + \ 'mediumpurple' : 98, + \ 'brightpurple' : 189, + \ + \ 'brightorange' : 208, + \ 'brightestorange': 214, + \ + \ 'gray0' : 234, + \ 'gray1' : 235, + \ 'gray2' : 236, + \ 'gray3' : 238, + \ 'gray4' : 240, + \ 'gray5' : 241, + \ 'gray6' : 244, + \ 'gray7' : 245, + \ 'gray8' : 247, + \ 'gray9' : 250, + \ 'gray10' : 252, + \ }) + +let g:Powerline#Colorschemes#badwolf#colorscheme = Pl#Colorscheme#Init([ + \ Pl#Hi#Segments(['SPLIT'], { + \ 'n': ['white', 'gray2'], + \ 'N': ['white', 'gray1'], + \ 'i': ['white', 'darkestblue'], + \ }), + \ + \ Pl#Hi#Segments(['mode_indicator'], { + \ 'n': ['darkestgreen', 'brightgreen', ['bold']], + \ 'i': ['darkestcyan', 'white', ['bold']], + \ 'v': ['darkred', 'brightorange', ['bold']], + \ 'r': ['white', 'brightred', ['bold']], + \ 's': ['white', 'gray5', ['bold']], + \ }), + \ + \ Pl#Hi#Segments(['branch', 'scrollpercent', 'raw', 'filesize'], { + \ 'n': ['gray9', 'gray4'], + \ 'N': ['gray4', 'gray2'], + \ 'i': ['mediumcyan', 'darkblue'], + \ }), + \ + \ Pl#Hi#Segments(['fileinfo', 'filename'], { + \ 'n': ['white', 'gray4', ['bold']], + \ 'N': ['gray7', 'gray2', ['bold']], + \ 'i': ['white', 'darkblue', ['bold']], + \ }), + \ + \ Pl#Hi#Segments(['fileinfo.filepath'], { + \ 'n': ['gray10'], + \ 'N': ['gray6'], + \ 'i': ['mediumcyan'], + \ }), + \ + \ Pl#Hi#Segments(['static_str'], { + \ 'n': ['white', 'gray4'], + \ 'N': ['gray7', 'gray1'], + \ 'i': ['white', 'darkblue'], + \ }), + \ + \ Pl#Hi#Segments(['fileinfo.flags'], { + \ 'n': ['brightestred', ['bold']], + \ 'N': ['darkred'], + \ 'i': ['brightestred', ['bold']], + \ }), + \ + \ Pl#Hi#Segments(['currenttag', 'fullcurrenttag', 'fileformat', 'fileencoding', 'pwd', 'filetype', 'rvm:string', 'rvm:statusline', 'virtualenv:statusline', 'charcode', 'currhigroup'], { + \ 'n': ['gray8', 'gray2'], + \ 'i': ['mediumcyan', 'darkestblue'], + \ }), + \ + \ Pl#Hi#Segments(['lineinfo'], { + \ 'n': ['gray2', 'gray10', ['bold']], + \ 'N': ['gray7', 'gray3', ['bold']], + \ 'i': ['darkestcyan', 'mediumcyan', ['bold']], + \ }), + \ + \ Pl#Hi#Segments(['errors'], { + \ 'n': ['brightestorange', 'gray2', ['bold']], + \ 'i': ['brightestorange', 'darkestblue', ['bold']], + \ }), + \ + \ Pl#Hi#Segments(['lineinfo.line.tot'], { + \ 'n': ['gray6'], + \ 'N': ['gray5'], + \ 'i': ['darkestcyan'], + \ }), + \ + \ Pl#Hi#Segments(['paste_indicator', 'ws_marker'], { + \ 'n': ['white', 'brightred', ['bold']], + \ }), + \ + \ Pl#Hi#Segments(['gundo:static_str.name', 'command_t:static_str.name'], { + \ 'n': ['white', 'mediumred', ['bold']], + \ 'N': ['brightred', 'darkestred', ['bold']], + \ }), + \ + \ Pl#Hi#Segments(['gundo:static_str.buffer', 'command_t:raw.line'], { + \ 'n': ['white', 'darkred'], + \ 'N': ['brightred', 'darkestred'], + \ }), + \ + \ Pl#Hi#Segments(['gundo:SPLIT', 'command_t:SPLIT'], { + \ 'n': ['white', 'darkred'], + \ 'N': ['white', 'darkestred'], + \ }), + \ + \ Pl#Hi#Segments(['lustyexplorer:static_str.name', 'minibufexplorer:static_str.name', 'nerdtree:raw.name', 'tagbar:static_str.name'], { + \ 'n': ['white', 'mediumgreen', ['bold']], + \ 'N': ['mediumgreen', 'darkestgreen', ['bold']], + \ }), + \ + \ Pl#Hi#Segments(['lustyexplorer:static_str.buffer', 'tagbar:static_str.buffer'], { + \ 'n': ['brightgreen', 'darkgreen'], + \ 'N': ['mediumgreen', 'darkestgreen'], + \ }), + \ + \ Pl#Hi#Segments(['lustyexplorer:SPLIT', 'minibufexplorer:SPLIT', 'nerdtree:SPLIT', 'tagbar:SPLIT'], { + \ 'n': ['white', 'darkgreen'], + \ 'N': ['white', 'darkestgreen'], + \ }), + \ + \ Pl#Hi#Segments(['ctrlp:focus', 'ctrlp:byfname'], { + \ 'n': ['brightpurple', 'darkestpurple'], + \ }), + \ + \ Pl#Hi#Segments(['ctrlp:prev', 'ctrlp:next', 'ctrlp:pwd'], { + \ 'n': ['white', 'mediumpurple'], + \ }), + \ + \ Pl#Hi#Segments(['ctrlp:item'], { + \ 'n': ['darkestpurple', 'white', ['bold']], + \ }), + \ + \ Pl#Hi#Segments(['ctrlp:marked'], { + \ 'n': ['brightestred', 'darkestpurple', ['bold']], + \ }), + \ + \ Pl#Hi#Segments(['ctrlp:count'], { + \ 'n': ['darkestpurple', 'white'], + \ }), + \ + \ Pl#Hi#Segments(['ctrlp:SPLIT'], { + \ 'n': ['white', 'darkestpurple'], + \ }), + \ ])
--- a/vim/vimrc Thu Nov 01 16:53:25 2012 -0400 +++ b/vim/vimrc Thu Nov 01 16:54:16 2012 -0400 @@ -252,19 +252,28 @@ " Front and center " Use :sus for the rare times I want to actually background Vim. -nnoremap <c-z> zvzz +nnoremap <c-z> zMzvzz25<c-e> vnoremap <c-z> <esc>zv`<ztgv +" Sort lines +nnoremap <leader>s vip:!sort<cr> +vnoremap <leader>s :!sort<cr> + " Tabs nnoremap <leader>( :tabprev<cr> nnoremap <leader>) :tabnext<cr> -" System clipboard interaction. Mostly from: -" https://github.com/henrik/dotfiles/blob/master/vim/config/mappings.vim -noremap <leader>y "*y -noremap <leader>p :set paste<CR>"*p<CR>:set nopaste<CR> -noremap <leader>P :set paste<CR>"*P<CR>:set nopaste<CR> -vnoremap <leader>y "*ygv +" Copying text to the system clipboard. +" +" For some reason Vim no longer wants to talk to the OS X pasteboard through "*. +" Computers are bullshit. +function! g:FuckingCopyTheTextPlease() + normal! gv + silent '<,'>w !pbcopy +endfunction +noremap <leader>p :silent! set paste<CR>"*p:set nopaste<CR> +noremap <leader>P :silent! set paste<CR>"*P:set nopaste<CR> +vnoremap <leader>y :<c-u>call g:FuckingCopyTheTextPlease()<cr> " I constantly hit "u" in visual mode when I mean to "y". Use "gu" for those rare occasions. " From https://github.com/henrik/dotfiles/blob/master/vim/config/mappings.vim @@ -366,7 +375,10 @@ vnoremap - = " Toggle paste -set pastetoggle=<F6> +" For some reason pastetoggle doesn't redraw the screen (thus the status bar +" doesn't change) while :set paste! does, so I use that instead. +" set pastetoggle=<F6> +nnoremap <F6> :set paste!<cr> " Toggle [i]nvisible characters nnoremap <leader>i :set list!<cr> @@ -539,9 +551,6 @@ nnoremap <Space> za vnoremap <Space> za -" "Refocus" folds -nnoremap ,z zMzvzz - " Make zO recursively open whatever top level fold we're in, no matter where the " cursor happens to be. nnoremap zO zCzO @@ -1162,7 +1171,7 @@ let g:Powerline_symbols = 'fancy' let g:Powerline_cache_enabled = 1 -" let g:Powerline_colorscheme = 'badwolf' +let g:Powerline_colorscheme = 'badwolf' " }}} " Python-Mode {{{