# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1382712078 14400
# Node ID 2eb5091c7bda51da569a941ac3cf45c305efbd03
# Parent  8bcaac8a526e0c32b477226a9e394153178e60ca
more various shit

diff -r 8bcaac8a526e -r 2eb5091c7bda pentadactylrc
--- a/pentadactylrc	Fri Sep 06 12:24:13 2013 -0400
+++ b/pentadactylrc	Fri Oct 25 10:41:18 2013 -0400
@@ -17,8 +17,8 @@
 set showstatuslinks=command
 
 " FASTER PLEASE
-nmap -builtin j 3j
-nmap -builtin k 3k
+nmap -builtin -silent j 3j
+nmap -builtin -silent k 3k
 
 " Go to the second input field.
 " Useful for skipping over search fields, etc.
@@ -64,3 +64,6 @@
 
 " Train myself to use t instead of cmd-t
 nmap -builtin <m-t> <nop>
+
+" Apparently the d key broke at some point.  What the Christ?
+nmap -builtin d :tabclose<cr>
diff -r 8bcaac8a526e -r 2eb5091c7bda vim/after/plugin/surround-mapping.vim
--- a/vim/after/plugin/surround-mapping.vim	Fri Sep 06 12:24:13 2013 -0400
+++ b/vim/after/plugin/surround-mapping.vim	Fri Oct 25 10:41:18 2013 -0400
@@ -1,2 +1,5 @@
 " Use the old surround.vim key.  I can't deal with the new one.
-vmap s S
+xmap s <Plug>VSurround
+
+" Use S for something useful.
+vnoremap S :s/
diff -r 8bcaac8a526e -r 2eb5091c7bda vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Fri Sep 06 12:24:13 2013 -0400
+++ b/vim/custom-dictionary.utf-8.add	Fri Oct 25 10:41:18 2013 -0400
@@ -121,3 +121,13 @@
 reindent
 Javascript
 voicemail
+C2C
+ACH
+TBBK
+Arroway
+recon
+SFTP
+timestamp
+uuid
+UTC
+MoneyDrop
diff -r 8bcaac8a526e -r 2eb5091c7bda vim/vimrc
--- a/vim/vimrc	Fri Sep 06 12:24:13 2013 -0400
+++ b/vim/vimrc	Fri Oct 25 10:41:18 2013 -0400
@@ -173,7 +173,7 @@
 set expandtab
 set wrap
 set textwidth=80
-set formatoptions=qrn1
+set formatoptions=qrn1j
 set colorcolumn=+1
 
 " }}}
@@ -413,6 +413,12 @@
 " Unfuck my screen
 nnoremap U :syntax sync fromstart<cr>:redraw!<cr>
 
+" Pushing
+nnoremap <leader>Go :Start! git push origin<cr>
+nnoremap <leader>Gu :Start! git push upstream<cr>
+nnoremap <leader>Hd :Start! hg push default<cr>
+nnoremap <leader>Hu :Start! hg push upstream<cr>
+
 " Easy filetype switching {{{
 
 nnoremap _md :set ft=markdown<CR>
@@ -478,7 +484,9 @@
 nnoremap D d$
 
 " Don't move on *
-nnoremap * *<c-o>
+" I'd use a function for this but Vim clobbers the last search when you're in
+" a function so fuck it, practicality beats purity.
+nnoremap <silent> * :let stay_star_view = winsaveview()<cr>*<c-o>:call winrestview(stay_star_view)<cr>
 
 " Jumping to tags.
 "
@@ -1235,7 +1243,6 @@
 augroup END
 
 " "Hub"
-nnoremap <leader>H :Gbrowse<cr>
 vnoremap <leader>H :Gbrowse<cr>
 
 " }}}
diff -r 8bcaac8a526e -r 2eb5091c7bda weechat/alias.conf
--- a/weechat/alias.conf	Fri Sep 06 12:24:13 2013 -0400
+++ b/weechat/alias.conf	Fri Oct 25 10:41:18 2013 -0400
@@ -1,5 +1,5 @@
 #
-# alias.conf -- WeeChat v0.3.8
+# alias.conf -- weechat v0.4.1
 #
 
 [cmd]
diff -r 8bcaac8a526e -r 2eb5091c7bda weechat/buffers.conf
--- a/weechat/buffers.conf	Fri Sep 06 12:24:13 2013 -0400
+++ b/weechat/buffers.conf	Fri Oct 25 10:41:18 2013 -0400
@@ -1,5 +1,5 @@
 #
