Mercurial > dotfiles

changeset 411:6a0c9e43e34e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge changes.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 20 Dec 2017 09:17:09 -0800
parents f2e130a94842 (diff) 5bbd5963591c (current diff)
children 0ca43d601919
files
diffstat 21 files changed, 317 insertions(+), 207 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsub	Wed Dec 20 09:11:19 2017 -0800
+++ b/.hgsub	Wed Dec 20 09:17:09 2017 -0800
@@ -5,6 +5,7 @@
 vim/bundle/ag = [git]https://github.com/rking/ag.vim.git
 vim/bundle/commentary = [git]https://github.com/tpope/vim-commentary.git
 vim/bundle/easymotion = [git]https://github.com/Lokaltog/vim-easymotion.git
+vim/bundle/fish = [git]https://github.com/dag/vim-fish.git
 vim/bundle/fugitive = [git]https://github.com/tpope/vim-fugitive.git
 vim/bundle/haml = [git]https://github.com/tpope/vim-haml.git
 vim/bundle/interestingwords = [git]https://github.com/vasconcelloslf/vim-interestingwords.git
--- a/.hgsubstate	Wed Dec 20 09:11:19 2017 -0800
+++ b/.hgsubstate	Wed Dec 20 09:17:09 2017 -0800
@@ -19,6 +19,7 @@
 7fa89fec125ce60a341f7c37dd769a8a31c49359 vim/bundle/ctrlp
 2f6947480203b734b069e5d9f69ba440db6b4698 vim/bundle/ctrlp-py-matcher
 e4d71c7ba45baf860fdaaf8c06cd9faebdccbd50 vim/bundle/easymotion
+50b95cbbcd09c046121367d49039710e9dc9c15f vim/bundle/fish
 913fff1cea3aa1a08a360a494fa05555e59147f5 vim/bundle/fugitive
 1d84591fff04caebab75cba2294fc3843f0a4a29 vim/bundle/gundo
 f7a417234deadb6283bfb2c437d4f11cd2f7ab55 vim/bundle/gutentags
--- a/fish/config.fish	Wed Dec 20 09:11:19 2017 -0800
+++ b/fish/config.fish	Wed Dec 20 09:17:09 2017 -0800
@@ -4,15 +4,20 @@
 set -g -x fish_greeting 'Hello.'
 
 # Homebrew.
-set -g -x PATH /usr/local/sbin $PATH
-set -g -x PATH /usr/local/bin $PATH
+#set -g -x PATH /usr/local/sbin $PATH
+#set -g -x PATH /usr/local/bin $PATH
  
 # My own stuff.
-set -g -x PATH $HOME/.local/bin $PATH
-set -g -x PATH $HOME/bin $PATH
+if test -d $HOME/.local/bin
+    set -g -x PATH $HOME/.local/bin $PATH
+end
+if test -d $HOME/bin
+    set -g -x PATH $HOME/bin $PATH
+end
 set -g -x OS MacOSX
 set -g -x EDITOR vim
 set -g -x SHELL fish
+set -g -x TERM screen-256color-bce
 
 # Python.
 set -g -x VIRTUAL_ENV_DISABLE_PROMPT 1
@@ -20,10 +25,18 @@
 # Go.
 set -g -x GOPATH /usr/local/Cellar/go/1.4/gocode
 
+if type -q git 
+    set -g -x __local_has_git
+end
+if type -q hg
+    set -g -x __local_has_hg
+end
+
 # }}}
 
 # Aliases {{{
 
+# Run Tmux in UTF8 and 256 colours always.
 alias tm 'tmux -u2'
 
 # }}}
@@ -46,30 +59,36 @@
 end
 
 function prompt_char
-    if git branch >/dev/null 2>/dev/null 
-        printf '±' ; return
+    if set -q __local_has_git
+        if git branch >/dev/null 2>/dev/null 
+            printf '±' ; return
+        end
+        if hg root >/dev/null 2>/dev/null
+            printf '☿' ; return
+        end
+        echo '○'
     end
-    if hg root >/dev/null 2>/dev/null
-        printf '☿' ; return
-    end
-    echo '○'
 end
 
 function hg_prompt
-    set_color magenta
-    printf '%s' (fast-hg-bookmark 2>/dev/null)
-    set_color normal
+    if set -q __local_has_hg
+        set_color magenta
+        printf '%s' (fast-hg-bookmark 2>/dev/null)
+        set_color normal
+    end
 end
 
 function git_prompt
-    if git root >/dev/null 2>&1
-        set_color normal
-        printf ' on '
-        set_color magenta
-        printf '%s' (git currentbranch ^/dev/null)
-        set_color green
-        git_prompt_status
-        set_color normal
+    if set -q __local_has_git
+        if git root >/dev/null 2>&1
+            set_color normal
+            printf ' on '
+            set_color magenta
+            printf '%s' (git currentbranch ^/dev/null)
+            set_color green
+            git_prompt_status
+            set_color normal
+        end
     end
 end
 
