Permalink
Browse files

Moar.

  • Loading branch information...
sjl committed Oct 31, 2012
1 parent 78e8a04 commit 52ed40f449f3a8ca20b0109e1923db202fa6965d
Showing with 203 additions and 17 deletions.
  1. +2 −2 .hgsubstate
  2. +1 −1 bash_profile
  3. +1 −0 dotcss/github.com.css
  4. +5 −0 fish/config.fish
  5. +4 −4 pentadactylrc
  6. +5 −0 tmux/tmux.conf
  7. +166 −0 vim/autoload/Powerline/Colorschemes/badwolf.vim
  8. +19 −10 vim/vimrc
View
@@ -1,7 +1,7 @@
661dbd42f386611a1c03f3eaf82927d3f1b874d8 mercurial/hg-prompt
b0da16490f168f68072973b45dbc27a74fb7b529 mercurial/histedit
4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
-d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
+64981213be2efd939e6e6e109e2b32c24e95fd95 vim/bundle/AnsiEsc.vim
9895285042a2fd5691b2f6582aa979e4d1bdffea vim/bundle/ack
89b93b086f099050eb5c5c5121cb18cc01b61f3e vim/bundle/badwolf
8533fffd9fbb690dfc8e334f91a10c72e35a6dce vim/bundle/clam
@@ -16,7 +16,7 @@ cff78c3ab4605d490e6be8d8af02f1e7efd25c95 vim/bundle/fugitive
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
View
@@ -15,7 +15,7 @@ function ag() {
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'
View
@@ -14,3 +14,4 @@ span.js-clippy { display: none !important; }
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; }
View
@@ -132,6 +132,11 @@ function prepend_to_path -d "Prepend the given dir to PATH if it exists and is n
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"
View
@@ -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;
View
@@ -46,6 +46,11 @@ bind 7 select-pane -t 7
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
@@ -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'],
+ \ }),
+ \ ])
View
@@ -252,19 +252,28 @@ nnoremap <leader>n :setlocal number!<cr>
" 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
+" 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 "*ygv
+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 @@ nnoremap <localleader>= ==
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 @@ set foldlevelstart=0
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:org_debug = 1
let g:Powerline_symbols = 'fancy'
let g:Powerline_cache_enabled = 1
-" let g:Powerline_colorscheme = 'badwolf'
+let g:Powerline_colorscheme = 'badwolf'
" }}}
" Python-Mode {{{

0 comments on commit 52ed40f

Please sign in to comment.