-# buffers.conf -- WeeChat v0.3.8
+# buffers.conf -- weechat v0.4.1
 #
 
 [color]
diff -r 8bcaac8a526e -r 2eb5091c7bda weechat/charset.conf
--- a/weechat/charset.conf	Fri Sep 06 12:24:13 2013 -0400
+++ b/weechat/charset.conf	Fri Oct 25 10:41:18 2013 -0400
@@ -1,5 +1,5 @@
 #
-# charset.conf -- WeeChat v0.3.8
+# charset.conf -- weechat v0.4.1
 #
 
 [default]
diff -r 8bcaac8a526e -r 2eb5091c7bda weechat/logger.conf
--- a/weechat/logger.conf	Fri Sep 06 12:24:13 2013 -0400
+++ b/weechat/logger.conf	Fri Oct 25 10:41:18 2013 -0400
@@ -1,5 +1,5 @@
 #
-# logger.conf -- WeeChat v0.3.8
+# logger.conf -- weechat v0.4.1
 #
 
 [look]
@@ -15,6 +15,8 @@
 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"
diff -r 8bcaac8a526e -r 2eb5091c7bda weechat/plugins.conf
--- a/weechat/plugins.conf	Fri Sep 06 12:24:13 2013 -0400
+++ b/weechat/plugins.conf	Fri Oct 25 10:41:18 2013 -0400
@@ -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"
diff -r 8bcaac8a526e -r 2eb5091c7bda weechat/python/autoload/colon_complete.py
--- a/weechat/python/autoload/colon_complete.py	Fri Sep 06 12:24:13 2013 -0400
+++ b/weechat/python/autoload/colon_complete.py	Fri Oct 25 10:41:18 2013 -0400
@@ -4,6 +4,8 @@
 SCRIPT_LICENSE='MIT/X11'
 SCRIPT_DESC='Add a colon after nick completion when all the previous words in the input are also nicks.'
 
+EXTRA_NICKS = ['all', 'backend', 'clojerks', 'ops', 'support']
+
 import_ok=True
 
 try:
@@ -18,16 +20,21 @@
 def get_nicks(buffer, prefix=''):
     channel = weechat.buffer_get_string(buffer, 'localvar_channel')
     server = weechat.buffer_get_string(buffer, 'localvar_server')
+    prefix = prefix.lower()
 
     matches = []
 
     infolist = weechat.infolist_get('irc_nick', '', '%s,%s' % (server, channel))
     while weechat.infolist_next(infolist):
         nick = weechat.infolist_string(infolist, 'name')
-        if nick != 'localhost' and nick.lower().startswith(prefix.lower()):
+        if nick != 'localhost' and nick.lower().startswith(prefix):
             matches.append(nick)
     weechat.infolist_free(infolist)
 
+    for nick in EXTRA_NICKS:
+        if nick.lower().startswith(prefix):
+            matches.append(nick)
+
     return matches
 
 def completer(data, buffer, command):
diff -r 8bcaac8a526e -r 2eb5091c7bda weechat/relay.conf
--- a/weechat/relay.conf	Fri Sep 06 12:24:13 2013 -0400
+++ b/weechat/relay.conf	Fri Oct 25 10:41:18 2013 -0400
@@ -1,5 +1,5 @@
 #
-# relay.conf -- WeeChat v0.3.8
+# relay.conf -- weechat v0.4.1
 #
 
 [look]
@@ -7,6 +7,7 @@
 raw_messages = 256
 
 [color]
+client = cyan
 status_active = lightblue
 status_auth_failed = lightred
 status_connecting = yellow
@@ -20,7 +21,17 @@
 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]
diff -r 8bcaac8a526e -r 2eb5091c7bda weechat/rmodifier.conf
--- a/weechat/rmodifier.conf	Fri Sep 06 12:24:13 2013 -0400
+++ b/weechat/rmodifier.conf	Fri Oct 25 10:41:18 2013 -0400
@@ -1,5 +1,5 @@
 #
-# rmodifier.conf -- WeeChat v0.3.8
+# rmodifier.conf -- weechat v0.4.1
 #
 
 [look]
