fix autojoins and is_git_dirty

4 files changed, 16 insertions, 4 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
+