@@ -128,7 +147,7 @@
 
 # Virtualenv wrapper for Fish {{{
 
-eval (/usr/local/bin/python2.7 -m virtualfish)
+#eval (python -m virtualfish)
 
 #set -g VIRTUALFISH_COMPAT_ALIASES # uncomment for virtualenvwrapper-style commands
 #. $HOME/.config/fish/virtualfish/virtual.fish
--- a/git/gitconfig	Wed Dec 20 09:11:19 2017 -0800
+++ b/git/gitconfig	Wed Dec 20 09:17:09 2017 -0800
@@ -1,6 +1,6 @@
 [user]
-name = Ludovic Chabant
-email = ludovic@chabant.com
+	name = Ludovic Chabant
+	email = ludovic@chabant.com
 
 [push]
 default = simple
@@ -18,3 +18,7 @@
 [mergetool "sourcetree"]
 	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
 	trustExitCode = true
+[core]
+	excludesfile = /Users/abdul/.gitignore_global
+[commit]
+	template = /Users/abdul/.stCommitMsg
--- a/hgrc/hgignore	Wed Dec 20 09:11:19 2017 -0800
+++ b/hgrc/hgignore	Wed Dec 20 09:17:09 2017 -0800
@@ -2,6 +2,7 @@
 
 *~
 *.pyo
+*.orig
 .DS_Store
 Thumbs.db
 
--- a/install.sh	Wed Dec 20 09:11:19 2017 -0800
+++ b/install.sh	Wed Dec 20 09:17:09 2017 -0800
@@ -22,15 +22,16 @@
 echo %include $CWD/hgrc/hgrc > "$HOME/.hgrc"
 echo [ui] >> "$HOME/.hgrc"
 echo ignore = $CWD/hgrc/hgignore >> "$HOME/.hgrc"
+echo [subrepos] >> "$HOME/.hgrc"
+echo git:allowed = true >> "$HOME/.hgrc"
 echo [extensions] >> "$HOME/.hgrc"
 echo hggit = $CWD/lib/hg/hg-git/hggit/ >> "$HOME/.hgrc"
 echo onsub = $CWD/lib/hg/onsub/onsub.py >> "$HOME/.hgrc"
 echo allpaths = $CWD/lib/hg/allpaths/mercurial_all_paths.py >> "$HOME/.hgrc"
 echo prompt = $CWD/lib/hg/hg-prompt/prompt.py >> "$HOME/.hgrc"
 echo changelog = $CWD/lib/hg/changelog/changelog.py >> "$HOME/.hgrc"
-echo evolve = $CWD/lib/hg/mutable-history/hgext/evolve.py >> "$HOME/.hgrc"
+echo evolve = $CWD/lib/hg/mutable-history/hgext3rd/evolve >> "$HOME/.hgrc"
 echo terse-status = $CWD/lib/hg/terse-status/terse-status.py >> "$HOME/.hgrc"
-echo path-pattern = $CWD/lib/hg/path-pattern/mercurial_path_pattern.py >> "$HOME/.hgrc"
 
 # GIT
 # ---
@@ -59,3 +60,13 @@
 echo source "$CWD/mutt/muttrc" >> "$HOME/.muttrc"
 echo source "$CWD/mutt/mutt-colors-solarized/mutt-colors-solarized-dark-256.muttrc" >> "$HOME/.muttrc"
 
+
+if [ ! -d $HOME/.local/bin ]; then
+    mkdir -p $HOME/.local/bin
+fi
+ln -s "$CWD/lib/hg/fast-hg-prompt/fast-hg-bookmark" "$HOME/.local/bin/fast-hg-bookmark"
+ln -s "$CWD/lib/hg/fast-hg-prompt/fast-hg-remote" "$HOME/.local/bin/fast-hg-remote"
+ln -s "$CWD/lib/hg/fast-hg-prompt/fast-hg-status" "$HOME/.local/bin/fast-hg-status"
+chmod +x "$HOME/.local/bin/fast-hg-bookmark"
+chmod +x "$HOME/.local/bin/fast-hg-remote"
+chmod +x "$HOME/.local/bin/fast-hg-status"
--- a/tmux/tmux.conf	Wed Dec 20 09:11:19 2017 -0800
+++ b/tmux/tmux.conf	Wed Dec 20 09:17:09 2017 -0800
@@ -14,3 +14,5 @@
 # Default to fish
 set -g default-command "fish"
 
+set -g default-terminal "xterm"
+
--- a/weechat/alias.conf	Wed Dec 20 09:11:19 2017 -0800
+++ b/weechat/alias.conf	Wed Dec 20 09:17:09 2017 -0800
@@ -1,5 +1,12 @@
 #
