diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 870b1be..fbd7acb 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -20,6 +20,7 @@ bspc config focus_follows_pointer true
 # WINDOW RULES #
 bspc rule -a Steam state=floating
 bspc rule -a Zathura state=tiled
+bspc rule -a Emacs state=tiled
 
 # PROBLEMS WITH JAVA APPLICATIONS #
 wmname LG3D
diff --git a/.emacs.d b/.emacs.d
new file mode 160000
index 0000000..473417a
--- /dev/null
+++ b/.emacs.d
@@ -0,0 +1 @@
+Subproject commit 473417a8907559f0a60952ddcae8db861445a533
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..1e6161a
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule ".emacs.d"]
+	path = .emacs.d
+	url = https://github.com/hlissner/doom-emacs