# HG changeset patch # User Steve Losh # Date 1507305148 14400 # Node ID 816a02d790f80684158cb0f8706bdb3f36150e40 # Parent a8431e53b8bdf12d79ef13b57f2f6b4d4d605f98 Update diff -r a8431e53b8bd -r 816a02d790f8 .hgsubstate --- a/.hgsubstate Fri Sep 29 10:28:47 2017 -0400 +++ b/.hgsubstate Fri Oct 06 11:52:28 2017 -0400 @@ -35,7 +35,7 @@ 26fbdd7d1f1aa5600d2ebf39bbdd292c38aac16e vim/bundle/strftimedammit 2d05440ad23f97a7874ebd9b5de3a0e65d25d85c vim/bundle/surround 19c3d966440b6cfe8d74251881a48e961ddb8648 vim/bundle/swig -cc6b92afa640db4342dc9ab9fd4215316888d6fa vim/bundle/syntastic +cd871da6b4515e393ec0ba885423594447980e09 vim/bundle/syntastic f6f2d6618a321f5b0065586a7bc934325fec81ab vim/bundle/targets 5d5c71044880443035e07009497962feacb56b20 vim/bundle/vimtex bf3fd7f67e730f93765bd3c1cfcdb18fd4043521 vim/bundle/vitality diff -r a8431e53b8bd -r 816a02d790f8 ffignore --- a/ffignore Fri Sep 29 10:28:47 2017 -0400 +++ b/ffignore Fri Oct 06 11:52:28 2017 -0400 @@ -3,6 +3,7 @@ cookbook banner.txt UnityTempFile +.m2 syntax:regex ^tags$ diff -r a8431e53b8bd -r 816a02d790f8 fish/config.fish --- a/fish/config.fish Fri Sep 29 10:28:47 2017 -0400 +++ b/fish/config.fish Fri Oct 06 11:52:28 2017 -0400 @@ -94,7 +94,7 @@ set -g -x DRIP_SHUTDOWN 30 -set -g -x MAVEN_OPTS "-Xmx512M -XX:MaxPermSize=512M" +set -g -x MAVEN_OPTS "-Xmx2048m -Xss2M -XX:ReservedCodeCacheSize=128m" set -g -x _JAVA_OPTIONS "-Djava.awt.headless=true" set -g -x GPG_TTY (tty) diff -r a8431e53b8bd -r 816a02d790f8 scalastyle_config.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scalastyle_config.xml Fri Oct 06 11:52:28 2017 -0400 @@ -0,0 +1,170 @@ + + Scalastyle standard configuration + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a8431e53b8bd -r 816a02d790f8 vim/vimrc --- a/vim/vimrc Fri Sep 29 10:28:47 2017 -0400 +++ b/vim/vimrc Fri Oct 06 11:52:28 2017 -0400 @@ -2341,6 +2341,12 @@ let g:rbpt_max = 1 " }}} +" Scala {{{ + +let g:scala_use_builtin_tagbar_defs = 0 +let g:scala_use_default_keymappings = 0 + +" }}} " Scratch {{{ command! ScratchToggle call ScratchToggle() @@ -2528,19 +2534,71 @@ let g:syntastic_check_on_open = 0 let g:syntastic_check_on_wq = 0 let g:syntastic_auto_jump = 0 -let g:syntastic_java_checker = 'javac' let g:syntastic_mode_map = { \ "mode": "active", \ "active_filetypes": [], - \ "passive_filetypes": ['java', 'html', 'rst'] + \ "passive_filetypes": ['java', 'html', 'rst', 'scala'] \ } let g:syntastic_stl_format = '[%E{%e Errors}%B{, }%W{%w Warnings}]' + +nnoremap C :SyntasticCheck + +" Java +let g:syntastic_java_checker = 'javac' + +" Javascript let g:syntastic_jsl_conf = '$HOME/.vim/jsl.conf' -let g:syntastic_scala_checkers = ['fsc'] + +" Python let g:syntastic_python_checkers = ['python'] let g:syntastic_python_python_exec = '/Users/sjl/bin/py3' -nnoremap C :SyntasticCheck +" Scala +let g:syntastic_scala_checkers = ['scalac', 'scalastyle'] +let g:syntastic_scala_checkers = ['fsc'] +let g:syntastic_scala_scalastyle_jar = '/usr/local/Cellar/scalastyle/0.8.0/libexec/scalastyle_2.11-0.8.0-batch.jar' +let g:syntastic_scala_scalastyle_config_file = '~/lib/dotfiles/scalastyle_config.xml' + +if has('autocmd') + function! FindClasspath(where) + let cpf = findfile('.classpath', escape(a:where, ' ') . ';') + let sep = syntastic#util#isRunningWindows() || has('win32unix') ? ';' : ':' + try + return cpf !=# '' ? [ '-classpath', join(readfile(cpf), sep) ] : [] + catch + return [] + endtry + endfunction + + let g:syntastic_scala_scalac_args = [ + \ '-Xfatal-warnings:false', + \ '-Xfuture', + \ '-Xlint', + \ '-Ywarn-adapted-args', + \ '-Ywarn-dead-code', + \ '-Ywarn-inaccessible', + \ '-Ywarn-infer-any', + \ '-Ywarn-nullary-override', + \ '-Ywarn-nullary-unit', + \ '-Ywarn-numeric-widen', + \ '-Ywarn-unused-import', + \ '-Ywarn-value-discard', + \ '-deprecation', + \ '-encoding', 'UTF-8', + \ '-feature', + \ '-language:existentials', + \ '-language:higherKinds', + \ '-language:implicitConversions', + \ '-unchecked', + \ '-d', ($TMPDIR !=# '' ? $TMPDIR : '/tmp') ] + + augroup syntastic_scalac + autocmd! + autocmd FileType scala let b:syntastic_scala_scalac_args = + \ get(g:, 'syntastic_scala_scalac_args', []) + + \ FindClasspath(expand(':p:h', 1)) + augroup END +endif " }}} " Splice {{{ @@ -2936,12 +2994,20 @@ " searches line-by-line. nnoremap A :set opfunc=AckMotiong@ -" xnoremap A :call AckMotion(visualmode()) - -nnoremap A :Ack! '\b

