diff --git a/.gitmodules b/.gitmodules
index e69de29..0f15da1 100644
--- a/.gitmodules
+++ 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 ffeb20c..a018128 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -48,10 +48,6 @@ in {
 
     # editing
     nil # nix language server
-    shellcheck
-    editorconfig-core-c
-    shfmt
-    (aspellWithDicts (dicts: with dicts; [ en en-computers en-science de ]))
 
     # system tools
     htop-vim # htop with vim bindings
@@ -87,8 +83,6 @@ in {
       set -g escape-time 0
       bind-key C-z send-prefix
       set -g renumber-windows on
-
-      bind-key T swap-window -t 0
     '';
   };
 
@@ -115,7 +109,9 @@ in {
       };
     };
 
-    starship = { enable = true; };
+    starship = {
+      enable = true;
+    };
 
     # better cat
     bat.enable = true;
@@ -129,6 +125,7 @@ in {
 
     emacs = {
       enable = true;
+      #package = pkgs.emacs-unstable;
       extraPackages = epkgs: with epkgs; [ vterm ];
     };
 
@@ -176,11 +173,7 @@ in {
     defaultCacheTtlSsh = 300;
   };
 
-  services.emacs = {
-    enable = true;
-    defaultEditor = true;
-    startWithUserSession = true;
-  };
+  services.emacs = { enable = true; };
 
   home.file.".local" = {
     recursive = true;
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