diff --git a/.gitmodules b/.gitmodules
index 97693fa..c0d1872 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "zsh/.oh-my-zsh/custom/themes/powerlevel10k"]
 	path = zsh/.oh-my-zsh/custom/themes/powerlevel10k
 	url = https://github.com/romkatv/powerlevel10k.git
+[submodule "zsh/.oh-my-zsh/custom/plugins/conda-zsh-completion"]
+	path = zsh/.oh-my-zsh/custom/plugins/conda-zsh-completion
+	url = git@github.com:conda-incubator/conda-zsh-completion.git
diff --git a/zsh/.oh-my-zsh/custom/plugins/conda-zsh-completion b/zsh/.oh-my-zsh/custom/plugins/conda-zsh-completion
new file mode 160000
index 0000000..2cc833a
--- /dev/null
+++ b/zsh/.oh-my-zsh/custom/plugins/conda-zsh-completion
@@ -0,0 +1 @@
+Subproject commit 2cc833a65037399bffaa149780beb2dd5376859e
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 5834e7f..1215010 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -59,6 +59,7 @@ plugins=(
     # non oh-my-zsh plugins
     zsh-autosuggestions
     zsh-syntax-highlighting
+    conda-zsh-completion
 )
 
 source $ZSH/oh-my-zsh.sh