diff --git a/.gitmodules b/.gitmodules
index 0f15da1..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[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 a018128..ffeb20c 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -48,6 +48,10 @@ 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
@@ -83,6 +87,8 @@ in {
       set -g escape-time 0
       bind-key C-z send-prefix
       set -g renumber-windows on
+
+      bind-key T swap-window -t 0
     '';
   };
 
@@ -109,9 +115,7 @@ in {
       };
     };
 
-    starship = {
-      enable = true;
-    };
+    starship = { enable = true; };
 
     # better cat
     bat.enable = true;
@@ -125,7 +129,6 @@ in {
 
     emacs = {
       enable = true;
-      #package = pkgs.emacs-unstable;
       extraPackages = epkgs: with epkgs; [ vterm ];
     };
 
@@ -173,7 +176,11 @@ in {
     defaultCacheTtlSsh = 300;
   };
 
-  services.emacs = { enable = true; };
+  services.emacs = {
+    enable = true;
+    defaultEditor = true;
+    startWithUserSession = true;
+  };
 
   home.file.".local" = {
     recursive = true;
diff --git a/home/emacs.d b/home/emacs.d
deleted file mode 160000
index bf8495b..0000000
--- a/home/emacs.d
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bf8495b4122701fb30cb6cea37281dc8f3bedcd0