Bit more cleanup and reverting git color settings

.blackbox/blackbox-files.txt

@@ -1,6 +1,2 @@
 git/.gituser
 ssh/.ssh/config
-ssh/.ssh/config.d/holidayapi
-ssh/.ssh/config.d/mailshake
-ssh/.ssh/config.d/risksmith
-ssh/.ssh/config.d/sherman

.gitignore

@@ -9,9 +9,5 @@ known_hosts
 /.blackbox/pubring.kbx~
 /.blackbox/secring.gpg
 
-/ssh/.ssh/config
-/ssh/.ssh/config.d/holidayapi
-/ssh/.ssh/config.d/mailshake
-/ssh/.ssh/config.d/risksmith
-/ssh/.ssh/config.d/sherman
 /git/.gituser
+/ssh/.ssh/config

git/.gitconfig

@@ -5,10 +5,10 @@
   helper = cache --timeout=86400
 
 [color]
-  branch = always
-  diff = always
-  interactive = always
-  status = always
+  branch = auto
+  diff = auto
+  interactive = auto
+  status = auto
 
 [core]
   editor = nvim