diff -r 8bcaac8a526e -r 2eb5091c7bda weechat/urlgrab.conf
--- a/weechat/urlgrab.conf	Fri Sep 06 12:24:13 2013 -0400
+++ b/weechat/urlgrab.conf	Fri Oct 25 10:41:18 2013 -0400
@@ -1,5 +1,5 @@
 #
-# urlgrab.conf -- WeeChat v0.3.8
+# urlgrab.conf -- weechat v0.4.1
 #
 
 [color]
diff -r 8bcaac8a526e -r 2eb5091c7bda weechat/weechat.conf
--- a/weechat/weechat.conf	Fri Sep 06 12:24:13 2013 -0400
+++ b/weechat/weechat.conf	Fri Oct 25 10:41:18 2013 -0400
@@ -275,30 +275,32 @@
 main.buffer = "irc;simple.##/b/anksimple;5"
 main.buffer = "irc;simple.#c2c;6"
 main.buffer = "irc;simple.#ops;7"
-main.buffer = "irc;simple.#security;8"
-main.buffer = "irc;simple.##@;9"
-main.buffer = "irc;simple.#support;10"
-main.buffer = "irc;simple.##vim;11"
-main.buffer = "irc;simple.##dance;12"
-main.buffer = "irc;simple.##adorbs;13"
-main.buffer = "irc;sjl.##simple;14"
-main.buffer = "irc;simple.##portland;15"
-main.buffer = "irc;simple.##music;16"
-main.buffer = "irc;bit.&bitlbee;17"
-main.buffer = "irc;sjl.#riemann;18"
-main.buffer = "irc;sjl.#mercurial;19"
-main.buffer = "irc;sjl.#clojure;20"
-main.buffer = "irc;sjl.#weechat;21"
-main.buffer = "irc;sjl.#mutt;22"
-main.buffer = "irc;sjl.#nethack;23"
-main.buffer = "irc;sjl.#dwarffortress;24"
-main.buffer = "irc;sjl.#scala;25"
-main.buffer = "irc;sjl.#lisp;26"
-main.buffer = "irc;sjl.#vagrant;27"
-main.buffer = "irc;sjl.#amara_alumni;28"
-main.buffer = "irc;sjl.#postgresql;29"
-main.window = "1;0;0;0;irc;simple.##music"
+main.buffer = "irc;simple.#frontend;8"
+main.buffer = "irc;simple.#internal;9"
+main.buffer = "irc;simple.#security;10"
+main.buffer = "irc;simple.##@;11"
+main.buffer = "irc;simple.#support;12"
+main.buffer = "irc;simple.##vim;13"
+main.buffer = "irc;simple.##dance;14"
+main.buffer = "irc;simple.##adorbs;15"
+main.buffer = "irc;sjl.##simple;16"
+main.buffer = "irc;simple.##music;17"
+main.buffer = "irc;bit.&bitlbee;18"
+main.buffer = "irc;sjl.#riemann;19"
+main.buffer = "irc;sjl.#mercurial;20"
+main.buffer = "irc;sjl.#clojure;21"
+main.buffer = "irc;sjl.#weechat;22"
+main.buffer = "irc;sjl.#mutt;23"
+main.buffer = "irc;sjl.#nethack;24"
+main.buffer = "irc;sjl.#dwarffortress;25"
+main.buffer = "irc;sjl.#scala;26"
+main.buffer = "irc;sjl.#lisp;27"
+main.buffer = "irc;sjl.#vagrant;28"
+main.buffer = "irc;sjl.#amara_alumni;29"
+main.buffer = "irc;sjl.#postgresql;30"
+main.window = "1;0;0;0;irc;simple.#internal"
 main.current = on
+_zoom.window = "1;0;0;0;irc;simple.##vim"
 
 [notify]
 
diff -r 8bcaac8a526e -r 2eb5091c7bda weechat/xfer.conf
--- a/weechat/xfer.conf	Fri Sep 06 12:24:13 2013 -0400
+++ b/weechat/xfer.conf	Fri Oct 25 10:41:18 2013 -0400
@@ -1,5 +1,5 @@
 #
-# xfer.conf -- WeeChat v0.3.8
+# xfer.conf -- weechat v0.4.1
 #
 
 [look]
@@ -28,6 +28,7 @@
 [file]
 auto_accept_chats = off
 auto_accept_files = off
+auto_accept_nicks = ""
 auto_rename = on
 auto_resume = on
 convert_spaces = on