\b' -nnoremap :Ack! '\b

\b' xnoremap :call AckMotion(visualmode()) +" nnoremap A :Ack! '\b

\b' +" nnoremap :Ack! '\b

\b' + +" With C-R C-W, according to the help: "With CTRL-W the part of the word that +" was already typed is not inserted again." Because we're using \b to ack for +" word boundaries, the command string looks like `:Ack! '\b` at this point, and +" so if the word we're on happens to start with a lowercase b (e.g. "bonkers") +" it will be skipped, and we'll end up with `:Ack! '\bonkers` and find nothing. +" It took me a good long time to notice this one. Computers are total fucking +" garbage. +nnoremap viw:call AckMotion(visualmode()) + function! s:CopyMotionForType(type) if a:type ==# 'v' silent execute "normal! `<" . a:type . "`>y" diff -r a8431e53b8bd -r 816a02d790f8 weechat/buflist.conf --- a/weechat/buflist.conf Fri Sep 29 10:28:47 2017 -0400 +++ b/weechat/buflist.conf Fri Oct 06 11:52:28 2017 -0400 @@ -29,7 +29,7 @@ hotlist_low = "${color:white}" hotlist_message = "${color:green}" hotlist_none = "${color:default}" -hotlist_private = "${color:white}" +hotlist_private = "${color:magenta}" hotlist_separator = "${color:default}," indent = " " lag = " ${color:green}[${color:brown}${lag}${color:green}]" diff -r a8431e53b8bd -r 816a02d790f8 weechat/trigger.conf --- a/weechat/trigger.conf Fri Sep 29 10:28:47 2017 -0400 +++ b/weechat/trigger.conf Fri Oct 06 11:52:28 2017 -0400 @@ -73,3 +73,11 @@ server_pass.post_action = none server_pass.regex = "==^(/(server|connect) .*-(sasl_)?password=)([^ ]+)(.*)==$1$.*4$5" server_pass.return_code = ok +uncc.arguments = "weechat_print" +uncc.command = "" +uncc.conditions = "${tg_tag_nick}" +uncc.enabled = on +uncc.hook = modifier +uncc.post_action = none +uncc.regex = "== \[cc: [^ ]+\]====" +uncc.return_code = ok