-# alias.conf -- weechat v1.1.1
+# weechat -- alias.conf
+#
+# WARNING: It is NOT recommended to edit this file by hand,
+# especially if WeeChat is running.
+#
+# Use /set or similar command to change settings in WeeChat.
+#
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [cmd]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/weechat/buflist.conf	Wed Dec 20 09:17:09 2017 -0800
@@ -0,0 +1,38 @@
+#
+# weechat -- buflist.conf
+#
+# WARNING: It is NOT recommended to edit this file by hand,
+# especially if WeeChat is running.
+#
+# Use /set or similar command to change settings in WeeChat.
+#
+# For more info, see: https://weechat.org/doc/quickstart
+#
+
+[look]
+auto_scroll = 50
+display_conditions = "${buffer.hidden}==0"
+enabled = on
+mouse_jump_visited_buffer = off
+mouse_move_buffer = on
+mouse_wheel = on
+nick_prefix = off
+nick_prefix_empty = on
+signals_refresh = ""
+sort = "number,-active"
+
+[format]
+buffer = "${format_number}${indent}${format_nick_prefix}${color_hotlist}${format_name}"
+buffer_current = "${color:,blue}${format_buffer}"
+hotlist = " ${color:green}(${hotlist}${color:green})"
+hotlist_highlight = "${color:magenta}"
+hotlist_low = "${color:white}"
+hotlist_message = "${color:brown}"
+hotlist_none = "${color:default}"
+hotlist_private = "${color:green}"
+hotlist_separator = "${color:default},"
+indent = "  "
+lag = " ${color:green}[${color:brown}${lag}${color:green}]"
+name = "${name}"
+nick_prefix = "${color_nick_prefix}${nick_prefix}"
+number = "${color:green}${number}${if:${number_displayed}?.: }"
--- a/weechat/charset.conf	Wed Dec 20 09:11:19 2017 -0800
+++ b/weechat/charset.conf	Wed Dec 20 09:17:09 2017 -0800
@@ -1,5 +1,12 @@
 #
-# charset.conf -- weechat v1.1.1
+# weechat -- charset.conf
+#
+# WARNING: It is NOT recommended to edit this file by hand,
+# especially if WeeChat is running.
+#
+# Use /set or similar command to change settings in WeeChat.
+#
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [default]
--- a/weechat/exec.conf	Wed Dec 20 09:11:19 2017 -0800
+++ b/weechat/exec.conf	Wed Dec 20 09:17:09 2017 -0800
@@ -1,5 +1,12 @@
 #
-# exec.conf -- weechat v1.1.1
+# weechat -- exec.conf
+#
+# WARNING: It is NOT recommended to edit this file by hand,
+# especially if WeeChat is running.
+#
+# Use /set or similar command to change settings in WeeChat.
+#
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [command]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/weechat/fifo.conf	Wed Dec 20 09:17:09 2017 -0800
@@ -0,0 +1,14 @@
+#
+# weechat -- fifo.conf
+#
+# WARNING: It is NOT recommended to edit this file by hand,
+# especially if WeeChat is running.
+#
+# Use /set or similar command to change settings in WeeChat.
+#
+# For more info, see: https://weechat.org/doc/quickstart
+#
+
+[file]
+enabled = on
+path = "%h/weechat_fifo"
--- a/weechat/irc.conf	Wed Dec 20 09:11:19 2017 -0800
+++ b/weechat/irc.conf	Wed Dec 20 09:17:09 2017 -0800
@@ -1,5 +1,12 @@
 #
-# irc.conf -- weechat v1.1.1
+# weechat -- irc.conf
+#
+# WARNING: It is NOT recommended to edit this file by hand,
+# especially if WeeChat is running.
+#
+# Use /set or similar command to change settings in WeeChat.
+#
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [look]
@@ -27,7 +34,6 @@
 highlight_pv = "$nick"
 highlight_server = "$nick"
 highlight_tags_restrict = "irc_privmsg,irc_notice"
-item_away_message = on
 item_channel_modes_hide_args = "k"
 item_display_server = buffer_plugin
 item_nick_modes = on
@@ -36,9 +42,6 @@
 msgbuffer_fallback = current
 new_channel_position = none
 new_pv_position = none
-nick_color_force = ""
-nick_color_hash = sum
-nick_color_stop_chars = "_|["
 nick_completion_smart = speakers
 nick_mode = prefix
 nick_mode_empty = off
@@ -65,7 +68,6 @@
 
 [color]
 input_nick = lightcyan
-item_away = yellow
 item_channel_modes = default
 item_lag_counting = default
 item_lag_finished = yellow
@@ -76,14 +78,15 @@
 nick_prefixes = "q:lightred;a:lightcyan;o:lightgreen;h:lightmagenta;v:yellow;*:lightblue"
 notice = green
 reason_quit = default
+topic_current = default
 topic_new = white
 topic_old = darkgray
 
 [network]
