Browse files

Merge.

  • Loading branch information...
2 parents 887183d + 82a8258 commit aa596e8a9e19123bd4bd4a7605ebb72dfda55e3f @sjl committed Jul 15, 2013
View
1 bin/bootstrap.sh
@@ -39,6 +39,7 @@ ensure_link "lib/dotfiles/mutt" ".mutt"
ensure_link "lib/dotfiles/dotjs" ".js"
ensure_link "lib/dotfiles/dotcss" ".css"
ensure_link "lib/dotfiles/hgignore" ".hgignore"
+ensure_link "lib/dotfiles/gitignore" ".gitignore"
ensure_link "lib/dotfiles/ffignore" ".ffignore"
ensure_link "lib/dotfiles/ctags" ".ctags"
ensure_link "lib/dotfiles/grc" ".grc"
View
3 bin/figlet-find-font
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+ls /usr/local/share/figlet/fonts/ | grep -e 'fl[fc]' | xargs -J FONT -n1 figlet-out FONT "$@"
View
8 bin/figlet-out
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+echo
+echo ====================================================================
+FONT=$1
+echo $FONT
+shift
+figlet -w 1000 -f $FONT "$@"
View
5 bin/maven
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -e
+
+mvn "$@" | grcat ~/.grc/conf.maven
View
13 ctags
@@ -17,3 +17,16 @@
--exclude=closure-library
--langmap=Lisp:+.clj
+
+--langdef=scala
+--langmap=scala:.scala
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*(private|protected)?[ \t]*class[ \t]+([a-zA-Z0-9_]+)/\4/c,classes/
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*(private|protected)?[ \t]*object[ \t]+([a-zA-Z0-9_]+)/\4/c,objects/
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*(private|protected)?[ \t]*case class[ \t]+([a-zA-Z0-9_]+)/\4/c,case classes/
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*(private|protected)?[ \t]*case object[ \t]+([a-zA-Z0-9_]+)/\4/c,case objects/
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*(private|protected)?[ \t]*trait[ \t]+([a-zA-Z0-9_]+)/\4/t,traits/
+--regex-scala=/^[ \t]*type[ \t]+([a-zA-Z0-9_]+)/\1/T,types/
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*def[ \t]+([a-zA-Z0-9_]+)/\3/m,methods/
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*val[ \t]+([a-zA-Z0-9_]+)/\3/l,constants/
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*var[ \t]+([a-zA-Z0-9_]+)/\3/l,variables/
+--regex-scala=/^[ \t]*package[ \t]+([a-zA-Z0-9_.]+)/\1/p,packages/
View
2 dotcss/simple.com.css
@@ -1,2 +0,0 @@
-#intro-progress { display: none; }
-.badge.showing { display: none; }
View
3 ffignore
@@ -1,2 +1,5 @@
syntax:literal
.DS_Store
+
+syntax:regex
+^./target$
View
24 fish/config.fish
@@ -24,6 +24,12 @@ function et; vim ~/.tmux.conf; end
function eg; vim ~/.gitconfig; end
function es; vim ~/.slate; end
+function sjoin -d "Join input lines into a single line with spaces"; tr '\n' ' '; end
+
+function pj
+ python -m json.tool | pygmentize -l json
+end
+
function vup
set -x VAGRANT_LOG debug
vagrant up $argv
@@ -137,6 +143,11 @@ function p
~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=pack.txt $argv
end
+function s
+ ~/lib/t/t.py --task-dir="~/.simple-tasks" --list=tasks.txt $argv
+ set -g T_TASK_COUNT (count_t_tasks)
+end
+
# }}}
# Bind Keys {{{
@@ -171,6 +182,7 @@ prepend_to_path "/usr/bin"
prepend_to_path "/usr/local/bin"
prepend_to_path "/usr/local/share/python"
prepend_to_path "/usr/local/sbin"
+prepend_to_path "/usr/local/share/npm/bin"
prepend_to_path "$HOME/bin"
prepend_to_path "$HOME/lib/dotfiles/bin"
prepend_to_path "/opt/local/bin"
@@ -179,6 +191,7 @@ prepend_to_path "$HOME/lib/hg/hg"
prepend_to_path "$HOME/Library/Haskell/bin"
prepend_to_path "/usr/local/Cellar/ruby/1.9.3-p194/bin"
prepend_to_path "/Applications/Postgres.app/Contents/MacOS/bin"
+prepend_to_path "$HOME/.rbenv/shims"
set BROWSER open
@@ -193,6 +206,10 @@ set -g -x NODE_PATH "/usr/local/lib/node_modules"
set -g -x VIM_BINARY "/usr/local/bin/vim"
set -g -x MVIM_BINARY "/usr/local/bin/mvim"
+set -g -x DRIP_SHUTDOWN 30
+
+set -g -x MAVEN_OPTS "-Xmx512M -XX:MaxPermSize=512M"
+
# }}}
# Python variables {{{
@@ -216,6 +233,11 @@ set -gx WORKON_HOME "$HOME/lib/virtualenvs"
. ~/.config/fish/virtualenv.fish
# }}}
+# Rubby {{{
+
+/usr/local/bin/rbenv rehash 2>/dev/null
+
+# }}}
# Z {{{
. ~/src/z-fish/z.fish
@@ -332,7 +354,7 @@ function ll; ll1 $argv; end
# Local Settings {{{
if test -s $HOME/.config/fish/local.fish
- source $HOME/.config/fish/local.fish
+ . $HOME/.config/fish/local.fish
end
# }}}
View
9 gitconfig
@@ -12,7 +12,7 @@
branches = branch -a
remotes = remote -v
- make-the-fucking-branch-point-at-the-fucking-commit = !sh -c "git checkout $1 && git reset --hard $2" -
+ point-the-fucking-branch-at = "!sh -c 'git checkout $1 && git reset --hard $2' -"
root = rev-parse --show-toplevel
graft = cherry-pick -x
@@ -72,6 +72,10 @@
sl = "!sh -c 'git show --color=always $1 | less -R' -"
+ find-merge = "!sh -c 'git log $1..master --merges -n1' -"
+
+ fuck-up-history-from = pull --rebase
+
[push]
default = current
@@ -102,3 +106,6 @@
[web]
browser = open
+
+[include]
+ path = ~/.gitconfig_local
View
5 gitignore
@@ -0,0 +1,5 @@
+dependency-reduced-pom.xml
+tags
+tags1
+tags2
+tags.bak
View
56 grc/conf.maven
@@ -0,0 +1,56 @@
+regexp=.+ FAILURE!$
+colours=red bold
+=======
+regexp=^Expected: .+$
+colours=magenta
+=======
+regexp=^ got: .+$
+colours=magenta
+=======
+regexp=^ but: .+$
+colours=magenta
+=======
+regexp= T E S T S
+colours=cyan bold
+=======
+regexp=^Running \w+$
+colours=cyan bold
+=======
+regexp=^Tests run: \d+,
+colours=cyan bold
+=======
+regexp=^Failed tests:
+colours=red bold
+=======
+regexp=Skipped: \d+,
+colours=yellow bold
+=======
+regexp=(Failures|Errors): \d+,
+colours=red bold
+=======
+regexp=Skipped: 0,?
+colours=green bold
+=======
+regexp=(Failures|Errors): 0,
+colours=green bold
+=======
+regexp=^\[INFO\] .*$
+colours=black bold
+=======
+regexp=.*logback.classic pattern.*
+colours=black bold
+=======
+regexp=^\[INFO\] BUILD SUCCESS$
+colours=green bold
+=======
+regexp=^\[INFO\] BUILD FAILURE$
+colours=red bold
+=======
+regexp=^\[debug\] .*$
+colours=black bold
+=======
+regexp=^SLF4J: .*$
+colours=black bold
+=======
+regexp=^log4j:.*$
+colours=black bold
View
1 hgignore
@@ -3,3 +3,4 @@ syntax: glob
.DS_Store
*.pyc
tags
+tags.bak
View
5 hgrc
@@ -236,8 +236,9 @@ todo = !~/lib/t/t.py --task-dir="`$HG root`" --list=TODO $@
ignore = ![ -n "$@" ] && echo '$@' >> `$HG root`/.hgignore && \
$HG commit `$HG root`/.hgignore -Am 'Add "$@" to .hgignore.'
-# Show in MacVim
-vshow = !$HG show $@ | mvim -c ':AnsiEsc' -c 'setlocal buftype=nofile' -
+# Show in Vim
+vshow = !$HG show $@ | vim -c ':AnsiEsc' -c 'setlocal buftype=nofile' -
+vdiff = !$HG diff -p --color=always $@ | vim -c ':AnsiEsc' -c 'setlocal buftype=nofile' -
# Ack for non-ignored files
ack = !$HG locate "set:not ignored()" | xargs ack $@
View
21 mutt/muttrc
@@ -46,11 +46,12 @@ set thorough_search # strip headers and eval mimes before searching
set sidebar_delim = ' │'
set sidebar_visible = yes
-set sidebar_width = 24
+set sidebar_width = 26
color sidebar_new color221 color233
bind index,pager <down> sidebar-next
bind index,pager <up> sidebar-prev
bind index,pager <right> sidebar-open
+set sidebar_format = "%B %> %S"
# }}}
# Status Bar {{{
@@ -146,11 +147,6 @@ set sendmail_wait = 0 # no please don't silently fail, email is important
unset record
# }}}
-# Account Hooks {{{
-
-# folder-hook steve-stevelosh.com/* source ~/.mutt/steve-stevelosh.com.muttrc
-
-# }}}
# Key Bindings {{{
# Index {{{
@@ -179,11 +175,11 @@ macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
# Quickly change mailboxes
-macro index \' "<change-folder>+steve-stevelosh.com/INBOX<enter>" "go to stevelosh/INBOX"
-macro index \" "<change-folder>+steve-stevelosh.com/archive<enter>" "go to stevelosh/archive"
+macro index \' "<change-folder>+simple/INBOX<enter>" "go to INBOX"
+macro index \" "<change-folder>+simple/archive<enter>" "go to archive"
# Search with notmuch
-macro index S "<enter-command>unset wait_key<enter><shell-escape>mutt-notmuch-py -G ~/.mail/temporary/search<enter><change-folder-readonly>+temporary/search<enter>" "search mail (using notmuch)"
+macro index S "<enter-command>unset wait_key<enter><shell-escape>mutt-notmuch-py -G ~/.mail/search<enter><change-folder-readonly>+search<enter>" "search mail (using notmuch)"
# Unlimit (show [a]ll)
macro index a "<limit>all\n" "show all messages (undo limit)"
@@ -204,8 +200,8 @@ macro pager \Cu "|urlview<enter>" "call urlview to open links"
macro pager s "<pipe-message>cat > ~/Desktop/" "save message as"
# Quickly change mailboxes
-macro pager \' "<exit><change-folder>+steve-stevelosh.com/INBOX<enter>" "go to stevelosh/INBOX"
-macro pager \" "<exit><change-folder>+steve-stevelosh.com/archive<enter>" "go to stevelosh/archive"
+macro pager \' "<exit><change-folder>+steve-stevelosh.com/INBOX<enter>" "go to INBOX"
+macro pager \" "<exit><change-folder>+steve-stevelosh.com/archive<enter>" "go to archive"
# }}}
# Compose {{{
@@ -227,3 +223,6 @@ macro index,pager M "|mvim -c 'setlocal ft=mail' -c 'setlocal buftype=nofile' -
# }}}
# }}}
+# Local Settings {{{
+ source `FILE=$HOME/.mutt-local; if [ ! -s "$FILE" ]; then FILE=/dev/null;fi;echo "$FILE"`
+# }}}
View
57 offlineimaprc
@@ -1,30 +1,66 @@
[general]
ui = TTY.TTYUI
-accounts = SteveLosh
+accounts = Simple
pythonfile=~/.mutt/offlineimap.py
fsync = False
-[Account SteveLosh]
-localrepository = SteveLosh-Local
-remoterepository = SteveLosh-Remote
+# [Account SteveLosh]
+# localrepository = SteveLosh-Local
+# remoterepository = SteveLosh-Remote
+# status_backend = sqlite
+# postsynchook = notmuch new
+#
+# [Repository SteveLosh-Local]
+# type = Maildir
+# localfolders = ~/.mail/steve-stevelosh.com
+# nametrans = lambda folder: {'drafts': '[Gmail]/Drafts',
+# 'sent': '[Gmail]/Sent Mail',
+# 'flagged': '[Gmail]/Starred',
+# 'trash': '[Gmail]/Trash',
+# 'archive': '[Gmail]/All Mail',
+# }.get(folder, folder)
+#
+# [Repository SteveLosh-Remote]
+# maxconnections = 1
+# type = Gmail
+# remoteuser = steve@stevelosh.com
+# remotepasseval = get_keychain_pass(account="steve@stevelosh.com", server="imap.gmail.com")
+# realdelete = no
+# nametrans = lambda folder: {'[Gmail]/Drafts': 'drafts',
+# '[Gmail]/Sent Mail': 'sent',
+# '[Gmail]/Starred': 'flagged',
+# '[Gmail]/Trash': 'trash',
+# '[Gmail]/All Mail': 'archive',
+# }.get(folder, folder)
+# folderfilter = lambda folder: folder not in ['[Gmail]/Trash',
+# 'Nagios',
+# 'Django',
+# 'Flask',
+# '[Gmail]/Important',
+# '[Gmail]/Spam',
+# ]
+
+[Account Simple]
+localrepository = Simple-Local
+remoterepository = Simple-Remote
status_backend = sqlite
postsynchook = notmuch new
-[Repository SteveLosh-Local]
+[Repository Simple-Local]
type = Maildir
-localfolders = ~/.mail/steve-stevelosh.com
+localfolders = ~/.mail/simple
nametrans = lambda folder: {'drafts': '[Gmail]/Drafts',
'sent': '[Gmail]/Sent Mail',
'flagged': '[Gmail]/Starred',
'trash': '[Gmail]/Trash',
'archive': '[Gmail]/All Mail',
}.get(folder, folder)
-[Repository SteveLosh-Remote]
+[Repository Simple-Remote]
maxconnections = 1
type = Gmail
-remoteuser = steve@stevelosh.com
-remotepasseval = get_keychain_pass(account="steve@stevelosh.com", server="imap.gmail.com")
+remoteuser = sjl@simple.com
+remotepasseval = get_keychain_pass(account="sjl@simple.com", server="imap.gmail.com")
realdelete = no
nametrans = lambda folder: {'[Gmail]/Drafts': 'drafts',
'[Gmail]/Sent Mail': 'sent',
@@ -33,9 +69,6 @@ nametrans = lambda folder: {'[Gmail]/Drafts': 'drafts',
'[Gmail]/All Mail': 'archive',
}.get(folder, folder)
folderfilter = lambda folder: folder not in ['[Gmail]/Trash',
- 'Nagios',
- 'Django',
- 'Flask',
'[Gmail]/Important',
'[Gmail]/Spam',
]
View
2 tmux/tmux.conf
@@ -64,6 +64,8 @@ bind -r C-l resize-pane -R 5
# Only really makes sense if you have your parens bound to shifts like me.
bind -r ( select-window -t :-
bind -r ) select-window -t :+
+bind-key -r H swap-window -t -1
+bind-key -r L swap-window -t +1
# 256 colors please
set -g default-terminal "screen-256color"
View
63 vim/after/plugin/fireplace-map-unfucking.vim
@@ -0,0 +1,63 @@
+" These are all out here in the middle of goddamned nowhere because Fireplace is
+" an asshole and won't let you disable mappings like any other plugin.
+
+augroup unmap_fireplace_bullshit
+ au!
+
+ au Filetype clojure nunmap <buffer> cp
+ au Filetype clojure nunmap <buffer> cpp
+
+ au Filetype clojure nunmap <buffer> c!
+ au Filetype clojure nunmap <buffer> c!!
+
+ au Filetype clojure nunmap <buffer> cq
+ au Filetype clojure nunmap <buffer> cqq
+
+ au Filetype clojure nunmap <buffer> cqp
+ au Filetype clojure nunmap <buffer> cqc
+
+ au Filetype clojure nunmap <buffer> cpr
+
+ au Filetype clojure nunmap <buffer> K
+ au Filetype clojure nunmap <buffer> [d
+ au Filetype clojure nunmap <buffer> ]d
+
+ au Filetype clojure nunmap <buffer> [<c-d>
+ au Filetype clojure nunmap <buffer> ]<c-d>
+
+ au Filetype clojure nunmap <buffer> <c-w><c-d>
+ au Filetype clojure nunmap <buffer> <c-w>d
+ au Filetype clojure nunmap <buffer> <c-w>gd
+augroup END
+
+augroup map_good_fireplace_keys
+ au!
+
+ " [M]an (get documentation)
+ au Filetype clojure nmap <buffer> M <Plug>FireplaceK
+
+ " Go to Definition
+ au Filetype clojure nmap <buffer> <c-]> <Plug>FireplaceDjumpmzzvzz15<c-e>'z:Pulse<cr>
+ au Filetype clojure nmap <buffer> <c-\> <c-w>v<Plug>FireplaceDjumpmzzMzvzz15<c-e>'z:Pulse<cr>
+
+ " Require
+ au Filetype clojure nnoremap <buffer> <localleader>r :Require<cr>
+
+ " Require Harder
+ au Filetype clojure nnoremap <buffer> <localleader>R :Require!<cr>
+
+ " Get [S]ource
+ au Filetype clojure nmap <buffer> <localleader>s <Plug>FireplaceSource
+
+ " Eval Buffer
+ au Filetype clojure nnoremap <buffer> <localleader>eb :%Eval<cr>
+
+ " Eval Form
+ au Filetype clojure nmap <buffer> <localleader>ef <Plug>FireplacePrintab
+
+ " Eval Top-Level Form
+ au Filetype clojure nmap <buffer> <localleader>ee mz$:call PareditFindDefunBck()<cr><Plug>FireplacePrintab'z
+
+ " Open clojure command line editor client window thing
+ au Filetype clojure exe 'nmap <buffer> <localleader>E <Plug>FireplacePrompt' . &cedit . 'i'
+augroup END
1 vim/bundle/clojure-static
@@ -0,0 +1 @@
+Subproject commit 949adf73ae1a82c48cd951677c055bd38a30af99
1 vim/bundle/dispatch
@@ -0,0 +1 @@
+Subproject commit ffbd5eb50c9daf67657b87fd767d1801ac9a15a7
1 vim/bundle/maven
@@ -0,0 +1 @@
+Subproject commit 5258393bb12428c59bce8b28c9726d0326805dcf
1 vim/bundle/pgsql
@@ -0,0 +1 @@
+Subproject commit f84e170fce4f6cb60b6d1b4baa30076f2b372f1e
2 vim/bundle/rainbow-parentheses
@@ -1 +1 @@
-Subproject commit 45e270d2001d07165d24cf8e6936fdcba5724cfb
+Subproject commit eb8baa5428bde10ecc1cb14eed1d6e16f5f24695
1 vim/bundle/scala
@@ -0,0 +1 @@
+Subproject commit c81f87ca6786142b531e66a948effacc03a02184
View
35 vim/ftplugin/clojure/folding.vim
@@ -3,47 +3,30 @@ if exists('loaded_clojurefolding') || &cp
endif
let loaded_clojurefolding=1
-let folded_forms = [
+if !exists('g:clojure_fold_extra')
+ let g:clojure_fold_extra = []
+endif
+
+let s:folded_forms = [
\ 'def',
\ 'defn',
\ 'defn-',
- \ 'defform',
- \ 'defform-',
- \ 'defrule',
\ 'defprotocol',
- \ 'defparser',
\ 'defmacro',
\ 'defmethod',
\ 'defmulti',
\ 'defonce',
- \ 'defpage',
- \ 'defmigration',
- \ 'defsketch',
\ 'defspec',
- \ 'defremote',
\ 'defrecord',
- \ 'defrec',
\ 'defpartial',
\ 'extend-type',
\ 'extend-protocol',
- \ 'defgauge',
- \ 'defmeter',
- \ 'defhistogram',
- \ 'defcounter',
- \ 'deftimer',
\ 'deftest',
- \ 'defroutes',
- \ 'defentity',
- \ 'defaspect',
- \ 'add-aspect',
- \ 'defdb',
- \ 'defproject',
- \ 'defsynth',
- \ 'definst',
\ 'ns'
- \ ]
-let s:form_re = '\v^\((' . join(folded_forms, '|') . ')\s'
-let s:form_re_bare = '\v^\((' . join(folded_forms, '|') . ')$'
+ \ ] + g:clojure_fold_extra
+
+let s:form_re = '\v^\((' . join(s:folded_forms, '|') . ')\s'
+let s:form_re_bare = '\v^\((' . join(s:folded_forms, '|') . ')$'
function! s:NextNonBlankLineContents(start)
let lnum = a:start
View
108 vim/vimrc
@@ -58,7 +58,6 @@ set matchtime=3
set showbreak=↪
set splitbelow
set splitright
-set fillchars=diff:⣿,vert:│
set autowrite
set autoread
set shiftround
@@ -68,6 +67,12 @@ set dictionary=/usr/share/dict/words
set spellfile=~/.vim/custom-dictionary.utf-8.add
set colorcolumn=+1
+" iTerm2 is currently slow as ball at rendering the nice unicode lines, so for
+" now I'll just use ascii pipes. They're ugly but at least I won't want to kill
+" myself when trying to move around a file.
+" set fillchars=diff:⣿,vert:│
+set fillchars=diff:⣿,vert:\|
+
" Don't try to highlight lines longer than 800 characters.
set synmaxcol=800
@@ -283,7 +288,7 @@ function! g:FuckingCopyTheTextPlease()
let @z = old_z
endfunction
noremap <leader>p :silent! set paste<CR>"*p:set nopaste<CR>
-noremap <leader>p :r!pbpaste<cr>
+" noremap <leader>p mz:r!pbpaste<cr>`z
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.
@@ -349,9 +354,14 @@ vnoremap Q gq
" I never use l as a macro register anyway.
nnoremap ql gqq
-" Easier linewise reselection
+" Easier linewise reselection of what you just pasted.
nnoremap <leader>V V`]
+" Indent/dedent/autoindent what you just pasted.
+nnoremap <lt>> V`]<
+nnoremap ><lt> V`]>
+nnoremap =- V`]=
+
" Keep the cursor in place while joining lines
nnoremap J mzJ`z
@@ -514,9 +524,6 @@ nnoremap Vat vatV
nnoremap Vab vabV
nnoremap VaB vaBV
-" Toggle "keep current line in the center of the screen" mode
-nnoremap <leader>C :let &scrolloff=999-&scrolloff<cr>
-
" Directional Keys {{{
" It's 2013.
@@ -611,12 +618,49 @@ augroup END
" }}}
" Clojure {{{
+let g:clojure_fold_extra = [
+ \ 'defgauge',
+ \ 'defmeter',
+ \ 'defhistogram',
+ \ 'defcounter',
+ \ 'deftimer',
+ \
+ \ 'defdb',
+ \ 'defentity',
+ \ 'defaspect',
+ \ 'add-aspect',
+ \ 'defmigration',
+ \
+ \ 'defsynth',
+ \ 'definst',
+ \ 'defproject',
+ \
+ \ 'defroutes',
+ \
+ \ 'defrec',
+ \
+ \ 'defparser',
+ \
+ \ 'defform',
+ \ 'defform-',
+ \
+ \ 'defpage',
+ \ 'defsketch'
+ \
+ \ ]
+
augroup ft_clojure
au!
au BufNewFile,BufRead riemann.config set filetype=clojure
-
au FileType clojure silent! call TurnOnClojureFolding()
+ au FileType clojure compiler clojure
+ au FileType clojure setlocal report=100000
+
+ au FileType clojure RainbowParenthesesActivate
+ au syntax clojure RainbowParenthesesLoadRound
+ au syntax clojure RainbowParenthesesLoadSquare
+ au syntax clojure RainbowParenthesesLoadBraces
" Friendlier Paredit mappings.
au FileType clojure noremap <buffer> () :<c-u>call PareditWrap("(", ")")<cr>
@@ -627,10 +671,11 @@ augroup ft_clojure
au FileType clojure noremap <buffer> (s :<c-u>call PareditSplit()<cr>
au FileType clojure noremap <buffer> [ :<c-u>call PareditSmartJumpOpening(0)<cr>
au FileType clojure noremap <buffer> ] :<c-u>call PareditSmartJumpClosing(0)<cr>
- " ))))))))
+ " )))
" Indent top-level form.
- au FileType clojure nmap <buffer> <localleader>= mz:call PareditFindDefunBck()<cr>=ab'z
+ au FileType clojure nmap <buffer> <localleader>= mz99[(v%='z
+ " ])
augroup END
" }}}
@@ -899,6 +944,17 @@ augroup ft_pentadactyl
augroup END
" }}}
+" Postgresql {{{
+
+augroup ft_postgres
+ au!
+
+ au BufNewFile,BufRead *.sql set filetype=pgsql
+ au FileType pgsql set foldmethod=indent
+ au FileType pgsql set softtabstop=2 shiftwidth=2
+augroup END
+
+" }}}
" Puppet {{{
augroup ft_puppet
@@ -963,6 +1019,16 @@ augroup ft_ruby
augroup END
" }}}
+" Scala {{{
+
+augroup ft_scala
+ au!
+ au Filetype scala setlocal foldmethod=indent
+ au Filetype scala compiler maven
+ au Filetype scala let b:dispatch = 'mvn -B package install'
+augroup END
+
+" }}}
" stevelosh.com Blog Entries {{{
augroup ft_steveloshcom
@@ -1071,8 +1137,16 @@ let my_ctrlp_ffind_command = "ffind --semi-restricted --dir %s --type e -B -f"
let g:ctrlp_user_command = ['.git/', my_ctrlp_ffind_command, my_ctrlp_ffind_command]
" }}}
+" Dispatch {{{
+
+nnoremap <leader>d :Dispatch<cr>
+nnoremap <leader>m :Dispatch<cr>
+
+" }}}
" Fugitive {{{
+let g:fugitive_github_domains = ['github.banksimple.com']
+
nnoremap <leader>gd :Gdiff<cr>
nnoremap <leader>gs :Gstatus<cr>
nnoremap <leader>gw :Gwrite<cr>
@@ -1131,6 +1205,11 @@ nnoremap <leader>L :LinediffReset<cr>
nnoremap \| :call MakeGreen('')<cr>
" }}}
+" Maven {{{
+
+let g:maven_disable_mappings = 1
+
+" }}}
" NERD Tree {{{
noremap <F2> :NERDTreeToggle<cr>
@@ -1251,10 +1330,17 @@ let g:SuperTabCrMapping = 1
let g:syntastic_enable_signs = 1
let g:syntastic_check_on_open = 1
-let g:syntastic_disabled_filetypes = ['html', 'rst']
+let g:syntastic_java_checker = 'javac'
+let g:syntastic_mode_map = {
+ \ "mode": "active",
+ \ "active_filetypes": [],
+ \ "passive_filetypes": ['java', 'html', 'rst', 'scala']
+ \ }
let g:syntastic_stl_format = '[%E{%e Errors}%B{, }%W{%w Warnings}]'
let g:syntastic_jsl_conf = '$HOME/.vim/jsl.conf'
+nnoremap <leader>C :SyntasticCheck<cr>
+
" }}}
" Splice {{{
@@ -1516,7 +1602,7 @@ function! ToggleDiffWhitespace()
diffupdate
endfunc
-nnoremap <leader>dw :call ToggleDiffWhitespace()<CR>
+nnoremap <leader>W :call ToggleDiffWhitespace()<CR>
" }}}
" Error Toggles {{{
View
2 weechat/alias.conf
@@ -1,5 +1,5 @@
#
-# alias.conf -- WeeChat v0.3.8
+# alias.conf -- weechat v0.4.1
#
[cmd]
View
4 weechat/aspell.conf
@@ -1,5 +1,5 @@
#
-# aspell.conf -- weechat v0.3.7
+# aspell.conf -- weechat v0.4.1
#
[look]
@@ -9,7 +9,9 @@ color = red
commands = "ame,amsg,away,command,cycle,kick,kickban,me,msg,notice,part,query,quit,topic"
default_dict = "en"
during_search = off
+enabled = off
real_time = off
+suggestions = -1
word_min_length = 2
[dict]
View
2 weechat/buffers.conf
@@ -1,5 +1,5 @@
#
-# buffers.conf -- WeeChat v0.3.8
+# buffers.conf -- weechat v0.4.1
#
[color]
View
2 weechat/charset.conf
@@ -1,5 +1,5 @@
#
-# charset.conf -- WeeChat v0.3.8
+# charset.conf -- weechat v0.4.1
#
[default]
View
4 weechat/logger.conf
@@ -1,5 +1,5 @@
#
-# logger.conf -- WeeChat v0.3.8
+# logger.conf -- weechat v0.4.1
#
[look]
@@ -15,6 +15,8 @@ flush_delay = 120
info_lines = off
mask = "$plugin.$name.weechatlog"
name_lower_case = on
+nick_prefix = ""
+nick_suffix = ""
path = "%h/logs/"
replacement_char = "_"
time_format = "%Y-%m-%d %H:%M:%S"
View
3 weechat/plugins.conf
@@ -1,9 +1,10 @@
#
-# plugins.conf -- WeeChat v0.3.8
+# plugins.conf -- weechat v0.4.1
#
[var]
fifo.fifo = "on"
+lua.check_license = "off"
perl.buffers.color_current = "black,green"
perl.buffers.color_default = "default"
perl.buffers.color_hotlist_highlight = "lightmagenta"
View
13 weechat/relay.conf
@@ -1,12 +1,13 @@
#
-# relay.conf -- WeeChat v0.3.8
+# relay.conf -- weechat v0.4.1
#
[look]
auto_open_buffer = on
raw_messages = 256
[color]
+client = cyan
status_active = lightblue
status_auth_failed = lightred
status_connecting = yellow
@@ -20,7 +21,17 @@ text_selected = white
allowed_ips = ""
bind_address = ""
compression_level = 6
+ipv6 = on
max_clients = 5
password = ""
+ssl_cert_key = "%h/ssl/relay.pem"
+websocket_allowed_origins = ""
+
+[irc]
+backlog_max_minutes = 1440
+backlog_max_number = 256
+backlog_since_last_disconnect = on
+backlog_tags = "irc_privmsg"
+backlog_time_format = "[%H:%M] "
[port]
View
2 weechat/rmodifier.conf
@@ -1,5 +1,5 @@
#
-# rmodifier.conf -- WeeChat v0.3.8
+# rmodifier.conf -- weechat v0.4.1
#
[look]
View
48 weechat/script.conf
@@ -0,0 +1,48 @@
+#
+# script.conf -- weechat v0.4.1
+#
+
+[look]
+columns = "%s %n %V %v %u | %d | %t"
+diff_color = on
+diff_command = "auto"
+display_source = on
+quiet_actions = on
+sort = "p,n"
+translate_description = on
+use_keys = on
+
+[color]
+status_autoloaded = cyan
+status_held = white
+status_installed = lightcyan
+status_obsolete = lightmagenta
+status_popular = yellow
+status_running = lightgreen
+status_unknown = lightred
+text = default
+text_bg = default
+text_bg_selected = red
+text_date = default
+text_date_selected = white
+text_delimiters = darkgray
+text_description = default
+text_description_selected = white
+text_extension = default
+text_extension_selected = white
+text_name = cyan
+text_name_selected = lightcyan
+text_selected = white
+text_tags = brown
+text_tags_selected = yellow
+text_version = magenta
+text_version_loaded = default
+text_version_loaded_selected = white
+text_version_selected = lightmagenta
+
+[scripts]
+autoload = on
+cache_expire = 60
+dir = "%h/script"
+hold = ""
+url = "http://www.weechat.org/files/plugins.xml.gz"
View
2 weechat/urlgrab.conf
@@ -1,5 +1,5 @@
#
-# urlgrab.conf -- WeeChat v0.3.8
+# urlgrab.conf -- weechat v0.4.1
#
[color]
View
24 weechat/weechat.conf
@@ -1,5 +1,5 @@
#
-# weechat.conf -- WeeChat v0.3.8
+# weechat.conf -- weechat v0.4.1
#
[debug]
@@ -9,6 +9,7 @@ command_after_plugins = ""
command_before_plugins = ""
display_logo = on
display_version = on
+sys_rlimit = ""
[look]
align_end_of_lines = message
@@ -17,14 +18,15 @@ bar_more_left = "<<"
bar_more_right = ">>"
bar_more_up = "--"
buffer_notify_default = all
-buffer_time_format = "%H:%M:%S"
+buffer_time_format = "%H:%M"
color_basic_force_bold = off
color_inactive_buffer = off
color_inactive_message = on
color_inactive_prefix = on
color_inactive_prefix_buffer = on
color_inactive_time = off
color_inactive_window = off
+color_nick_offline = off
color_pairs_auto_reset = 5
color_real_white = off
command_chars = ""
@@ -33,7 +35,7 @@ day_change = on
day_change_time_format = "%a, %d %b %Y"
eat_newline_glitch = off
highlight = "sjl"
-highlight_regex = "(sjl|^all[,:])"
+highlight_regex = "(sjl|^all[,:]|backend(ia?)|slj|clojerks)"
highlight_tags = ""
hotlist_add_buffer_if_away = on
hotlist_buffer_separator = ", "
@@ -54,10 +56,11 @@ item_buffer_filter = "*"
item_time_format = "%H:%M"
jump_current_to_previous_buffer = on
jump_previous_buffer_when_closing = on
+jump_smart_back_to_buffer = on
mouse = off
mouse_timer_delay = 100
-nickmode = on
-nickmode_empty = off
+nick_prefix = ""
+nick_suffix = ""
paste_bracketed = off
paste_bracketed_timer_delay = 10
paste_max_lines = 3
@@ -66,9 +69,11 @@ prefix_align = right
prefix_align_max = 15
prefix_align_min = 0
prefix_align_more = "+"
+prefix_align_more_after = on
prefix_buffer_align = right
prefix_buffer_align_max = 0
prefix_buffer_align_more = "+"
+prefix_buffer_align_more_after = on
prefix_error = "=!="
prefix_join = "✔"
prefix_network = "--"
@@ -88,6 +93,8 @@ separator_horizontal = "-"
separator_vertical = ""
set_title = on
time_format = "%a, %d %b %Y %T"
+window_separator_horizontal = on
+window_separator_vertical = on
[palette]
@@ -105,8 +112,13 @@ chat_inactive_buffer = darkgray
chat_inactive_window = darkgray
chat_nick = lightcyan
chat_nick_colors = "226,208,136,206,081,082,099,068,048,112"
+chat_nick_offline = darkgray
+chat_nick_offline_highlight = default
+chat_nick_offline_highlight_bg = darkgray
chat_nick_other = cyan
+chat_nick_prefix = green
chat_nick_self = white
+chat_nick_suffix = green
chat_prefix_action = white
chat_prefix_buffer = brown
chat_prefix_buffer_inactive_buffer = darkgray
@@ -215,7 +227,7 @@ nicklist.color_fg = default
nicklist.conditions = "nicklist"
nicklist.filling_left_right = vertical
nicklist.filling_top_bottom = columns_vertical
-nicklist.hidden = off
+nicklist.hidden = on
nicklist.items = "buffer_nicklist"
nicklist.position = right
nicklist.priority = 200
View
3 weechat/xfer.conf
@@ -1,5 +1,5 @@
#
-# xfer.conf -- WeeChat v0.3.8
+# xfer.conf -- weechat v0.4.1
#
[look]
@@ -28,6 +28,7 @@ timeout = 300
[file]
auto_accept_chats = off
auto_accept_files = off
+auto_accept_nicks = ""
auto_rename = on
auto_resume = on
convert_spaces = on

0 comments on commit aa596e8

Please sign in to comment.