From bc7def2852563cae5a974ca6243da936a130efa9 Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Mon, 15 Jun 2020 14:45:09 -0400
Subject: [PATCH] add vim-airline

---
 .gitmodules                         | 3 +++
 fish/.config/fish/functions/rm.fish | 2 +-
 vim/.vim/bundle/vim-airline         | 1 +
 vim/.vim/bundle/vim-gitgutter       | 2 +-
 vim/.vimrc                          | 4 ++++
 weechat/.weechat/irc.conf           | 4 ++--
 6 files changed, 12 insertions(+), 4 deletions(-)
 create mode 160000 vim/.vim/bundle/vim-airline

diff --git a/.gitmodules b/.gitmodules
index 0c5ca96..2b80f9d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -29,3 +29,6 @@
 [submodule "lf/lf"]
 	path = lf/lf
 	url = https://github.com/gokcehan/lf
+[submodule "vim/.vim/bundle/vim-airline"]
+	path = vim/.vim/bundle/vim-airline
+	url = https://github.com/vim-airline/vim-airline
diff --git a/fish/.config/fish/functions/rm.fish b/fish/.config/fish/functions/rm.fish
index ac2a298..c7860cc 100644
--- a/fish/.config/fish/functions/rm.fish
+++ b/fish/.config/fish/functions/rm.fish
@@ -1,3 +1,3 @@
 function rm
-rm -I $argv
+    command rm -I $argv
 end
diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline
new file mode 160000
index 0000000..ee85ed4
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline
@@ -0,0 +1 @@
+Subproject commit ee85ed4c673b859cf8c3626a6669b8e3cd2392fa
diff --git a/vim/.vim/bundle/vim-gitgutter b/vim/.vim/bundle/vim-gitgutter
index 9784226..e31e9bb 160000
--- a/vim/.vim/bundle/vim-gitgutter
+++ b/vim/.vim/bundle/vim-gitgutter
@@ -1 +1 @@
-Subproject commit 9784226ba766662d298554a5c66fd938497f2233
+Subproject commit e31e9bb35f7346caab4fcf972d44449bdfd3230a
diff --git a/vim/.vimrc b/vim/.vimrc
index 6c95dfc..938e58f 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -71,6 +71,10 @@ if has("patch-8.1.0360")
     set diffopt+=internal,algorithm:patience
 end
 
+set hidden
+nnoremap <C-N> :bnext<CR>
+nnoremap <C-P> :bprev<CR>
+
 inoremap <C-U> <C-G>u<C-U>
 
 cmap w!! w !sudo tee % >/dev/null
diff --git a/weechat/.weechat/irc.conf b/weechat/.weechat/irc.conf
index aa42e4a..44bdf25 100644
--- a/weechat/.weechat/irc.conf
+++ b/weechat/.weechat/irc.conf
@@ -330,7 +330,7 @@ esper.msg_quit
 esper.notify
 esper.split_msg_max_length
 esper.charset_message
-sdf.addresses = "localhost/2346"
+sdf.addresses = "irc.sdf.org"
 sdf.proxy
 sdf.ipv6
 sdf.ssl
@@ -488,7 +488,7 @@ freenode.local_hostname
 freenode.usermode
 freenode.command
 freenode.command_delay
-freenode.autojoin = "#weechat,##oodnet,#lobsters,#gitea,#mastodon,#pleroma,#oragono,#sr.ht,#cmpwn,#bitbot,#gophernicus,##jan6,#ascii.town,##ircv3-chat,#!,#futel,#trashtown,#weechat-android,#ovh,#tilde.team,#rspamd,#fosshost,#fosshost-meet,#fosshost-dev 6:10"
+freenode.autojoin = "#weechat,##oodnet,#lobsters,#gitea,#mastodon,#pleroma,#oragono,#sr.ht,#cmpwn,#bitbot,#gophernicus,##jan6,#ascii.town,##ircv3-chat,#!,#futel,#trashtown,#weechat-android,#ovh,#tilde.team,#rspamd,#fosshost,#fosshost-meet,#fosshost-dev,##crustaceans 6:10"
 freenode.autorejoin
 freenode.autorejoin_delay
 freenode.connection_timeout