dotfiles

commit 2ff7ad7814577949acb44cebb25e6b12676ed571
parent 8254e7d50a54cd322bf2bf12310da2c62cbb3a2d
Author: Anders Damsgaard Christensen <adc@geo.au.dk>
Date:   Wed, 30 Nov 2016 08:58:59 -0800

Merge branch 'master' of github.com:anders-dc/dotfiles

Diffstat:
M
.weechat/autosort.conf
 | 
4
++--
M
.weechat/irc.conf
 | 
6
+++---
M
.weechat/sec.conf
 | 
24
++++++++++++------------
M
.weechat/weechat.conf
 | 
22
++++++++++++----------

4 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/.weechat/autosort.conf b/.weechat/autosort.conf
@@ -5,7 +5,7 @@
 [sorting]
 case_sensitive = off
 group_irc = on
-replacements = "[["##", "#"]]"
-rules = "[["core", 0], ["irc", 2], ["*", 1], ["irc.irc_raw", 0], ["irc.server", 1], ["irc.server.*.&*", 0], ["irc.server.*.#*", 1], ["irc.server.*.\\*status", 2]]"
+replacements = "[["##", "#"], ["##", "#"]]"
+rules = "[["core", 0], ["irc", 2], ["*", 1], ["irc.irc_raw", 0], ["irc.server", 1], ["irc.server.*.&*", 0], ["irc.server.*.#*", 1], ["irc.server.*.\\*status", 2], ["irc.server.*.&*", 0], ["irc.server.*.#*", 1], ["irc.server.*.\\*status", 2]]"
 signals = "buffer_opened buffer_merged buffer_unmerged buffer_renamed"
 sort_on_config_change = on
diff --git a/.weechat/irc.conf b/.weechat/irc.conf
@@ -160,11 +160,11 @@ freenode.sasl_mechanism
 freenode.sasl_username = "${sec.data.freenode_username}"
 freenode.sasl_password = "${sec.data.freenode_password}"
 freenode.sasl_timeout
-freenode.autoconnect
+freenode.autoconnect = on
 freenode.autoreconnect
 freenode.autoreconnect_delay
-freenode.nicks
-freenode.username
+freenode.nicks = "adc,adc_,adc__"
+freenode.username = "adc"
 freenode.realname
 freenode.local_hostname
 freenode.command
diff --git a/.weechat/sec.conf b/.weechat/sec.conf
@@ -10,15 +10,15 @@ salt = on
 
 [data]
 __passphrase__ = on
