diff --git a/home/default.nix b/home/default.nix
index c093fa5..aa29a4f 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -44,6 +44,7 @@ in {
         git_branch.format = "[$symbol$branch]($style) ";
         python.format = "[py \${pyenv_prefix}(\${version} )(\\($virtualenv\\) )]($style)";
         nodejs.format = "[js ($version )]($style)";
+        nix_shell.format = "[nix $state( \\($name\\))]($style) ";
       };
     };
 
diff --git a/home/git.nix b/home/git.nix
index 325a3e0..32527bc 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -35,7 +35,10 @@
       branch.sort = "-committerdate";
       log.showSignature = true;
       push.default = "current";
-      include.path = "~/.gitconfig.local";
     };
+    includes = [
+      { path = "~/.gitconfig.local"; }
+      { path = "~/.gitconfig.work"; condition = "gitdir:~/work/"; }
+    ];
   };
 }