diff --git a/.gitmodules b/.gitmodules
index e64c295..0a00328 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "dircolors-solarized"]
 	path = dircolors-solarized
 	url = https://github.com/seebi/dircolors-solarized
+[submodule "zsh-nix-shell"]
+	path = zsh-nix-shell
+	url = https://github.com/chisui/zsh-nix-shell
diff --git a/home/.zsh/zsh-nix-shell b/home/.zsh/zsh-nix-shell
new file mode 120000
index 0000000..4cb2fa6
--- /dev/null
+++ b/home/.zsh/zsh-nix-shell
@@ -0,0 +1 @@
+../../zsh-nix-shell
\ No newline at end of file
diff --git a/home/.zshrc.local b/home/.zshrc.local
index a7054a6..59ffa60 100644
--- a/home/.zshrc.local
+++ b/home/.zshrc.local
@@ -46,6 +46,9 @@ command -v fzf-share >/dev/null && source $(fzf-share)/key-bindings.zsh
 ## Color switcher
 alias dynamic-colors="~/.dynamic-colors/bin/dynamic-colors"
 
+## Support for nix-shell
+source $HOME/.zsh/zsh-nix-shell/nix-shell.plugin.zsh
+
 ## Timer
 function timer() (
     if [ -z "$1" ] || [ -z "$2" ]; then
diff --git a/zsh-nix-shell b/zsh-nix-shell
new file mode 160000
index 0000000..6ae3054
--- /dev/null
+++ b/zsh-nix-shell
@@ -0,0 +1 @@
+Subproject commit 6ae30544a284301026d4ee1c437b44f5d1a9952e