-alternate_nick = on
 autoreconnect_delay_growing = 2
 autoreconnect_delay_max = 1800
 ban_mask_default = "*!$ident@$host"
+channel_encode = off
 colors_receive = on
 colors_send = on
 lag_check = 60
@@ -93,6 +96,7 @@
 lag_refresh_interval = 1
 notify_check_ison = 1
 notify_check_whois = 5
+sasl_fail_unavailable = on
 send_unknown_commands = off
 whois_double_nick = on
 
@@ -118,17 +122,19 @@
 command = ""
 command_delay = 0
 connection_timeout = 60
-default_msg_kick = ""
-default_msg_part = "WeeChat %v"
-default_msg_quit = "WeeChat %v"
 ipv6 = on
 local_hostname = ""
+msg_kick = ""
+msg_part = "WeeChat ${info:version}"
+msg_quit = "WeeChat ${info:version}"
 nicks = "lordabdul,lordabdul1,lordabdul2,lordabdul3,lordabdul4"
+nicks_alternate = on
 notify = ""
 password = ""
 proxy = ""
 realname = ""
 sasl_fail = continue
+sasl_key = ""
 sasl_mechanism = plain
 sasl_password = ""
 sasl_timeout = 15
@@ -139,154 +145,47 @@
 ssl_fingerprint = ""
 ssl_priorities = "NORMAL"
 ssl_verify = on
+usermode = ""
 username = "lordabdul"
 
 [server]
-freenode.addresses = "chat.freenode.net/6667"
-freenode.proxy
-freenode.ipv6
-freenode.ssl
-freenode.ssl_cert
-freenode.ssl_priorities
-freenode.ssl_dhkey_size
-freenode.ssl_fingerprint
-freenode.ssl_verify
-freenode.password
-freenode.capabilities
-freenode.sasl_mechanism
-freenode.sasl_username
-freenode.sasl_password
-freenode.sasl_timeout
-freenode.sasl_fail
-freenode.autoconnect = on
-freenode.autoreconnect
-freenode.autoreconnect_delay
-freenode.nicks
-freenode.username
-freenode.realname
-freenode.local_hostname
-freenode.command = "/msg nickserv identify lordabdul ${sec.data.freenode}"
-freenode.command_delay
-freenode.autojoin = "#duckduckgo,#mercurial,#pentadactyl,#vimperator,#twister"
-freenode.autorejoin
-freenode.autorejoin_delay
-freenode.connection_timeout
-freenode.anti_flood_prio_high
-freenode.anti_flood_prio_low
-freenode.away_check
-freenode.away_check_max_nicks
-freenode.default_msg_kick
-freenode.default_msg_part
-freenode.default_msg_quit
-freenode.notify
-quakenet.addresses = "irc.quakenet.org/6667"
-quakenet.proxy
-quakenet.ipv6
-quakenet.ssl
-quakenet.ssl_cert
-quakenet.ssl_priorities
-quakenet.ssl_dhkey_size
-quakenet.ssl_fingerprint
-quakenet.ssl_verify
-quakenet.password
-quakenet.capabilities
-quakenet.sasl_mechanism
-quakenet.sasl_username
-quakenet.sasl_password
-quakenet.sasl_timeout
-quakenet.sasl_fail
-quakenet.autoconnect = on
-quakenet.autoreconnect
-quakenet.autoreconnect_delay
-quakenet.nicks
-quakenet.username
-quakenet.realname
-quakenet.local_hostname
-quakenet.command = "= "/msg nickserv identify lordabdul ${sec.data.quakenet}""
-quakenet.command_delay
-quakenet.autojoin = "#geekzonefr"
-quakenet.autorejoin
-quakenet.autorejoin_delay
-quakenet.connection_timeout
-quakenet.anti_flood_prio_high
-quakenet.anti_flood_prio_low
-quakenet.away_check
-quakenet.away_check_max_nicks
-quakenet.default_msg_kick
-quakenet.default_msg_part
-quakenet.default_msg_quit
-quakenet.notify
-sorcery.addresses = "irc.sorcery.net/6667"
-sorcery.proxy
-sorcery.ipv6
-sorcery.ssl
-sorcery.ssl_cert
-sorcery.ssl_priorities
-sorcery.ssl_dhkey_size
-sorcery.ssl_fingerprint
-sorcery.ssl_verify
-sorcery.password
-sorcery.capabilities
-sorcery.sasl_mechanism
-sorcery.sasl_username
-sorcery.sasl_password
-sorcery.sasl_timeout
-sorcery.sasl_fail
-sorcery.autoconnect = on
-sorcery.autoreconnect
-sorcery.autoreconnect_delay
-sorcery.nicks
-sorcery.username
-sorcery.realname
-sorcery.local_hostname
-sorcery.command = "= "/msg nickserv identify lordabdul ${sec.data.sorcery}""
-sorcery.command_delay
-sorcery.autojoin = "#GURPS"
-sorcery.autorejoin
-sorcery.autorejoin_delay
-sorcery.connection_timeout
-sorcery.anti_flood_prio_high
-sorcery.anti_flood_prio_low
-sorcery.away_check
-sorcery.away_check_max_nicks
-sorcery.default_msg_kick
-sorcery.default_msg_part
-sorcery.default_msg_quit
-sorcery.notify
-oftc.addresses = "irc.oftc.net/6667"
-oftc.proxy
-oftc.ipv6
-oftc.ssl
-oftc.ssl_cert
-oftc.ssl_priorities
-oftc.ssl_dhkey_size
-oftc.ssl_fingerprint
-oftc.ssl_verify
-oftc.password
-oftc.capabilities
-oftc.sasl_mechanism
-oftc.sasl_username
-oftc.sasl_password
-oftc.sasl_timeout
-oftc.sasl_fail
-oftc.autoconnect
-oftc.autoreconnect
-oftc.autoreconnect_delay
-oftc.nicks
-oftc.username
-oftc.realname
-oftc.local_hostname
-oftc.command = "/msg nickserv identify ${sec.data.oftc}"
-oftc.command_delay
-oftc.autojoin = "#pentadactyl"
-oftc.autorejoin
-oftc.autorejoin_delay
-oftc.connection_timeout
-oftc.anti_flood_prio_high
-oftc.anti_flood_prio_low
-oftc.away_check
-oftc.away_check_max_nicks
-oftc.default_msg_kick
-oftc.default_msg_part
-oftc.default_msg_quit
-oftc.notify
+Freenode.addresses = "barjoland.chabant.com/6697"
+Freenode.proxy
+Freenode.ipv6
+Freenode.ssl = off
+Freenode.ssl_cert
+Freenode.ssl_priorities
+Freenode.ssl_dhkey_size
+Freenode.ssl_fingerprint
+Freenode.ssl_verify
+Freenode.password = "${sec.data.zncpass}"
+Freenode.capabilities
+Freenode.sasl_mechanism
+Freenode.sasl_username
+Freenode.sasl_password
+Freenode.sasl_key
+Freenode.sasl_timeout
+Freenode.sasl_fail
+Freenode.autoconnect = on
+Freenode.autoreconnect
+Freenode.autoreconnect_delay
+Freenode.nicks
+Freenode.nicks_alternate
+Freenode.username = "abdul@${sec.data.clientname}/Freenode"
+Freenode.realname
+Freenode.local_hostname
+Freenode.usermode
+Freenode.command
+Freenode.command_delay
+Freenode.autojoin
+Freenode.autorejoin
+Freenode.autorejoin_delay
+Freenode.connection_timeout
+Freenode.anti_flood_prio_high
+Freenode.anti_flood_prio_low
+Freenode.away_check
+Freenode.away_check_max_nicks
+Freenode.msg_kick
+Freenode.msg_part
+Freenode.msg_quit
+Freenode.notify
--- a/weechat/logger.conf	Wed Dec 20 09:11:19 2017 -0800
+++ b/weechat/logger.conf	Wed Dec 20 09:17:09 2017 -0800
@@ -1,5 +1,12 @@
 #
