and, get rid of flowdock

2 files changed, 16 insertions, 61 deletions

diff --git a/weechat/irc.conf b/weechat/irc.conf
index 8f976e8..de9ea91 100644
--- a/weechat/irc.conf
+++ b/weechat/irc.conf
@@ -244,42 +244,6 @@ ii-slack.default_msg_kick
 ii-slack.default_msg_part
 ii-slack.default_msg_quit
 ii-slack.notify
-ii-flowdock.addresses = "tozt.net/6668"
-ii-flowdock.proxy
-ii-flowdock.ipv6
-ii-flowdock.ssl = on
-ii-flowdock.ssl_cert
-ii-flowdock.ssl_priorities
-ii-flowdock.ssl_dhkey_size
-ii-flowdock.ssl_fingerprint = "0fe91be27d6e70da93c28d5e9a83cdda33ecf7f2"
-ii-flowdock.ssl_verify
-ii-flowdock.password
-ii-flowdock.capabilities
-ii-flowdock.sasl_mechanism
-ii-flowdock.sasl_username
-ii-flowdock.sasl_password
-ii-flowdock.sasl_timeout
-ii-flowdock.autoconnect = on
-ii-flowdock.autoreconnect
-ii-flowdock.autoreconnect_delay
-ii-flowdock.nicks
-ii-flowdock.username
-ii-flowdock.realname
-ii-flowdock.local_hostname
-ii-flowdock.command
-ii-flowdock.command_delay
-ii-flowdock.autojoin
-ii-flowdock.autorejoin
-ii-flowdock.autorejoin_delay
-ii-flowdock.connection_timeout
-ii-flowdock.anti_flood_prio_high
-ii-flowdock.anti_flood_prio_low
-ii-flowdock.away_check
-ii-flowdock.away_check_max_nicks
-ii-flowdock.default_msg_kick
-ii-flowdock.default_msg_part
-ii-flowdock.default_msg_quit
-ii-flowdock.notify
 ii-irc.addresses = "tozt.net/6668"
 ii-irc.proxy
 ii-irc.ipv6
diff --git a/weechat/weechat.conf b/weechat/weechat.conf
index b1a8b5f..8680cc6 100644
--- a/weechat/weechat.conf
+++ b/weechat/weechat.conf
@@ -315,37 +315,28 @@ default.buffer = "irc;bitlbee.#twitter_doyster;1"
 default.buffer = "irc;freenode.##crawl-offtopic;2"
 default.buffer = "irc;mozilla.#rust;3"
 default.buffer = "irc;freenode.#taeb-redux;4"
-default.buffer = "irc;ii-flowdock.#iinteractive/mediamath;5"
-default.buffer = "irc;ii-flowdock.#iinteractive/ascb;6"
-default.buffer = "irc;ii-flowdock.#iinteractive/hewitt;7"
-default.buffer = "irc;ii-flowdock.#iinteractive/training;8"
+default.buffer = "irc;ii-slack.#mediamath;5"
+default.buffer = "irc;ii-slack.#ascb;6"
+default.buffer = "irc;ii-slack.#hewitt;7"
+default.buffer = "irc;ii-slack.#training;8"
 default.buffer = "irc;ii-irc.#ii_wanna_be_jsons_dog;9"
-default.buffer = "irc;ii-flowdock.#iinteractive/general;10"
+default.buffer = "irc;ii-slack.#general;10"
 default.buffer = "irc;bitlbee.starlifesage;11"
 default.buffer = "irc;bitlbee.sarahjoseph;12"
 default.buffer = "irc;freenode.thermoplyae;13"
 default.buffer = "irc;bitlbee.EmilyCorcoran;14"
 default.buffer = "irc;ii-irc.stevan;15"
-default.buffer = "irc;ii-flowdock.#iinteractive/venda;16"
-default.buffer = "irc;ii-slack.#general;17"
-default.buffer = "irc;ii-flowdock.#iinteractive/socialflow;18"
-default.buffer = "irc;ii-irc.#ii;19"
-default.buffer = "core;weechat;20"
-default.buffer = "irc;server.mozilla;20"
-default.buffer = "irc;server.freenode;20"
-default.buffer = "irc;server.ii-slack;20"
-default.buffer = "irc;server.ii-flowdock;20"
-default.buffer = "irc;server.ii-irc;20"
-default.buffer = "irc;server.bitlbee;20"
-default.buffer = "irc;bitlbee.&bitlbee;21"
-default.buffer = "irc;ii-slack.#random;22"
-default.buffer = "irc;ii-flowdock.#iinteractive/pinpics;23"
-default.buffer = "irc;ii-flowdock.#iinteractive/mobile;24"
-default.buffer = "irc;ii-slack.#training;25"
-default.buffer = "irc;ii-slack.#ascb;26"
-default.buffer = "irc;ii-slack.#hewitt;27"
-default.buffer = "irc;ii-flowdock.#iinteractive/artintelligence;28"
-default.window = "1;0;0;0;irc;server.bitlbee"
+default.buffer = "irc;ii-slack.#venda;16"
+default.buffer = "irc;ii-irc.#ii;17"
+default.buffer = "irc;ii-slack.#yapc;18"
+default.buffer = "core;weechat;19"
+default.buffer = "irc;server.mozilla;19"
+default.buffer = "irc;server.freenode;19"
+default.buffer = "irc;server.ii-slack;19"
+default.buffer = "irc;server.ii-irc;19"
+default.buffer = "irc;server.bitlbee;19"
+default.buffer = "irc;bitlbee.&bitlbee;20"
+default.window = "1;0;0;0;core;weechat"
 default.current = on
 
 [notify]