From f5bb310554e523ef894bdc94e70659aa62c080f2 Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Wed, 28 Nov 2018 11:08:06 -0500
Subject: [PATCH] fix autojoins and is_git_dirty

---
 fish/.config/fish/config.fish                 |  3 ++-
 fish/.config/fish/functions/__nvm_run.fish    |  2 +-
 fish/.config/fish/functions/is_git.fish       |  3 ++-
 fish/.config/fish/functions/is_git_dirty.fish | 12 +++++++++++-
 weechat/.weechat/irc.conf                     |  6 +++---
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 7e05697..3efc468 100755
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -1,6 +1,7 @@
 status --is-login; and status --is-interactive; and exec byobu-launcher
 
 set -xg EDITOR nvim
+set -xg TZ 'America/Detroit'
 
 set -g theme_nerd_fonts yes
 set -g theme_color_scheme dark
@@ -21,7 +22,7 @@ for path in $user_paths
   end
 end
 
-set -x SSH_AGENT_PID ""
+#set -x SSH_AGENT_PID ""
 if test -S $HOME/.gnupg/S.gpg-agent
   set -x SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent
   set -x GPG_SOCK $HOME/.gnupg/S.gpg-agent
diff --git a/fish/.config/fish/functions/__nvm_run.fish b/fish/.config/fish/functions/__nvm_run.fish
index 839355b..ae450ee 120000
--- a/fish/.config/fish/functions/__nvm_run.fish
+++ b/fish/.config/fish/functions/__nvm_run.fish
@@ -1 +1 @@
-/home/ben/.config/fisherman/nvm/__nvm_run.fish
\ No newline at end of file
+/home/ben/.config/fisherman/nvm/functions/__nvm_run.fish
\ No newline at end of file
diff --git a/fish/.config/fish/functions/is_git.fish b/fish/.config/fish/functions/is_git.fish
index 8bc6dd2..74bd02d 100644
--- a/fish/.config/fish/functions/is_git.fish
+++ b/fish/.config/fish/functions/is_git.fish
@@ -1,3 +1,4 @@
 function is_git
-	git symbolic-ref HEAD > /dev/null ^&1
+    git rev-parse --verify HEAD >/dev/null ^&1
 end
+
diff --git a/fish/.config/fish/functions/is_git_dirty.fish b/fish/.config/fish/functions/is_git_dirty.fish
index 87c2629..09a409f 100644
--- a/fish/.config/fish/functions/is_git_dirty.fish
+++ b/fish/.config/fish/functions/is_git_dirty.fish
@@ -1,3 +1,13 @@
 function is_git_dirty
-	is_git; and git diff --cached --quiet
+    # based on https://github.com/git/git/blob/master/git-sh-setup.sh#L210
+
+	is_git; or return 1
+
+    if git diff-files --quiet --ignore-submodules 
+        or git diff-index --cached --quiet --ignore-submodules HEAD --
+        return 1
+    else
+        return 0
+    end
 end
+
diff --git a/weechat/.weechat/irc.conf b/weechat/.weechat/irc.conf
index 3cb8d51..d4737d7 100644
--- a/weechat/.weechat/irc.conf
+++ b/weechat/.weechat/irc.conf
@@ -180,7 +180,7 @@ tilde.local_hostname
 tilde.usermode
 tilde.command = "/oper root ${sec.data.tildenetoper}; /msg operserv login ${sec.data.pass}"
 tilde.command_delay
-tilde.autojoin = "#opers,#secret-sudoers,#meta,#team,#sudoers,#YourTilde,#chaos,#bots,#music,#share,#stevenuniverse,#suwp,#projects,#politics,#dnd,#journal,#shitposting,#quotes,#gopher,#tildeverse,#venting,#idlerpg,#tilderadio,#zaphod,#thunix,#yee,#modded,#minecraft,#minetest,#bbj,#tildelinux,#tildetheater,#slbr,#dadjokes,#sr.ht,#nand.pub,#6502gen,#cosmic,#institute,#.tilde youneedtoknowthepassword,secretsudoteam"
+tilde.autojoin = "#opers,#secret-sudoers,#meta,#team,#sudoers,#YourTilde,#chaos,#bots,#music,#share,#stevenuniverse,#suwp,#projects,#politics,#dnd,#journal,#shitposting,#quotes,#gopher,#tildeverse,#venting,#idlerpg,#tilderadio,#zaphod,#thunix,#yee,#modded,#minecraft,#minetest,#bbj,#tildelinux,#tildetheater,#slbr,#dadjokes,#sr.ht,#nand.pub,#6502gen,#cosmic,#institute,#.tilde,#irc-court youneedtoknowthepassword,secretsudoteam"
 tilde.autorejoin
 tilde.autorejoin_delay
 tilde.connection_timeout
@@ -426,7 +426,7 @@ oftc.local_hostname
 oftc.usermode
 oftc.command
 oftc.command_delay
-oftc.autojoin = "#fish,#debian-devel"
+oftc.autojoin = "#fish,#debian-devel,#debian,#debian-offtopic"
 oftc.autorejoin
 oftc.autorejoin_delay
 oftc.connection_timeout
@@ -467,7 +467,7 @@ freenode.local_hostname
 freenode.usermode
 freenode.command
 freenode.command_delay
-freenode.autojoin = "#weechat,##oodnet,#alacritty,#disroot,#fediverse,#irc.net,#lobsters,#lobsters-boil,#lxcontainers,#thelounge,#gitea,#mastodon,#pleroma,#pleroma-offtopic,#pixelfed,#pixelfed-offtopic,#oragono,#vim,#weechat-android,#git,#thunix,#nginx,#devuan,#tilde.team,#sr.ht,#cmpwn,#tildeverse,#opennic 6:10"
+freenode.autojoin = "#weechat,##oodnet,#alacritty,#disroot,#fediverse,#irc.net,#lobsters,#lobsters-boil,#lxcontainers,#thelounge,#gitea,#mastodon,#pleroma,#pleroma-offtopic,#pixelfed,#pixelfed-offtopic,#oragono,#weechat-android,#git,#thunix,#nginx,#devuan,#tilde.team,#sr.ht,#cmpwn,#tildeverse,#opennic 6:10"
 freenode.autorejoin
 freenode.autorejoin_delay
 freenode.connection_timeout