diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..0f15da1
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "home/emacs.d"]
+	path = home/emacs.d
+	url = https://github.com/hlissner/doom-emacs
diff --git a/home/cli.nix b/home/cli.nix
index 6624bbd..ee2e2c3 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -27,6 +27,7 @@
     file # info about files
     unzip
     gotop
+    gnumake
     ripgrep # better grep
 
     # editors
@@ -37,10 +38,14 @@
     nix-prefetch-git
     cabal-install
     haskellPackages.cabal-fmt
+    haskellPackages.stylish-haskell
   ];
   home.extraOutputsToInstall = [ "doc" "info" "devdoc" ];
 
   xdg.enable = true;
+  xdg.configFile = {
+    "emacs".source = config.lib.file.mkOutOfStoreSymlink ./emacs.d;
+  };
 
   programs = {
     direnv = {
@@ -59,7 +64,12 @@
 
     git = {
       enable = true;
-      ignores = [ "*~" "*.swp" "result" ];
+      ignores = [
+        "*~"
+        "*.swp"
+        "result"
+        "dist-newstyle"
+      ];
       userEmail = "me@failco.de";
       userName = "Alexander Kobjolke";
     };
diff --git a/home/emacs.d b/home/emacs.d
new file mode 160000
index 0000000..bf8495b
--- /dev/null
+++ b/home/emacs.d
@@ -0,0 +1 @@
+Subproject commit bf8495b4122701fb30cb6cea37281dc8f3bedcd0