Commits

Steve Losh committed 7886260

MORE

  • Participants
  • Parent commits 175c217

Comments (0)

Files changed (25)

 vim/bundle/python-mode    = [git]git://github.com/klen/python-mode.git
 vim/bundle/repeat         = [git]git://github.com/tpope/vim-repeat.git
 vim/bundle/salt           = [git]git://github.com/saltstack/salt-vim.git
+vim/bundle/scala          = [git]git://github.com/derekwyatt/vim-scala.git
 vim/bundle/slimv          = [hg]https://bitbucket.org/sjl/slimv
 vim/bundle/smartinput     = [git]git://github.com/kana/vim-smartinput.git
 vim/bundle/sparkup        = [git]git://github.com/sjl/vim-sparkup.git
 1b4b8f1a8f1c88d8caae6c1b12c22c52ef418f32 vim/bundle/python-mode
 613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat
 61a7567a3cdd68cb65ceb3061071ce66d8110e65 vim/bundle/salt
+c81f87ca6786142b531e66a948effacc03a02184 vim/bundle/scala
 7eb00bb460f91dcb347b23198dff343b4d8e92a9 vim/bundle/slimv
 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup

File bin/bootstrap.sh

 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"
 --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/ 
 syntax:literal
 .DS_Store
+
+syntax:regex
+^./target$

File fish/config.fish

 function eg; vim ~/.gitconfig; end
 function es; vim ~/.slate; end
 
+function pj
+    python -m json.tool | pygmentize -l json
+end
+
 function vup
     set -x VAGRANT_LOG debug
     vagrant up $argv
 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"
 set -g -x VIM_BINARY "/usr/local/bin/vim"
 set -g -x MVIM_BINARY "/usr/local/bin/mvim"
 
+set -g -x DRIP_SHUTDOWN 30
+
 # }}}
 # Python variables {{{
 
 
 [web]
     browser = open
+
+[include]
+    path = ~/.gitconfig_local
+dependency-reduced-pom.xml
+tags
+tags1
+tags2
+tags.bak
 .DS_Store
 *.pyc
 tags
+tags.bak
 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 $@
 
 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 {{{
 # }}}
 # 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 = "+steve-stevelosh.com/INBOX"
+set spoolfile = "+simple/INBOX"
 
 # Alternate email addresses.
-alternates sjl@pculture.org still\.?life@gmail.com steve@ladyluckblues.com steve@pculture.org
+alternates slj@simple.com
 
 # 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 \
+mailboxes +simple/INBOX \
+          +simple/archive \
+          +simple/sent \
+          +simple/drafts \
+          +search \
 
 # Other special folders.
-set mbox      = "+steve-stevelosh.com/archive"
-set postponed = "+steve-stevelosh.com/drafts"
+set mbox      = "+simple/archive"
+set postponed = "+simple/drafts"
 
 # Sending email.
-set from     = "steve@stevelosh.com"
-set sendmail = "/usr/local/bin/msmtp -a stevelosh"
+set from     = "sjl@simple.com"
+set sendmail = "/usr/local/bin/msmtp -a simple"
 set sendmail_wait = 0 # no please don't silently fail, email is important
 unset record
 
 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)"
 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>+sjl-simple.com/INBOX<enter>"   "go to INBOX"
+macro pager \" "<exit><change-folder>+sjl-simple.com/archive<enter>" "go to archive"
 
 # }}}
 # Compose {{{

File offlineimaprc

 [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',
                             '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',
                             '[Gmail]/All Mail':  'archive',
                             }.get(folder, folder)
 folderfilter = lambda folder: folder not in ['[Gmail]/Trash',
-                                             'Nagios',
-                                             'Django',
-                                             'Flask',
                                              '[Gmail]/Important',
                                              '[Gmail]/Spam',
                                              ]
     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.
 " 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
 
 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.
 augroup END
 
 " }}}
+" Scala {{{
+
+augroup ft_scala
+    au!
+    au Filetype scala setlocal foldmethod=indent
+augroup END
+
+" }}}
 " stevelosh.com Blog Entries {{{
 
 augroup ft_steveloshcom
 
 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 {{{
 

File weechat/alias.conf

 #
-# alias.conf -- WeeChat v0.3.8
+# alias.conf -- weechat v0.4.1
 #
 
 [cmd]

File weechat/aspell.conf

 #
-# aspell.conf -- weechat v0.3.7
+# aspell.conf -- weechat v0.4.1
 #
 
 [look]
 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]

File weechat/buffers.conf

 #
-# buffers.conf -- WeeChat v0.3.8
+# buffers.conf -- weechat v0.4.1
 #
 
 [color]

File weechat/charset.conf

 #
-# charset.conf -- WeeChat v0.3.8
+# charset.conf -- weechat v0.4.1
 #
 
 [default]

File weechat/logger.conf

 #
-# logger.conf -- WeeChat v0.3.8
+# logger.conf -- weechat v0.4.1
 #
 
 [look]
 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"

File weechat/plugins.conf

 #
-# 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"

File weechat/relay.conf

 #
-# relay.conf -- WeeChat v0.3.8
+# relay.conf -- weechat v0.4.1
 #
 
 [look]
 raw_messages = 256
 
 [color]
+client = cyan
 status_active = lightblue
 status_auth_failed = lightred
 status_connecting = yellow
 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]

File weechat/rmodifier.conf

 #
-# rmodifier.conf -- WeeChat v0.3.8
+# rmodifier.conf -- weechat v0.4.1
 #
 
 [look]

File weechat/script.conf

+#
+# 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"

File weechat/urlgrab.conf

 #
-# urlgrab.conf -- WeeChat v0.3.8
+# urlgrab.conf -- weechat v0.4.1
 #
 
 [color]

File weechat/weechat.conf

 #
-# weechat.conf -- WeeChat v0.3.8
+# weechat.conf -- weechat v0.4.1
 #
 
 [debug]
 command_before_plugins = ""
 display_logo = on
 display_version = on
+sys_rlimit = ""
 
 [look]
 align_end_of_lines = message
 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 = ""
 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
 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 = "--"
 separator_vertical = ""
 set_title = on
 time_format = "%a, %d %b %Y %T"
+window_separator_horizontal = on
+window_separator_vertical = on
 
 [palette]
 
 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

File weechat/xfer.conf

 #
-# xfer.conf -- WeeChat v0.3.8
+# xfer.conf -- weechat v0.4.1
 #
 
 [look]
 [file]
 auto_accept_chats = off
 auto_accept_files = off
+auto_accept_nicks = ""
 auto_rename = on
 auto_resume = on
 convert_spaces = on