--- a/vim/vimrc Mon Jun 29 23:19:41 2015 -0400
+++ b/vim/vimrc Thu Jul 23 10:41:13 2015 -0400
@@ -819,6 +819,17 @@
" }}}
" Common Lisp {{{
+function! OpenLispRepl()
+ NeoRepl lisp
+ set syntax=lisp
+ syn match replPrompt /\v^\*/
+ hi def link replPrompt SpecialChar
+
+ syn match replResult /\v^#\<[^>]+\>$/
+ hi def link replResult Debug
+
+endfunction
+
function! SetLispWords()
if exists("g:did_set_lisp_words")
return
@@ -835,7 +846,7 @@
let view = winsaveview()
execute "normal! vab\<esc>"
- SendSelectionToTmuxTrimmed
+ call NeoReplSendSelection()
call winrestview(view)
endfunction
@@ -850,7 +861,7 @@
call PareditFindDefunBck()
execute "normal! vab\<esc>"
- SendSelectionToTmuxTrimmed
+ call NeoReplSendSelection()
call winrestview(view)
endfunction
@@ -859,7 +870,7 @@
let view = winsaveview()
execute "normal! ggVG\<esc>"
- SendSelectionToTmuxTrimmed
+ call NeoReplSendSelection()
call winrestview(view)
endfunction
@@ -871,16 +882,18 @@
au FileType lisp call SetLispWords()
- " Set up some basic tslime mappings until I shave the fuckin
- " Fireplace/Common Lisp yak.
+ " Set up some basic neorepl mappings until I shave the fuckin
+ " swank/neovim yak.
"
" key desc mnemonic
- " \t - connect tslime [t]slime
+ " \l - connect neorepl [l]isp
" \f - send current form [f]orm
" \e - send top-level form [e]val
" \r - send entire file [r]eload file
" \c - send ctrl-l [c]lear
+ au FileType lisp nnoremap <buffer> <silent> <localleader>l :call OpenLispRepl()<cr>
+
" Send the current form to the REPL
au FileType lisp nnoremap <buffer> <silent> <localleader>f :call SendLispForm()<cr>
@@ -891,7 +904,7 @@
au FileType lisp nnoremap <buffer> <silent> <localleader>r :call SendLispBuffer()<cr>
" Clear the REPL
- au FileType lisp nnoremap <buffer> <silent> <localleader>c :call SendToTmuxRaw(" ")<cr>
+ au FileType lisp nnoremap <buffer> <silent> <localleader>c :call NeoReplSendRaw(" ")<cr>
au FileType lisp RainbowParenthesesActivate
au syntax lisp RainbowParenthesesLoadRound
@@ -913,7 +926,7 @@
" ))
" Indent top-level form.
- au FileType lisp nmap <buffer> gi mz99[(v%='z
+ au FileType lisp nmap <buffer> <localleader>= mz99[(v%='z
" ])
augroup END
@@ -2518,3 +2531,12 @@
endif
" }}}
+" Neovim ------------------------------------------------------------------ {{{
+
+if has('nvim')
+ tnoremap <Esc> <C-\><C-n>
+ nnoremap <bs> <c-w>h
+endif
+
+" }}}
+
--- a/weechat/alias.conf Mon Jun 29 23:19:41 2015 -0400
+++ b/weechat/alias.conf Thu Jul 23 10:41:13 2015 -0400
@@ -1,5 +1,5 @@
#
-# alias.conf -- weechat v1.1.1
+# weechat -- alias.conf
#
[cmd]
--- a/weechat/aspell.conf Mon Jun 29 23:19:41 2015 -0400
+++ b/weechat/aspell.conf Thu Jul 23 10:41:13 2015 -0400
@@ -1,5 +1,5 @@
#
-# aspell.conf -- weechat v1.1.1
+# weechat -- aspell.conf
#
[color]
--- a/weechat/autosort.conf Mon Jun 29 23:19:41 2015 -0400
+++ b/weechat/autosort.conf Thu Jul 23 10:41:13 2015 -0400
@@ -5,7 +5,7 @@
[sorting]
case_sensitive = off
group_irc = on
-replacements = "[["##", "#zzzzz"]]"
+replacements = "[]"
rules = "[["core", 0], ["irc", 2], ["*", 1], ["irc.irc_raw", 0], ["irc.server", 1]]"
signals = "buffer_opened buffer_merged buffer_unmerged buffer_renamed"
sort_on_config_change = on
--- a/weechat/buffers.conf Mon Jun 29 23:19:41 2015 -0400
+++ b/weechat/buffers.conf Thu Jul 23 10:41:13 2015 -0400
@@ -1,5 +1,5 @@
#
-# buffers.conf -- weechat v1.1.1
+# weechat -- buffers.conf
#
[color]
--- a/weechat/charset.conf Mon Jun 29 23:19:41 2015 -0400
+++ b/weechat/charset.conf Thu Jul 23 10:41:13 2015 -0400
@@ -1,5 +1,5 @@
#
-# charset.conf -- weechat v1.1.1
+# weechat -- charset.conf
#
[default]
--- a/weechat/logger.conf Mon Jun 29 23:19:41 2015 -0400
+++ b/weechat/logger.conf Thu Jul 23 10:41:13 2015 -0400
@@ -1,5 +1,5 @@
#
-# logger.conf -- weechat v1.1.1
+# weechat -- logger.conf
#
[look]
--- a/weechat/plugins.conf Mon Jun 29 23:19:41 2015 -0400
+++ b/weechat/plugins.conf Thu Jul 23 10:41:13 2015 -0400
@@ -1,5 +1,5 @@
#
-# plugins.conf -- weechat v1.1.1
+# weechat -- plugins.conf
#
[var]
@@ -42,7 +42,6 @@
perl.colorize_lines.nicks = ""
perl.colorize_lines.own_lines = "off"
perl.colorize_lines.shuffle = "off"
-perl.listsort.max_size = "10000"
python.check_license = "on"
python.growl.hostname = ""
python.growl.icon = "icon.png"
@@ -60,12 +59,6 @@
python.growl.show_upgrade_ended = "on"
python.growl.sticky = "off"
python.growl.sticky_away = "on"
-python.listbuffer.autofocus = "on"
-python.listbuffer.channel_min_width = "25"
-python.listbuffer.modes_min_width = "8"
-python.listbuffer.sort_inverted = "off"
-python.listbuffer.sort_order = "channel"
-python.listbuffer.users_min_width = "8"
python.notification_center.show_highlights = "on"
python.notification_center.show_message_text = "on"
python.notification_center.show_private_message = "on"
@@ -87,10 +80,3 @@
perl.colorize_lines.nicks = "comma separated list with nicknames. Only messages from nicks in this list will be colorized. (e.g.: freenode.nils_2,freenode.flashcode,freenode.weebot). You can also give a filename with nicks. The filename has to start with "/" (e.g.: /buddylist.txt). The format has to be: one nick each line with <servername>.<nickname>"
perl.colorize_lines.own_lines = "colors own written messages (default: off)"
perl.colorize_lines.shuffle = "toggle shuffle color mode for chats area (default: off)"
-perl.listsort.max_size = "maximum size of /list output in kilobytes to be handled"
-python.listbuffer.autofocus = "Focus the listbuffer in the current window if it isn't already displayed by a window."
-python.listbuffer.channel_min_width = "The minimum width used for the channel name in the channel list. If a channelname is shorter than this amount, the column will be padded with spaces."
-python.listbuffer.modes_min_width = "The minimum width used for modes in the channel list. If a channel has less modes than this amount, the column will be padded with spaces."
-python.listbuffer.sort_inverted = "Invert the sort order for the channel list."
-python.listbuffer.sort_order = "Last used sort order for the channel list."
-python.listbuffer.users_min_width = "The minimum width used for the usercount in the channel list. If the usercount has less digits than this amount, the column will be padded with spaces."
--- a/weechat/relay.conf Mon Jun 29 23:19:41 2015 -0400
+++ b/weechat/relay.conf Thu Jul 23 10:41:13 2015 -0400
@@ -1,5 +1,5 @@
#
-# relay.conf -- weechat v1.1.1
+# weechat -- relay.conf
#
[look]
--- a/weechat/script.conf Mon Jun 29 23:19:41 2015 -0400
+++ b/weechat/script.conf Thu Jul 23 10:41:13 2015 -0400
@@ -1,5 +1,5 @@
#
-# script.conf -- weechat v1.1.1
+# weechat -- script.conf
#
[look]
--- a/weechat/sec.conf Mon Jun 29 23:19:41 2015 -0400
+++ b/weechat/sec.conf Thu Jul 23 10:41:13 2015 -0400
@@ -1,5 +1,5 @@
#
-# sec.conf -- weechat v1.1.1
+# weechat -- sec.conf
#
[crypt]
--- a/weechat/trigger.conf Mon Jun 29 23:19:41 2015 -0400
+++ b/weechat/trigger.conf Thu Jul 23 10:41:13 2015 -0400
@@ -17,31 +17,31 @@
trigger_disabled = red
[trigger]
-beep.enabled = on
-beep.hook = "print"
beep.arguments = ""
-beep.conditions = "${tg_displayed} && (${tg_highlight} || ${tg_msg_pv})"
-beep.regex = ""
beep.command = "/print -beep"
-beep.return_code = "ok"
-cmd_pass.enabled = on
-cmd_pass.hook = "modifier"
+beep.conditions = "${tg_highlight} || ${tg_msg_pv}"
+beep.enabled = on
+beep.hook = print
+beep.regex = ""
+beep.return_code = ok
cmd_pass.arguments = "5000|input_text_display;5000|history_add;5000|irc_command_auth"
-cmd_pass.conditions = ""
-cmd_pass.regex = "==^((/(msg|m|quote) +nickserv +(id|identify|register|ghost +[^ ]+|release +[^ ]+|regain +[^ ]+) +)|/oper +[^ ]+ +|/quote +pass +|/set +[^ ]*password[^ ]* +|/secure +(passphrase|decrypt|set +[^ ]+) +)(.*)==${re:1}${hide:*,${re:+}}"
cmd_pass.command = ""
-cmd_pass.return_code = ""
-msg_auth.enabled = on
-msg_auth.hook = "modifier"
+cmd_pass.conditions = ""
+cmd_pass.enabled = on
+cmd_pass.hook = modifier
+cmd_pass.regex = "==^((/(msg|quote) +nickserv +(id|identify|register|ghost +[^ ]+|release +[^ ]+|regain +[^ ]+) +)|/oper +[^ ]+ +|/quote +pass +|/set +[^ ]*password[^ ]* +|/secure +(passphrase|decrypt|set +[^ ]+) +)(.*)==$1$.*+"
+cmd_pass.return_code = ok
msg_auth.arguments = "5000|irc_message_auth"
-msg_auth.conditions = ""
-msg_auth.regex = "==^(.*(id|identify|register|ghost +[^ ]+|release +[^ ]+) +)(.*)==${re:1}${hide:*,${re:+}}"
msg_auth.command = ""
-msg_auth.return_code = ""
-server_pass.enabled = on
-server_pass.hook = "modifier"
+msg_auth.conditions = ""
+msg_auth.enabled = on
+msg_auth.hook = modifier
+msg_auth.regex = "==^(.*(id|identify|register|ghost +[^ ]+|release +[^ ]+) +)(.*)==$1$.*+"
+msg_auth.return_code = ok
server_pass.arguments = "5000|input_text_display;5000|history_add"
+server_pass.command = ""
server_pass.conditions = ""
-server_pass.regex = "==^(/(server|connect) .*-(sasl_)?password=)([^ ]+)(.*)==${re:1}${hide:*,${re:4}}${re:5}"
-server_pass.command = ""
-server_pass.return_code = "(null)"
+server_pass.enabled = on
+server_pass.hook = modifier
+server_pass.regex = "==^(/(server|connect) .*-(sasl_)?password=)([^ ]+)(.*)==$1$.*4$5"
+server_pass.return_code = ok
--- a/weechat/urlgrab.conf Mon Jun 29 23:19:41 2015 -0400
+++ b/weechat/urlgrab.conf Thu Jul 23 10:41:13 2015 -0400
@@ -1,5 +1,5 @@
#
-# urlgrab.conf -- weechat v1.1.1
+# weechat -- urlgrab.conf
#
[color]
--- a/weechat/xfer.conf Mon Jun 29 23:19:41 2015 -0400
+++ b/weechat/xfer.conf Thu Jul 23 10:41:13 2015 -0400
@@ -1,5 +1,5 @@
#
-# xfer.conf -- weechat v1.1.1
+# weechat -- xfer.conf
#
[look]