-# logger.conf -- weechat v1.1.1
+# weechat -- logger.conf
+#
+# WARNING: It is NOT recommended to edit this file by hand,
+# especially if WeeChat is running.
+#
+# Use /set or similar command to change settings in WeeChat.
+#
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [look]
--- a/weechat/plugins.conf	Wed Dec 20 09:11:19 2017 -0800
+++ b/weechat/plugins.conf	Wed Dec 20 09:17:09 2017 -0800
@@ -1,5 +1,12 @@
 #
-# plugins.conf -- weechat v1.1.1
+# weechat -- plugins.conf
+#
+# WARNING: It is NOT recommended to edit this file by hand,
+# especially if WeeChat is running.
+#
+# Use /set or similar command to change settings in WeeChat.
+#
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [var]
--- a/weechat/relay.conf	Wed Dec 20 09:11:19 2017 -0800
+++ b/weechat/relay.conf	Wed Dec 20 09:17:09 2017 -0800
@@ -1,5 +1,12 @@
 #
-# relay.conf -- weechat v1.1.1
+# weechat -- relay.conf
+#
+# WARNING: It is NOT recommended to edit this file by hand,
+# especially if WeeChat is running.
+#
+# Use /set or similar command to change settings in WeeChat.
+#
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [look]
@@ -18,6 +25,7 @@
 text_selected = white
 
 [network]
+allow_empty_password = off
 allowed_ips = ""
 bind_address = ""
 clients_purge_delay = 0
@@ -33,6 +41,7 @@
 backlog_max_minutes = 1440
 backlog_max_number = 256
 backlog_since_last_disconnect = on
