Permalink
Browse files

update

  • Loading branch information...
1 parent 01f2002 commit 82a8258c44f1a8facaaa2fbcc3f3d768a9e2f473 @sjl committed Jul 15, 2013
View
@@ -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
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+echo
+echo ====================================================================
+FONT=$1
+echo $FONT
+shift
+figlet -w 1000 -f $FONT "$@"
View
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -e
+
+mvn "$@" | grcat ~/.grc/conf.maven
View
@@ -1,2 +0,0 @@
-#intro-progress { display: none; }
-.badge.showing { display: none; }
View
@@ -24,6 +24,8 @@ 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
@@ -141,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 {{{
@@ -184,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
@@ -200,6 +208,8 @@ 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 {{{
@@ -223,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
@@ -339,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
@@ -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
View
@@ -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
@@ -119,65 +119,34 @@ hdr_order from: to: cc: date: subject: # and in this order
# }}}
# steve@stevelosh.com {{{
-# # Default inbox.
-# set spoolfile = "+steve-stevelosh.com/INBOX"
-
-# # Alternate email addresses.
-# alternates sjl@pculture.org still\.?life@gmail.com steve@ladyluckblues.com steve@pculture.org
-
-# # Mailboxes to show in the sidebar.
-# mailboxes +steve-stevelosh.com/INBOX \
-# +steve-stevelosh.com/vim \
-# +steve-stevelosh.com/clojure \
-# +steve-stevelosh.com/python \
-# +steve-stevelosh.com/mercurial \
-# +steve-stevelosh.com/archive \
-# +steve-stevelosh.com/sent \
-# +steve-stevelosh.com/drafts \
-# +temporary/search \
-
-# # Other special folders.
-# set mbox = "+steve-stevelosh.com/archive"
-# set postponed = "+steve-stevelosh.com/drafts"
-
-# # Sending email.
-# set from = "steve@stevelosh.com"
-# set sendmail = "/usr/local/bin/msmtp -a stevelosh"
-# set sendmail_wait = 0 # no please don't silently fail, email is important
-# unset record
-
-# }}}
-# sjl@simple.com {{{
-
# Default inbox.
-set spoolfile = "+simple/INBOX"
+set spoolfile = "+steve-stevelosh.com/INBOX"
# Alternate email addresses.
-alternates slj@simple.com
+alternates sjl@pculture.org still\.?life@gmail.com steve@ladyluckblues.com steve@pculture.org
# Mailboxes to show in the sidebar.
-mailboxes +simple/INBOX \
- +simple/archive \
- +simple/sent \
- +simple/drafts \
- +search \
+mailboxes +steve-stevelosh.com/INBOX \
+ +steve-stevelosh.com/vim \
+ +steve-stevelosh.com/clojure \
+ +steve-stevelosh.com/python \
+ +steve-stevelosh.com/mercurial \
+ +steve-stevelosh.com/archive \
+ +steve-stevelosh.com/sent \
+ +steve-stevelosh.com/drafts \
+ +temporary/search \
# Other special folders.
-set mbox = "+simple/archive"
-set postponed = "+simple/drafts"
+set mbox = "+steve-stevelosh.com/archive"
+set postponed = "+steve-stevelosh.com/drafts"
# Sending email.
-set from = "sjl@simple.com"
-set sendmail = "/usr/local/bin/msmtp -a simple"
+set from = "steve@stevelosh.com"
+set sendmail = "/usr/local/bin/msmtp -a stevelosh"
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 {{{
@@ -231,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>+sjl-simple.com/INBOX<enter>" "go to INBOX"
-macro pager \" "<exit><change-folder>+sjl-simple.com/archive<enter>" "go to 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 {{{
@@ -254,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
@@ -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"
@@ -37,7 +37,8 @@ augroup map_good_fireplace_keys
au Filetype clojure nmap <buffer> M <Plug>FireplaceK
" Go to Definition
- au Filetype clojure nmap <buffer> gd <Plug>FireplaceDjump
+ 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>
@@ -48,11 +49,14 @@ augroup map_good_fireplace_keys
" 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
+ 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'
Submodule dispatch added at ffbd5e
Submodule maven added at 525839
Submodule pgsql added at f84e17
@@ -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
Oops, something went wrong.

0 comments on commit 82a8258

Please sign in to comment.