diff --git a/.config/oh-my-posh/zen.toml b/.config/oh-my-posh/zen.toml
index d62e0c8f..f437b07c 100644
--- a/.config/oh-my-posh/zen.toml
+++ b/.config/oh-my-posh/zen.toml
@@ -27,7 +27,7 @@ template = '''
     {{- if $part -}}
       {{- $sub := split "/" $part -}}
       {{- if eq (len $sub) 2 -}}
-        <{{ index $sub "_1" }}>{{ index $sub "_0" }}</> <#7f849c>| </> 
+        <{{ index $sub "_1" }}>{{ index $sub "_0" }}</> <#7f849c>| </>
       {{- end -}}
     {{- end -}}
   {{- end -}}
@@ -37,14 +37,12 @@ template = '''
 	[[blocks.segments]] # Python venv
   type = 'text'
   style = 'plain'
-  foreground = 'yellow'
-  template = '{{ if .Env.VIRTUAL_ENV }}🐍 venv <grey>|</> {{ end }}'
+  template = '{{ if .Env.VIRTUAL_ENV }}<yellow>🐍 venv</> <#7f849c>|</> {{ end }}'
 
 	[[blocks.segments]] # Nix shell indicator
   type = 'text'
   style = 'plain'
-  foreground = 'blue'
-  template = '{{ if .Env.IN_NIX_SHELL }} nsh <grey>|</> {{ end }}'
+  template = '{{ if and .Env.IN_NIX_SHELL (not .Env.DEVSHELL_NAME) }}<blue> nsh</> <#7f849c>|</> {{ end }}'
 
   [[blocks.segments]]
     template = '{{ .Path }}'
diff --git a/.nixos b/.nixos
index 4f14a61b..80f5b4a8 160000
--- a/.nixos
+++ b/.nixos
@@ -1 +1 @@
-Subproject commit 4f14a61b6b8f6e23b5cface470bc3fc390b2291e
+Subproject commit 80f5b4a8f296c4a3d8e90b18525c7363f28546bf