diff --git a/fish/.config/fish/functions/is_git_ahead.fish b/fish/.config/fish/functions/is_git_ahead.fish
index 31b9ce7..64622fd 100644
--- a/fish/.config/fish/functions/is_git_ahead.fish
+++ b/fish/.config/fish/functions/is_git_ahead.fish
@@ -1,4 +1,5 @@
 function is_git_ahead
 	set -l revs (git rev-list origin/(git_branch)..HEAD ^/dev/null)
-[ "$revs" != "" ]
+    [ "$revs" != "" ]
 end
+
diff --git a/fish/.config/fish/functions/is_git_dirty.fish b/fish/.config/fish/functions/is_git_dirty.fish
index 8511943..87c2629 100644
--- a/fish/.config/fish/functions/is_git_dirty.fish
+++ b/fish/.config/fish/functions/is_git_dirty.fish
@@ -1,3 +1,3 @@
 function is_git_dirty
-	is_git; and [ (git status | tail -n1) != "nothing to commit, working tree clean" ]
+	is_git; and git diff --cached --quiet
 end
diff --git a/weechat/.weechat/irc.conf b/weechat/.weechat/irc.conf
index 623ac8b..e175243 100644
--- a/weechat/.weechat/irc.conf
+++ b/weechat/.weechat/irc.conf
@@ -221,7 +221,7 @@ hashbang.local_hostname
 hashbang.usermode
 hashbang.command = "/oper benharri x"
 hashbang.command_delay
-hashbang.autojoin = "#!dots,#dots,#!,#!social,#!os,#!politics,#!space,#!support,#!opers"
+hashbang.autojoin = "#!opers,#!support,#!space,#!politics,#!os,#!social,#!,#dots"
 hashbang.autorejoin
 hashbang.autorejoin_delay
 hashbang.connection_timeout