From d0ed275ee073783b5c3fa5c001cbd37fd204a8cf Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Tue, 12 Mar 2019 11:21:58 -0400
Subject: [PATCH] add some nice vimplugins

---
 .gitmodules                    | 9 +++++++++
 Makefile                       | 1 -
 vim/.vim/bundle/vim-commentary | 1 +
 vim/.vim/bundle/vim-fugitive   | 1 +
 vim/.vim/bundle/vim-surround   | 1 +
 weechat/.weechat/aspell.conf   | 2 +-
 weechat/.weechat/irc.conf      | 6 +++---
 weechat/.weechat/relay.conf    | 3 +--
 8 files changed, 17 insertions(+), 7 deletions(-)
 create mode 160000 vim/.vim/bundle/vim-commentary
 create mode 160000 vim/.vim/bundle/vim-fugitive
 create mode 160000 vim/.vim/bundle/vim-surround

diff --git a/.gitmodules b/.gitmodules
index b78036e..71b83f1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,3 +8,12 @@
 [submodule "vim/.vim/bundle/quick-scope"]
 	path = vim/.vim/bundle/quick-scope
 	url = https://github.com/unblevable/quick-scope
+[submodule "vim/.vim/bundle/vim-fugitive"]
+	path = vim/.vim/bundle/vim-fugitive
+	url = https://github.com/tpope/vim-fugitive
+[submodule "vim/.vim/bundle/vim-commentary"]
+	path = vim/.vim/bundle/vim-commentary
+	url = https://github.com/tpope/vim-commentary
+[submodule "vim/.vim/bundle/vim-surround"]
+	path = vim/.vim/bundle/vim-surround
+	url = https://github.com/tpope/vim-surround
diff --git a/Makefile b/Makefile
index e01aa37..024609a 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,6 @@ emacs:
 fish:
 	@printf "$(YELLOW)--- fish -----------------------------------------------\n$(RESET)"
 	stow -t "$$HOME" fish
-	fish -c fisher
 
 git:
 	@printf "$(YELLOW)--- git ------------------------------------------------\n$(RESET)"
diff --git a/vim/.vim/bundle/vim-commentary b/vim/.vim/bundle/vim-commentary
new file mode 160000
index 0000000..141d9d3
--- /dev/null
+++ b/vim/.vim/bundle/vim-commentary
@@ -0,0 +1 @@
+Subproject commit 141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
new file mode 160000
index 0000000..bd0b87d
--- /dev/null
+++ b/vim/.vim/bundle/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit bd0b87d36ad80e8acd94f22028d15ebb441b1c28
diff --git a/vim/.vim/bundle/vim-surround b/vim/.vim/bundle/vim-surround
new file mode 160000
index 0000000..5970688
--- /dev/null
+++ b/vim/.vim/bundle/vim-surround
@@ -0,0 +1 @@
+Subproject commit 597068870b8f093a8b2d11536c62ff31222ee8d0
diff --git a/weechat/.weechat/aspell.conf b/weechat/.weechat/aspell.conf
index a162e1e..27b16b8 100644
--- a/weechat/.weechat/aspell.conf
+++ b/weechat/.weechat/aspell.conf
@@ -19,7 +19,7 @@ suggestion_delimiter_word = cyan
 commands = "ame,amsg,away,command,cycle,kick,kickban,me,msg,notice,part,query,quit,topic"
 default_dict = ""
 during_search = off
-enabled = on
+enabled = off
 real_time = off
 suggestions = -1
 word_min_length = 2
diff --git a/weechat/.weechat/irc.conf b/weechat/.weechat/irc.conf
index 19c64a9..e415634 100644
--- a/weechat/.weechat/irc.conf
+++ b/weechat/.weechat/irc.conf
@@ -222,7 +222,7 @@ hashbang.local_hostname
 hashbang.usermode
 hashbang.command = "/oper benharri x"
 hashbang.command_delay
-hashbang.autojoin = "#!opers,#!,#!social,#!os,#!politics,#!support,#!git"
+hashbang.autojoin = "#!git,#!support,#!politics,#!os,#!social,#!,#!opers"
 hashbang.autorejoin
 hashbang.autorejoin_delay
 hashbang.connection_timeout
@@ -345,7 +345,7 @@ sdf.local_hostname
 sdf.usermode
 sdf.command
 sdf.command_delay
-sdf.autojoin = "#helpdesk,#anonradio,#gopher,#sdf"
+sdf.autojoin = "#sdf,#gopher,#anonradio,#helpdesk"
 sdf.autorejoin
 sdf.autorejoin_delay
 sdf.connection_timeout
@@ -632,7 +632,7 @@ slashnet.local_hostname
 slashnet.usermode
 slashnet.command
 slashnet.command_delay
-slashnet.autojoin = "#gtlug,#help"
+slashnet.autojoin = "#help,#gtlug [5j#i15,5n#N30,5t]:1"
 slashnet.autorejoin
 slashnet.autorejoin_delay
 slashnet.connection_timeout
diff --git a/weechat/.weechat/relay.conf b/weechat/.weechat/relay.conf
index 309c0c4..9429a66 100644
--- a/weechat/.weechat/relay.conf
+++ b/weechat/.weechat/relay.conf
@@ -27,7 +27,7 @@ text_selected = white
 [network]
 allow_empty_password = off
 allowed_ips = ""
-bind_address = ""
+bind_address = "127.0.0.1"
 clients_purge_delay = 0
 compression_level = 6
 ipv6 = on
@@ -48,5 +48,4 @@ backlog_tags = "irc_privmsg"
 backlog_time_format = "[%H:%M] "
 
 [port]
-ssl.irc = 6666
 weechat = 9090