Mercurial > dotfiles

changeset 299:8959592285b9

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 May 2015 16:15:19 -0700
parents ffa5a9102d22 (current diff) 27447ad19df6 (diff)
children 65165c2de85e
files
diffstat 15 files changed, 30 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/weechat/alias.conf	Tue Apr 21 16:31:53 2015 -0700
+++ b/weechat/alias.conf	Wed May 20 16:15:19 2015 -0700
@@ -1,5 +1,5 @@
 #
-# alias.conf -- weechat v1.1
+# alias.conf -- weechat v1.1.1
 #
 
 [cmd]
--- a/weechat/aspell.conf	Tue Apr 21 16:31:53 2015 -0700
+++ b/weechat/aspell.conf	Wed May 20 16:15:19 2015 -0700
@@ -1,5 +1,5 @@
 #
-# aspell.conf -- weechat v1.1
+# aspell.conf -- weechat v1.1.1
 #
 
 [color]
--- a/weechat/buffers.conf	Tue Apr 21 16:31:53 2015 -0700
+++ b/weechat/buffers.conf	Wed May 20 16:15:19 2015 -0700
@@ -1,5 +1,5 @@
 #
-# buffers.conf -- weechat v1.1
+# buffers.conf -- weechat v1.1.1
 #
 
 [color]
--- a/weechat/charset.conf	Tue Apr 21 16:31:53 2015 -0700
+++ b/weechat/charset.conf	Wed May 20 16:15:19 2015 -0700
@@ -1,5 +1,5 @@
 #
-# charset.conf -- weechat v1.1
+# charset.conf -- weechat v1.1.1
 #
 
 [default]
--- a/weechat/exec.conf	Tue Apr 21 16:31:53 2015 -0700
+++ b/weechat/exec.conf	Wed May 20 16:15:19 2015 -0700
@@ -1,5 +1,5 @@
 #
-# exec.conf -- weechat v1.1
+# exec.conf -- weechat v1.1.1
 #
 
 [command]
--- a/weechat/irc.conf	Tue Apr 21 16:31:53 2015 -0700
+++ b/weechat/irc.conf	Wed May 20 16:15:19 2015 -0700
@@ -1,5 +1,5 @@
 #
-# irc.conf -- weechat v1.1
+# irc.conf -- weechat v1.1.1
 #
 
 [look]
@@ -123,7 +123,7 @@
 default_msg_quit = "WeeChat %v"
 ipv6 = on
 local_hostname = ""
-nicks = "${sec.data.nick},${sec.data.nick}1,${sec.data.nick}2,${sec.data.nick}3,${sec.data.nick}4"
+nicks = "lordabdul,lordabdul1,lordabdul2,lordabdul3,lordabdul4"
 notify = ""
 password = ""
 proxy = ""
@@ -139,7 +139,7 @@
 ssl_fingerprint = ""
 ssl_priorities = "NORMAL"
 ssl_verify = on
-username = "abdul"
+username = "lordabdul"
 
 [server]
 freenode.addresses = "chat.freenode.net/6667"
--- a/weechat/iset.conf	Tue Apr 21 16:31:53 2015 -0700
+++ b/weechat/iset.conf	Wed May 20 16:15:19 2015 -0700
@@ -1,5 +1,5 @@
 #
-# iset.conf -- weechat v1.1
+# iset.conf -- weechat v1.1.1
 #
 
 [color]
--- a/weechat/logger.conf	Tue Apr 21 16:31:53 2015 -0700
+++ b/weechat/logger.conf	Wed May 20 16:15:19 2015 -0700
@@ -1,5 +1,5 @@
 #
-# logger.conf -- weechat v1.1
+# logger.conf -- weechat v1.1.1
 #
 
 [look]
--- a/weechat/plugins.conf	Tue Apr 21 16:31:53 2015 -0700
+++ b/weechat/plugins.conf	Wed May 20 16:15:19 2015 -0700
@@ -1,5 +1,5 @@
 #
-# plugins.conf -- weechat v1.1
+# plugins.conf -- weechat v1.1.1
 #
 
 [var]
@@ -15,8 +15,10 @@
 perl.pushover.pb_apikey = ""
 perl.pushover.pb_device_iden = ""
 perl.pushover.priority = ""
+perl.pushover.rate_limit = "0"
 perl.pushover.redact_priv_msg = "off"
 perl.pushover.service = "pushover"
+perl.pushover.short_name = "off"
 perl.pushover.show_highlights = "on"
 perl.pushover.show_priv_msg = "on"
 perl.pushover.sound = ""
@@ -46,8 +48,10 @@
 perl.pushover.pb_apikey = "Pushbullet API key (default: "")"
 perl.pushover.pb_device_iden = "Device Iden of pushbullet device (default: "")"
 perl.pushover.priority = "priority (empty for default) (default: "")"
+perl.pushover.rate_limit = "Rate limit in seconds (0 = unlimited), will send a maximum of 1 notification per time limit (default: "0")"
 perl.pushover.redact_priv_msg = "When receiving private message notifications, hide the actual message text (default: "off")"
 perl.pushover.service = "Notification service to use. Multiple services may be supplied as comma separated list. (supported services: pushover, nma, pushbullet) (default: "pushover")"
+perl.pushover.short_name = "Use short buffer name in notification (default: "off")"
 perl.pushover.show_highlights = "Notify on highlights (default: "on")"
 perl.pushover.show_priv_msg = "Notify on private messages (default: "on")"
 perl.pushover.sound = "Sound (empty for default) (default: "")"
--- a/weechat/relay.conf	Tue Apr 21 16:31:53 2015 -0700
+++ b/weechat/relay.conf	Wed May 20 16:15:19 2015 -0700
@@ -1,5 +1,5 @@
 #
