diff --git a/.nixos b/.nixos
index cba857e8..fea8fde2 160000
--- a/.nixos
+++ b/.nixos
@@ -1 +1 @@
-Subproject commit cba857e8303f0e5aba05489924653c101ae81031
+Subproject commit fea8fde271b82f4e3abaa08d5406d0ab9372739e
diff --git a/.zshrc b/.zshrc
index 7ede112c..7a36a4e2 100755
--- a/.zshrc
+++ b/.zshrc
@@ -8,6 +8,12 @@ zstyle ':completion:*' matcher-list 'm:{[:lower:]}={[:upper:]}' 'r:|[._-]=* r:|=
 # init oh my posh with theme from stow
 eval "$(oh-my-posh init zsh --config $HOME/.config/oh-my-posh/zen.toml)"
 
+# make nix shell zsh instead of bash
+any-nix-shell zsh --info-right | source /dev/stdin
+
+# make nvim main editor
+export EDITOR=nvim
+
 # Fzf history search
 source <(fzf --zsh)