+backlog_since_last_message = off
 backlog_tags = "irc_privmsg"
 backlog_time_format = "[%H:%M] "
 
--- a/weechat/script.conf	Wed Dec 20 09:11:19 2017 -0800
+++ b/weechat/script.conf	Wed Dec 20 09:17:09 2017 -0800
@@ -1,5 +1,12 @@
 #
-# script.conf -- weechat v1.1.1
+# weechat -- script.conf
+#
+# WARNING: It is NOT recommended to edit this file by hand,
+# especially if WeeChat is running.
+#
+# Use /set or similar command to change settings in WeeChat.
+#
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [look]
@@ -43,7 +50,7 @@
 [scripts]
 autoload = on
 cache_expire = 60
-dir = "%h/script"
+download_timeout = 30
 hold = ""
+path = "%h/script"
 url = "http://www.weechat.org/files/plugins.xml.gz"
-url_force_https = on
--- a/weechat/sec.conf	Wed Dec 20 09:11:19 2017 -0800
+++ b/weechat/sec.conf	Wed Dec 20 09:17:09 2017 -0800
@@ -1,5 +1,12 @@
 #
-# sec.conf -- weechat v1.1.1
+# weechat -- sec.conf
+#
+# WARNING: It is NOT recommended to edit this file by hand,
+# especially if WeeChat is running.
+#
+# Use /set or similar command to change settings in WeeChat.
+#
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [crypt]
@@ -10,11 +17,10 @@
 
 [data]
 __passphrase__ = on
-oftc = "40753E8A461523676DBF416B4C04EDF3241C5BC485A827B16D2D5952C3616C7BEBC81FA1A19B73D692CBAA3FC811612573C3664A93EAC55920"
-quakenet = "30268C16DE972F7754CCE9D835716DEF85D7E5C80D2D79151CBB8899650E82D2B00B0EE141E2427613A750B4790F6C429C56E2"
-pushover_user = "095F359C99F198FB3FDD23DE4609EC66BEB6967C1C39AE0A6FA9B12A65A76032F49070B7D89FB33B47126B560F00FB0B3F7001D0BF9C59BA64F0FEC9E93C7D578548C2782E6354"
-pushover_token = "390435DBF85BF2413E8E95B2E8DFC4C668874A139B3148E56EC18E01A0A29382AEACFC8B6B2BDFA6428219FF8553A860A9C40425D72A044037E4B8852F7AE810ABC23F2521252F"
-freenode = "1B205EDFB00558BA62E9D6F4565343EE70DF64C207D8E5F15C573A1087CDE5F76808CFB5E92726BF916EE8100594A9F860A9A6D44EFAC8"
-nicks = "994DBBF0DC2B13AC411E5C349847150A3656157AD2E2BB2B7E1D992A8626ECFDD07447D949F758351E6A6E162105F8562A9EABE391616469611250FA9C137914A4B5D6B19CEC60010EFA66D6C0E0196A3E396B4246C1B2B771D4D5FCE324"
-nick = "7BC509DCB03C795F767D6830E90A1C8526AFCC71CE3D5C3C74A6AE6F5F05C225713EBCEA5092B006EE06ECE47BAEF1FEA27A"
-sorcery = "8558F49241E58C7F53C1BC2D770F7D79A2A9B1DAFBD46E18D80F6B9B778D73665E84D49066969A0CD29F636E48D44F76329A3376272AB4"
+pushover_user = "873EFDDC6FAD9E952BCD83A0994EA9C75A1BCC90A1734311CC493ED51B99A297FAEADCA259DC4C755C388C759C485D7EFE406B97287C1DD72A38EAD4DD0B3081623616BEB44859"
+pushover_token = "7D8116A5478B813C9DD2F7E3B110622EB4E825D5E8CE0F5BE0DC0E6F88E81E92A3DD7167E259F1C1A1C85E10DFAB9F8ABC8076207FBD4863F972D5C4FB855FC56740589D152EAE"
+freenode = "8183C7A49803CF71F653AB10387682B27FCF6738ADEB38930A3DF50209BAF9F017D19883805904320E4D7AC15736D50B8B67AA64497E91"
+nicks = "195669817613F6199E0638E03BF09076A60FEF8E8588F847B4BA620BBB1192EB244BB809EA6EFB9D156CAA747D3A66371586E3462D0959F38AC82CC43EB6807CF8ABAE38C49AB12458421FF54A070E134A78A390B44A238B2812A6F59E63"
+nick = "0DF8A7212121CF98C19F6091A17876199E6465F15B695C7E8A0D1ECABDC3210924D8479E5955A5A6802FD316EF10BB086BBC"
+clientname = "DCDDC5BEAF65ACEC8A1B7C50E9DB99D4C5E0B08859301447BF39403C407FA525BAA5C7DA9CEC5B0DCBA359632608971A7283"
+zncpass = "299F573454AE8DEDF2E36D5091299ACB5DD07F90A3E78B6205B2DDD206FC9D4B22532EBDBD1053E6AE14AA5782F131A685AB938FD94474CE323E6ED4207F0E"
--- a/weechat/trigger.conf	Wed Dec 20 09:11:19 2017 -0800
+++ b/weechat/trigger.conf	Wed Dec 20 09:17:09 2017 -0800
@@ -1,5 +1,12 @@
 #
