diff --git a/.config/nvim b/.config/nvim
new file mode 160000
index 00000000..388e68d3
--- /dev/null
+++ b/.config/nvim
@@ -0,0 +1 @@
+Subproject commit 388e68d3829276333e0d855b2514e837aa254487
diff --git a/.gitignore b/.gitignore
index 44baa361..061cc3e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 !.bashrc
 !.gitconfig
 !.inputrc
+!.password-store
 !.xinitrc
 !.Xmodmap
 !.zshrc
@@ -15,6 +16,7 @@
 !.config/fish
 !.config/i3
 !.config/nitrogen
+!.config/nvim
 !.config/polybar
 
 !.gnupg/gpg-agent.conf
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..cb3ec05f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule ".password-store"]
+	path = .password-store
+	url = git@git.dustvoice.de:DustVoice/pass.git
+[submodule ".config/nvim"]
+	path = .config/nvim
+	url = git@github.com:DustVoice/nvim.git
diff --git a/.password-store b/.password-store
new file mode 160000
index 00000000..676a500a
--- /dev/null
+++ b/.password-store
@@ -0,0 +1 @@
+Subproject commit 676a500a1e325e42fe9b3e3be0b22e0cce4a06ba