-freenode_username = "F1A94392BFC1D9863FD866166BF6991A4B03FCB2912201BCC6AD75341CF45F79895845646680250CA8D86CD3"
-gitterpass = "F47CD14BEA231FA4CA57CAFFCCBF26A68A33FFA7778450F4BD4EB619C7A4DD32C84FA49C328A3159FCF2AA9348DA84AF8C25540F80C8B703EC5952E7D53B37B5D4B5EB77DE83150060928E77D4FFD0CDEF"
-takuglacierpass = "2DE68A94CBEF0EADBCA276A04B50B961530315E221D5FA9D1A477D83E1CEECB7B28A4C3103EBDD21F955F6C44069FECF9DFEA8783DE39DF0F5A70C16509E6651DA01C95B8152D4A556"
-pushapikey = "F8716BDA34366E12595B039BF28D3E9B73C576FA605DA998DB6E7F9C8F0E1CC52B66DDF434E7BEBDA2FE5C6C4C032D5EB351E37CE288EF9CAE820ABC612E0EC015E7680B4BCB6E"
-slack-sigma-stanford_password = "D985A8D17417F98F45CF5583137EA466B7A14536D0D36CC1A6175BCAA0E1DC3BD0792E519EA9F0E19E5D215701FFCCD0B619D0D61DCD2700C15AAB879936E1FAB1A012330939537F1CC63B65"
-pushoverkey = "9230DF09FCB6012C602582283A4FE88876D6D98CC5A25C6122D5CA6A76E445BB6DBA7F077E8E9D43095F0537C9F034B39C0D4F379EE21235461688F2D8E19FD7D1074E58184615"
-bitlbee_password = "9A392D6BC76A6D6EDCC56F167B9724C23FF1AC5CFD51285E0D36C61634C3FCA70FF7F4F9B954C84A6749CAA25D8988444D890B7C47DB5FAB5644849305E3"
-pushuserkey = "09F9BF9B052D4C4D92E1B7F7BADFAD536BF63A255604FA750438B56C13C19F32AEF6FA9A5FF30190D22D5ECF6C6B81C760B19E842DCAEB18037C089A06F756E1D577BEFE5B5BEF"
-freenode_password = "343D96DA4B1B6A74446A606559DF5324A34A81AB150001398F96B3CA72BE74D6950E89351A1FB56678916AD004D1B140F0EC2F3014A50F257DA5C2BA7AFCE7"
-slack-taku_username = "C2CB96DC4EE1DA9FD9B280F01159973763083B72EBFEDDA3019E13E72C494DFEAC714129CEE2FFDE31911EBCBB659985E0CB8D16821DFC769A"
-slack-sigma-stanford_username = "FCABEB95A7C59E948C5332DD7467A8377CA059EE1DE64D028B01288113FD9AFC9559EAAE09C2BD56DFDB65AC32ACDBE080A92F99471DA9D843"
-slack-taku_password = "0733086C7260CB3976233A98B63CCBE5AC5A866BB651C496C514ED5EB21B083F61777614DD8A4B25D97C1123A97FC8AFE8713B7CCDC3B71B8924BA116D779230ACE84D908371B247F8"
+freenode_username = "CB6DBE2FFFB98CA509ADE8E276061726326E5CE71FFF105F8DDB784EBE76B7CA0A91DAEE25144C6C00569F9E"
+gitterpass = "E9F86748D89439984831EC29E2891E5AC55EFFDE51A4EC2B60409AB672A60C2587FD09A5C949CDA4980BEFF242E249135AA63DB9CDB9BB6F406E0569349017087A2A9CAFE2F2FB7CCAF07E46B1CEE12DB7"
+takuglacierpass = "5A17E14CF13084D0A166A800271E748A810128EC6487CEEC67C6DCB749FEACB92A858920F31266616BF7E20072EBC7E7E4749C0FF80DD3A88B78C5EFBAE06FD739C0B4CF75D6F93DE5"
+pushapikey = "DE2DBD0D67B3780288EDC957BF6B3E895B8C3B00D324A8D8C5BBBCA23E8B862060A5993A1DAA94220152D545207EEBDD9FF23F47D3953C496BFAC3E8B36B554EE70E3CADA92704"
+slack-sigma-stanford_password = "AC1A82B263D4FD2EB62C1666C64D517DC4C2E24F41CEAF96496497A696D024231DD1760B4BC202D72F889FF95C7D4474D98AB7F885F84DC27319EDFD314277410151A12A04C82A218494496F"
+pushoverkey = "3ED5C19E83328C8CD0C54AAA6D00ECA9310A5E7632CA717F5B5C5F518B03F99DD041462D7AF90840C3FC6E339309FFD31E4ACC84509C03FB9173D87FBC40B84F2C7475EF1E63EC"
+bitlbee_password = "1ED583003FB59A59FC015B093B5DC4226688A1E02CDD0B4B7027AB796870144E57CA378FB795EF898BA22B242DB01C70BF5121AE4AFDE5860B1A2D6AC8C3"
+pushuserkey = "D7BA57B547BA6B689AF5897E5F249F4BFEB3A8AFCF898811192ABFEBFF3EABE9F42EB51C818E9975B063A5B17AC818A9CBE74D54062696B86BAFD575571DB7E1F3B8D8BEBF298B"
+freenode_password = "159571C28ADD7CB8B5EEDBC38AEA6447527B2DEEC9D5953ED15381DBDE714E6F3785F3EDC82B4A3A466E0DEB222F9EAF5DAAF9390AB4DBEF0721394772512E"
+slack-taku_username = "46B3D49AD81B3FA915B0B46AC13D4BB1691859D79C1C80533A4775F60E34D0C9DF7B194096438DA2BF29EC72E739FAF0E0C18D5D096293029B"
+slack-sigma-stanford_username = "E6E39D52B23664833DCC736F96F3781A90B21B625A7434E74AAC927B6354FE663BD8DC2554A8F33D53BD47B7DB9C248CAEE807E555B4E9977C"
+slack-taku_password = "550B73D3525348F43C0460F1A4E6A2A85079A09859DB1D3F96C300383D227EDFA9F35072C8D2ABC380EA6E33E423A64AF9CEF5D4665A9E3631871A607BAADC3A6548125FDD90E32A78"
diff --git a/.weechat/weechat.conf b/.weechat/weechat.conf
@@ -330,17 +330,19 @@ vi_line_numbers.type = window
 
 [layout]
 highlight-minimal.buffer = "core;weechat;1"
-highlight-minimal.buffer = "irc;server.freenode;1"
 highlight-minimal.buffer = "irc;server.slack-sigma-stanford;1"
-highlight-minimal.buffer = "perl;highmon;2"
-highlight-minimal.buffer = "irc;freenode.#debian;3"
-highlight-minimal.buffer = "irc;slack-sigma-stanford.#general;4"
-highlight-minimal.buffer = "irc;slack-sigma-stanford.#random;5"
-highlight-minimal.buffer = "irc;slack-sigma-stanford.#teamice;6"
-highlight-minimal.buffer = "irc;slack-sigma-stanford.#tilliceinteractions;7"
-highlight-minimal.window = "1;0;15;1;-;-"
-highlight-minimal.window = "2;1;0;0;irc;slack-sigma-stanford.#tilliceinteractions"
-highlight-minimal.window = "3;1;0;0;perl;highmon"
+highlight-minimal.buffer = "irc;server.bitlbee;1"
+highlight-minimal.buffer = "irc;bitlbee.&bitlbee;2"
+highlight-minimal.buffer = "irc;server.freenode;3"
+highlight-minimal.buffer = "irc;freenode.#mutt;4"
+highlight-minimal.buffer = "irc;slack-sigma-stanford.#bsfproposal;5"
+highlight-minimal.buffer = "irc;slack-sigma-stanford.#conferences;6"
+highlight-minimal.buffer = "irc;slack-sigma-stanford.#general;7"
+highlight-minimal.buffer = "irc;slack-sigma-stanford.#gitlab;8"
+highlight-minimal.buffer = "irc;slack-sigma-stanford.#random;9"
+highlight-minimal.buffer = "irc;slack-sigma-stanford.#teamice;10"
+highlight-minimal.buffer = "irc;slack-sigma-stanford.#tilliceinteractions;11"
+highlight-minimal.window = "1;0;0;0;core;weechat"
 highlight-minimal.current = on
 
 [notify]