M config/fish/functions/fish_prompt.fish → config/fish/functions/fish_prompt.fish

@@ -6,7 +6,7 @@ printf '\n'
     set_color cyan
     printf '%s' (prompt_pwd)
     set_color normal
-    printf '%s\n' (__fish_git_prompt)(__fish_git_prompt_dirty)
+    printf '%s\n' (fish_git_prompt)
     set_color white
     printf '%s ' $prefix
     set_color normal

M home/.gitconfig → home/.gitconfig

@@ -28,3 +28,6 @@ tool = vimdiff3
 [mergetool "vimdiff3"]
 	path = nvim
         prompt = false
+[bash]
+	showDirtyState = true
+	showUntrackedFiles = false