-# trigger.conf -- weechat v1.1.1
+# weechat -- trigger.conf
+#
+# WARNING: It is NOT recommended to edit this file by hand,
+# especially if WeeChat is running.
+#
+# Use /set or similar command to change settings in WeeChat.
+#
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [look]
@@ -9,6 +16,7 @@
 [color]
 flag_command = lightgreen
 flag_conditions = yellow
+flag_post_action = lightblue
 flag_regex = lightcyan
 flag_return_code = lightmagenta
 regex = white
@@ -22,6 +30,7 @@
 beep.conditions = "${tg_displayed} && (${tg_highlight} || ${tg_msg_pv})"
 beep.enabled = on
 beep.hook = print
+beep.post_action = none
 beep.regex = ""
 beep.return_code = ok
 cmd_pass.arguments = "5000|input_text_display;5000|history_add;5000|irc_command_auth"
@@ -29,6 +38,7 @@
 cmd_pass.conditions = ""
 cmd_pass.enabled = on
 cmd_pass.hook = modifier
+cmd_pass.post_action = none
 cmd_pass.regex = "==^((/(msg|quote) +nickserv +(id|identify|register|ghost +[^ ]+|release +[^ ]+|regain +[^ ]+) +)|/oper +[^ ]+ +|/quote +pass +|/set +[^ ]*password[^ ]* +|/secure +(passphrase|decrypt|set +[^ ]+) +)(.*)==${re:1}${hide:*,${re:+}}"
 cmd_pass.return_code = ok
 msg_auth.arguments = "5000|irc_message_auth"
@@ -36,6 +46,7 @@
 msg_auth.conditions = ""
 msg_auth.enabled = on
 msg_auth.hook = modifier
+msg_auth.post_action = none
 msg_auth.regex = "==^(.*(id|identify|register|ghost +[^ ]+|release +[^ ]+) +)(.*)==${re:1}${hide:*,${re:+}}"
 msg_auth.return_code = ok
 server_pass.arguments = "5000|input_text_display;5000|history_add"
@@ -43,5 +54,6 @@
 server_pass.conditions = ""
 server_pass.enabled = on
 server_pass.hook = modifier
+server_pass.post_action = none
 server_pass.regex = "==^(/(server|connect) .*-(sasl_)?password=)([^ ]+)(.*)==${re:1}${hide:*,${re:4}}${re:5}"
 server_pass.return_code = ok
--- a/weechat/weechat.conf	Wed Dec 20 09:11:19 2017 -0800
+++ b/weechat/weechat.conf	Wed Dec 20 09:17:09 2017 -0800
@@ -1,5 +1,12 @@
 #
-# weechat.conf -- weechat v1.1.1
+# weechat -- weechat.conf
+#
+# WARNING: It is NOT recommended to edit this file by hand,
+# especially if WeeChat is running.
+#
+# Use /set or similar command to change settings in WeeChat.
+#
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [debug]
@@ -13,6 +20,7 @@
 
 [look]
 align_end_of_lines = message
+align_multiline_words = on
 bar_more_down = "++"
 bar_more_left = "<<"
 bar_more_right = ">>"
@@ -40,6 +48,7 @@
 command_chars = ""
 command_incomplete = off
 confirm_quit = off
+confirm_upgrade = off
 day_change = on
 day_change_message_1date = "-- %a, %d %b %Y --"
 day_change_message_2dates = "-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"
@@ -66,6 +75,7 @@
 input_share = none
 input_share_overwrite = off
 input_undo_max = 32
+item_away_message = on
 item_buffer_filter = "*"
 item_buffer_zoom = "!"
 item_mouse_status = "M"
@@ -74,10 +84,15 @@
 jump_previous_buffer_when_closing = on
 jump_smart_back_to_buffer = on
 key_bind_safe = on
+key_grab_delay = 800
 mouse = off
 mouse_timer_delay = 100
+nick_color_force = ""
+nick_color_hash = djb2
+nick_color_stop_chars = "_|["
 nick_prefix = ""
 nick_suffix = ""
+paste_auto_add_newline = on
 paste_bracketed = off
 paste_bracketed_timer_delay = 10
 paste_max_lines = 1
@@ -97,6 +112,9 @@
 prefix_quit = "<--"
 prefix_same_nick = ""
 prefix_suffix = "|"
