Permalink
Browse files

Lots from the past week or so.

  • Loading branch information...
1 parent 3a35250 commit f1d2e6cae3d89f115976f97a0fe8abd031cbff29 @sjl committed Oct 19, 2011
Showing with 307 additions and 152 deletions.
  1. +3 −2 .gitconfig
  2. +1 −0 .hgsub
  3. +4 −3 .hgsubstate
  4. +1 −0 .zshrc
  5. +2 −0 dotcss/github.com.css
  6. +51 −1 vim/.vimrc
  7. +6 −0 vim/colors/molokai.vim
  8. +55 −0 weechat/python/autoload/colon_complete.py
  9. +183 −145 weechat/python/autoload/growl.py
  10. +1 −1 weechat/weechat.conf
View
@@ -13,7 +13,7 @@
pull = pull --ff-only
merge = merge --no-ff
- upbranch = merge --ff-only
+ up = merge --ff-only
ci = commit
cm = commit -m
@@ -27,12 +27,13 @@
uns = reset HEAD
fo = fetch origin
+ fu = fetch upstream
po = push origin
lo = pull origin
moo = merge origin/ongoing
[push]
- default = current
+ default = current
[color]
branch = auto
View
1 .hgsub
@@ -27,5 +27,6 @@ vim/bundle/indent-object = [git]git://github.com/michaeljsmith/vim-indent-object
vim/bundle/hammer = [git]git://github.com/robgleeson/hammer.vim.git
vim/bundle/fugitive = [git]git://github.com/tpope/vim-fugitive.git
vim/bundle/nosecompiler = [git]git://github.com/olethanh/Vim-nosecompiler.git
+vim/bundle/AnsiEsc.vim = [git]git://github.com/vim-scripts/AnsiEsc.vim.git
keymando/Plugins/abbrev = [git]git://github.com/keymando/abbrev.git
View
@@ -1,9 +1,10 @@
c711681883f3419b85494e3b285b988e8e2dcbca keymando/Plugins/abbrev
c060c94622e92e091b2c67499fdda16d91b68c01 mercurial/templates
+d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
a41d5d52c39a31128e969e69acf800b198cb07f9 vim/bundle/ack
bfdf714f8ea10a6bcba7a1375a5700b11077dcd9 vim/bundle/command-t
cdecdc56f938840cad250aecd58c1901f04c4d1b vim/bundle/easymotion
-201bdd0eff4cd79847cf006f143deb62f8f97342 vim/bundle/fugitive
+1b7e4070f5f7b7522422f5b00a75b323cc314daf vim/bundle/fugitive
91190e67720f852c17602504d5225d4e675b6499 vim/bundle/gundo
ffc45dd5a59b7b62edb02641c69a163f19fd02c0 vim/bundle/hammer
4ef2d418f48d30fed2f7ce00f598d6871a0010fe vim/bundle/html5
@@ -13,7 +14,7 @@ ffc45dd5a59b7b62edb02641c69a163f19fd02c0 vim/bundle/hammer
2dd198c6c412b4ddd361b43586b01981e8383239 vim/bundle/nerdtree
b7889db57c90824ff5092da4fdde9e05689f24fa vim/bundle/nosecompiler
a0831b09f2026c3a3d52e253ffd139fe20a9360a vim/bundle/pydoc
-25de1e1969b6b5c92fec67adbd98da65533b545c vim/bundle/slimv
+e201d578c03156a3dd7176973f2187f4e957f466 vim/bundle/slimv
c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
80ec6539e4139a2e0281a0f1e36d5038d55ad980 vim/bundle/supertab
@@ -25,5 +26,5 @@ b944e534bd6bbfc4fd56d4ee1a8aa831188387b0 vim/bundle/vim-coffee-script
8d06adbd56a761684701d1c60990b72c845be3d5 vim/bundle/vim-commentary
6362ba99c825afc046818807267d5c1143b5c887 vim/bundle/vim-javascript
f21fbd8759d7fa6c3cb1bbb9fe05eae90422f01a vim/bundle/vim-makegreen
-d0daeb317df54c513278f20bda49be01384bdb7d vim/bundle/vim-orgmode
+54b7bfc8170f3fa1519e5559c37a4f3e31c032c9 vim/bundle/vim-orgmode
b0ee6ec2153c5f30827d67db1668f37a975a1005 vim/bundle/vim-speeddating
View
1 .zshrc
@@ -25,6 +25,7 @@ export EDITOR='vim'
export PATH="$HOME/.gem/ruby/1.8/bin:${PATH}"
export PATH="/usr/local/bin:/usr/local/sbin:$HOME/bin:/opt/local/bin:$PATH"
export PATH="/opt/subversion/bin:${PATH}"
+export PATH="/usr/local/Cellar/ruby/1.9.2-p290/bin:${PATH}"
export GREP_OPTIONS='--color=auto'
export HISTSIZE=1000
export HISTFILESIZE=1000
View
@@ -0,0 +1,2 @@
+.native-clones { display: none; }
+.tree-browser td.content { font-family: Menlo; font-size: 12px; }
View
@@ -47,6 +47,7 @@ set nottimeout
set autowrite
set shiftround
set autoread
+set title
set dictionary=/usr/share/dict/words
" Wildmenu completion {{{
@@ -354,7 +355,7 @@ augroup ft_clojure
au BufNewFile,BufRead Slimv.REPL.clj setlocal nowrap
au BufNewFile,BufRead Slimv.REPL.clj setlocal foldlevel=99
au BufNewFile,BufRead Slimv.REPL.clj nnoremap <buffer> A GA
- au BufNewFile,BufRead Slimv.REPL.clj unmap <buffer> \\\
+ au BufNewFile,BufRead Slimv.REPL.clj nnoremap <buffer> <localleader>R :emenu REPL.<Tab>
" Fix the eval mapping.
au FileType clojure nmap <buffer> \ee \ed
@@ -545,6 +546,8 @@ augroup ft_nginx
au BufRead,BufNewFile /etc/nginx/sites-available/* set ft=nginx
au BufRead,BufNewFile /usr/local/etc/nginx/sites-available/* set ft=nginx
au BufRead,BufNewFile vhost.nginx set ft=nginx
+
+ au FileType nginx setlocal foldmethod=marker foldmarker={,}
augroup END
" }}}
@@ -652,6 +655,26 @@ nnoremap <leader>ez <C-w>s<C-w>j<C-w>L:e ~/lib/dotfiles/zsh<cr>4j
nnoremap <leader>ek <C-w>s<C-w>j<C-w>L:e ~/lib/dotfiles/keymando/keymandorc.rb<cr>
" }}}
+" Shell ----------------------------------------------------------------------- {{{
+
+function! s:ExecuteInShell(command) " {{{
+ let command = join(map(split(a:command), 'expand(v:val)'))
+ let winnr = bufwinnr('^' . command . '$')
+ silent! execute winnr < 0 ? 'botright vnew ' . fnameescape(command) : winnr . 'wincmd w'
+ setlocal buftype=nowrite bufhidden=wipe nobuflisted noswapfile nowrap nonumber
+ echo 'Execute ' . command . '...'
+ silent! execute 'silent %!'. command
+ silent! redraw
+ silent! execute 'au BufUnload <buffer> execute bufwinnr(' . bufnr('#') . ') . ''wincmd w'''
+ silent! execute 'nnoremap <silent> <buffer> <LocalLeader>r :call <SID>ExecuteInShell(''' . command . ''')<CR>:AnsiEsc<CR>'
+ silent! execute 'nnoremap <silent> <buffer> q :q<CR>'
+ silent! execute 'AnsiEsc'
+ echo 'Shell command ' . command . ' executed.'
+endfunction " }}}
+command! -complete=shellcmd -nargs=+ Shell call s:ExecuteInShell(<q-args>)
+nnoremap <leader>! :Shell
+
+" }}}
" Convenience mappings -------------------------------------------------------- {{{
" Clean whitespace
@@ -693,6 +716,9 @@ vnoremap <leader>Al :left<cr>
vnoremap <leader>Ac :center<cr>
vnoremap <leader>Ar :right<cr>
+" Less chording
+nnoremap ; :
+
" Faster Esc
inoremap jk <esc>
@@ -722,6 +748,7 @@ cmap w!! w !sudo tee % >/dev/null
" I suck at typing.
nnoremap <localleader>= ==
+vnoremap - =
" Easy filetype switching {{{
nnoremap _md :set ft=markdown<CR>
@@ -776,6 +803,7 @@ inoremap <c-cr> <esc>A<cr>
inoremap <s-cr> <esc>A:<cr>
" Indent Guides {{{
+
let g:indentguides_state = 0
function! IndentGuides() " {{{
if g:indentguides_state
@@ -789,6 +817,27 @@ endfunction " }}}
nnoremap <leader>i :call IndentGuides()<cr>
" }}}
+" Block Colors {{{
+
+let g:blockcolor_state = 0
+function! BlockColor() " {{{
+ if g:blockcolor_state
+ let g:blockcolor_state = 0
+ call matchdelete(77880)
+ call matchdelete(77881)
+ call matchdelete(77882)
+ call matchdelete(77883)
+ else
+ let g:blockcolor_state = 1
+ call matchadd("BlockColor1", '^ \{4}.*', 1, 77880)
+ call matchadd("BlockColor2", '^ \{8}.*', 2, 77881)
+ call matchadd("BlockColor3", '^ \{12}.*', 3, 77882)
+ call matchadd("BlockColor4", '^ \{16}.*', 4, 77883)
+ endif
+endfunction " }}}
+nnoremap <leader>B :call BlockColor()<cr>
+
+" }}}
" Insert Mode Completion {{{
inoremap <c-l> <c-x><c-l>
@@ -848,6 +897,7 @@ nnoremap <leader>gco :Gcheckout<cr>
nnoremap <leader>gci :Gcommit<cr>
nnoremap <leader>gm :Gmove<cr>
nnoremap <leader>gr :Gremove<cr>
+nnoremap <leader>gl :Shell git gl -18<cr>:wincmd \|<cr>
augroup ft_fugitive
au!
View
@@ -51,6 +51,12 @@ hi Cursor guifg=#000000 guibg=#F35FBC
hi iCursor guifg=#000000 guibg=#FDFF00
hi vCursor guifg=#000000 guibg=#AAF412
" }}}
+" Block Colors {{{
+hi BlockColor1 guibg=#2a2a2a
+hi BlockColor2 guibg=#333333
+hi BlockColor3 guibg=#3b3b3b
+hi BlockColor4 guibg=#424242
+" }}}
hi GreenBar term=reverse ctermfg=white ctermbg=green guifg=black guibg=#9edf1c
hi RedBar term=reverse ctermfg=white ctermbg=red guifg=white guibg=#C50048
@@ -0,0 +1,55 @@
+SCRIPT_NAME='coloncomplete'
+SCRIPT_AUTHOR='Steve Losh <steve@stevelosh.com>'
+SCRIPT_VERSION='1.0'
+SCRIPT_LICENSE='MIT/X11'
+SCRIPT_DESC='Add a colon after nick completion when all the previous words in the input are also nicks.'
+
+import_ok=True
+
+try:
+ import weechat
+except ImportError:
+ print 'This script must be run under WeeChat'
+ print 'You can obtain a copy of WeeChat, for free, at http://www.weechat.org'
+ import_ok=False
+
+weechat_version=0
+
+def get_nicks(buffer, prefix=''):
+ channel = weechat.buffer_get_string(buffer, 'localvar_channel')
+ server = weechat.buffer_get_string(buffer, 'localvar_server')
+
+ matches = []
+
+ infolist = weechat.infolist_get('irc_nick', '', '%s,%s' % (server, channel))
+ while weechat.infolist_next(infolist):
+ nick = weechat.infolist_string(infolist, 'name')
+ if nick != 'localhost' and nick.lower().startswith(prefix.lower()):
+ matches.append(nick)
+ weechat.infolist_free(infolist)
+
+ return matches
+
+def completer(data, buffer, command):
+ cb = weechat.current_buffer()
+ if command == "/input complete_next":
+ line = weechat.buffer_get_string(cb, "input")
+ words = line.split(' ')
+ prefix = words[-1]
+ if prefix and words and all([s.endswith(':') for s in words[:-1] if s]):
+ nicks = get_nicks(cb, prefix)
+ if len(nicks) == 1:
+ for _ in range(len(prefix)):
+ weechat.command(buffer, "/input delete_previous_char")
+ weechat.command(buffer, "/input insert " + nicks[-1] + ":\\x20")
+ elif len(nicks) > 1:
+ for nick in nicks:
+ weechat.prnt(cb, "==> " + nick)
+ return weechat.WEECHAT_RC_OK_EAT
+
+ return weechat.WEECHAT_RC_OK
+
+if __name__ == "__main__" and import_ok:
+ if weechat.register(SCRIPT_NAME, SCRIPT_AUTHOR, SCRIPT_VERSION, SCRIPT_LICENSE, SCRIPT_DESC, "", ""):
+ weechat_version = weechat.info_get("version_number", "") or 0
+ weechat.hook_command_run('/input complete*', 'completer', '')
Oops, something went wrong.

0 comments on commit f1d2e6c

Please sign in to comment.