-# relay.conf -- weechat v1.1
+# relay.conf -- weechat v1.1.1
 #
 
 [look]
--- a/weechat/script.conf	Tue Apr 21 16:31:53 2015 -0700
+++ b/weechat/script.conf	Wed May 20 16:15:19 2015 -0700
@@ -1,5 +1,5 @@
 #
-# script.conf -- weechat v1.1
+# script.conf -- weechat v1.1.1
 #
 
 [look]
--- a/weechat/sec.conf	Tue Apr 21 16:31:53 2015 -0700
+++ b/weechat/sec.conf	Wed May 20 16:15:19 2015 -0700
@@ -1,5 +1,5 @@
 #
-# sec.conf -- weechat v1.1
+# sec.conf -- weechat v1.1.1
 #
 
 [crypt]
@@ -10,10 +10,11 @@
 
 [data]
 __passphrase__ = on
-oftc = "F286AACA8819008EE563353FBEC0CB386E3089F0A31C6D290405DCADF999565119DEB0F989B81ADDF22CACDA704D661E2E5F5A94FC3656DFA0"
-quakenet = "A8EA376CF11160179E31A388FC2CB486D33A619EEA974CABB2E09834AD2A34FB972844A6F5B88FA480F579EAE1641DE49D10B8"
-pushover_user = "01BDE5D3DB0BCED6969510F18966B6BA950279E1CBD46C641140C50B361CD13CC28305BA738AEBA872CFBEF093DDABDAE3357F2A47118ABB6E71531A5FE43BF27FBBE504100277"
-pushover_token = "639953A296EF429A481471FC9939D344531B0F27CCDEA970A149B3D932DF67E9F122EDE436017C338A775EC5F64CB4A212636E5154020985E853C001B9E3B79F01C0CAE6E3B92C"
-freenode = "DC89D97C109444ACDAB5E2A4E6B8583B363DE89E2F9C73149BD4B8F0B6735A7342DD800BE273E40FD602C68EF60F7A95ACAE4D401E62B3"
-nick = "A6A8F905EDA7FF8AC2025B69086F98657006B6A139BA71C624055FEDC8459E0EC463B3CE55B26151273B2FA81A9F9E704259"
-sorcery = "AB22C1F00F818782AD83E70D1D87248B8741BE214653BDBA2AA9D0AF6DD9729229948E9A331594E92B5588DDF9398C285CDA6EC522F19C"
+oftc = "A7C01A8A843D668369A56AAFEA6E06B1E511156C753C13CFEC026EF202848AF39119BBF02708E2E697F3CE8CDD10B4CA1212A5504B059831EE"
+quakenet = "B9169913BD44082BF23EB30E5280C22B6C39222056DA9F7073F044886396E1209EF459C63F3A2F06BE74900266760C8E56DBC7"
+pushover_user = "43B4E1B410B8885A755350304149D48AA5B20DF30E8192E49D96AB46492A3710A2CAC4CAFF7ED8A287A5D2C884EEC1EA1D76D3EDF8BA0854F231B6D03666222CB53DDEE461EE77"
+pushover_token = "0243D143785D0097BFF4A5CBBCB913549E1565878CB064F865E4AE556871A201BE6387A32F517752D96EF24EEAD142B962F12610E010FAF7F786DBC50748C7818F8F84B29564BB"
+freenode = "0290C3AEC4D3E4F18ADFD8EB772425F8F869A635231233F7BCFC2C95515EEEF4253EFBF7E77500275C18DC3A75FDF0D145A6D952A8D17E"
+nicks = "18EF219526D7F61011DE07152C707F7E7CFB18A1CE3DA34C652056090EA5014346069E4B023536D82EA4BA5051A2A8C689A66CDEC6FB2BDBA7483EF785833FC0425337E016A77486CF2C4F509E215A3835BF3AB6583E8352A651F41C0C77"
+nick = "1326FF8468E9FB9F5312759F310634230731786BBDDD8209DB04E83CA05F1B52FAD7F548CF7F9D32FF59D6E4E05597A5A394"
+sorcery = "3F7A76E923A6FB1D679E9EC5F483804C2A27C6CEFCD0C808F9B5147D6B54BE1D7D0F668AA82281303E009EAC27C35A5E8AF1F1730D7C04"
--- a/weechat/trigger.conf	Tue Apr 21 16:31:53 2015 -0700
+++ b/weechat/trigger.conf	Wed May 20 16:15:19 2015 -0700
@@ -1,5 +1,5 @@
 #
-# trigger.conf -- weechat v1.1
+# trigger.conf -- weechat v1.1.1
 #
 
 [look]
--- a/weechat/weechat.conf	Tue Apr 21 16:31:53 2015 -0700
+++ b/weechat/weechat.conf	Wed May 20 16:15:19 2015 -0700
@@ -1,5 +1,5 @@
 #
-# weechat.conf -- weechat v1.1
+# weechat.conf -- weechat v1.1.1
 #
 
 [debug]
@@ -253,7 +253,7 @@
 isetbar.conditions = ""
 isetbar.filling_left_right = vertical
 isetbar.filling_top_bottom = horizontal
-isetbar.hidden = off
+isetbar.hidden = on
 isetbar.items = "isetbar_help"
 isetbar.position = top
 isetbar.priority = 0
--- a/weechat/xfer.conf	Tue Apr 21 16:31:53 2015 -0700
+++ b/weechat/xfer.conf	Wed May 20 16:15:19 2015 -0700
@@ -1,5 +1,5 @@
 #
-# xfer.conf -- weechat v1.1
+# xfer.conf -- weechat v1.1.1
 #
 
 [look]