+quote_nick_prefix = "<"
+quote_nick_suffix = ">"
+quote_time_format = "%H:%M:%S"
 read_marker = line
 read_marker_always_show = off
 read_marker_string = "- "
@@ -114,6 +132,8 @@
 window_separator_horizontal = on
 window_separator_vertical = on
 window_title = "WeeChat ${info:version}"
+word_chars_highlight = "!\u00A0,-,_,|,alnum"
+word_chars_input = "!\u00A0,-,_,|,alnum"
 
 [palette]
 
@@ -157,13 +177,14 @@
 chat_time = default
 chat_time_delimiters = brown
 chat_value = cyan
+chat_value_null = blue
 emphasized = yellow
 emphasized_bg = magenta
 input_actions = lightgreen
 input_text_not_found = red
+item_away = yellow
 nicklist_away = cyan
 nicklist_group = green
-nicklist_offline = blue
 separator = blue
 status_count_highlight = magenta
 status_count_msg = brown
@@ -187,6 +208,7 @@
 command_inline = on
 default_template = "%(nicks)|%(irc_channels)"
 nick_add_space = on
+nick_case_sensitive = off
 nick_completer = ":"
 nick_first_only = off
 nick_ignore_chars = "[]`_-^"
@@ -233,6 +255,20 @@
 buffers.size = 0
 buffers.size_max = 0
 buffers.type = root
+buflist.color_bg = default
+buflist.color_delim = default
+buflist.color_fg = default
+buflist.conditions = ""
+buflist.filling_left_right = vertical
+buflist.filling_top_bottom = columns_vertical
+buflist.hidden = off
+buflist.items = "buflist"
+buflist.position = left
+buflist.priority = 0
+buflist.separator = on
+buflist.size = 0
+buflist.size_max = 0
+buflist.type = root
 input.color_bg = default
 input.color_delim = cyan
 input.color_fg = default
@@ -309,7 +345,7 @@
 [notify]
 
 [filter]
-irc_smart = on;*;irc_smart_filter;*
+irc_smart = off;*;irc_smart_filter;*
 
 [key]
 ctrl-? = "/input delete_previous_char"
@@ -339,6 +375,8 @@
 ctrl-W = "/input delete_previous_word"
 ctrl-X = "/input switch_active_buffer"
 ctrl-Y = "/input clipboard_paste"
+meta-meta-OP = "/bar scroll buflist * b"
+meta-meta-OQ = "/bar scroll buflist * e"
 meta-meta2-1~ = "/window scroll_top"
 meta-meta2-23~ = "/bar scroll nicklist * b"
 meta-meta2-24~ = "/bar scroll nicklist * e"
@@ -371,6 +409,8 @@
 meta-OD = "/input move_previous_word"
 meta-OF = "/input move_end_of_line"
 meta-OH = "/input move_beginning_of_line"
+meta-OP = "/bar scroll buflist * -100%"
+meta-OQ = "/bar scroll buflist * +100%"
 meta-Oa = "/input history_global_previous"
 meta-Ob = "/input history_global_next"
 meta-Oc = "/input move_next_word"
@@ -578,6 +618,8 @@
 [key_mouse]
 @bar(buffers):ctrl-wheeldown = "hsignal:buffers_mouse"
 @bar(buffers):ctrl-wheelup = "hsignal:buffers_mouse"
+@bar(buflist):ctrl-wheeldown = "hsignal:buflist_mouse"
+@bar(buflist):ctrl-wheelup = "hsignal:buflist_mouse"
 @bar(input):button2 = "/input grab_mouse_area"
 @bar(nicklist):button1-gesture-down = "/bar scroll nicklist ${_window_number} +100%"
 @bar(nicklist):button1-gesture-down-long = "/bar scroll nicklist ${_window_number} e"
@@ -598,6 +640,8 @@
 @item(buffer_nicklist):button2-gesture-left = "/window ${_window_number};/ban ${nick}"
 @item(buffers):button1* = "hsignal:buffers_mouse"
 @item(buffers):button2* = "hsignal:buffers_mouse"
+@item(buflist):button1* = "hsignal:buflist_mouse"
+@item(buflist):button2* = "hsignal:buflist_mouse"
 @bar:wheeldown = "/bar scroll ${_bar_name} ${_window_number} +20%"
 @bar:wheelup = "/bar scroll ${_bar_name} ${_window_number} -20%"
 @chat:button1 = "/window ${_window_number}"
--- a/weechat/xfer.conf	Wed Dec 20 09:11:19 2017 -0800
+++ b/weechat/xfer.conf	Wed Dec 20 09:17:09 2017 -0800
@@ -1,5 +1,12 @@
 #
-# xfer.conf -- weechat v1.1.1
+# weechat -- xfer.conf
+#
+# WARNING: It is NOT recommended to edit this file by hand,
+# especially if WeeChat is running.
+#
+# Use /set or similar command to change settings in WeeChat.
+#
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [look]