From e3de8dcd0a083ccc74507368d97a2b1a2c55ea68 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Wed, 5 Jul 2023 19:30:37 +0200
Subject: [PATCH 1/4] home: Remove doom emacs submodule

---
 .gitmodules  | 3 ---
 home/emacs.d | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 home/emacs.d

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/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

From 54cc1aa25e0c01f8dd70818e222686534222586e Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Wed, 5 Jul 2023 19:34:48 +0200
Subject: [PATCH 2/4] cli: Cleanup format

---
 home/cli.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/home/cli.nix b/home/cli.nix
index a018128..acd547b 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
@@ -109,9 +113,7 @@ in {
       };
     };
 
-    starship = {
-      enable = true;
-    };
+    starship = { enable = true; };
 
     # better cat
     bat.enable = true;
@@ -125,7 +127,6 @@ in {
 
     emacs = {
       enable = true;
-      #package = pkgs.emacs-unstable;
       extraPackages = epkgs: with epkgs; [ vterm ];
     };
 

From 3891b6c2cd3a3fc39272e79e2c0660d87ab00992 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Wed, 5 Jul 2023 19:37:34 +0200
Subject: [PATCH 3/4] tmux: Provide key binding to swap windows

---
 home/cli.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/home/cli.nix b/home/cli.nix
index acd547b..70d0e48 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -87,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
     '';
   };
 

From 92bf748a71cb57a1e822eb6497f68ba41f678886 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Wed, 5 Jul 2023 21:09:55 +0200
Subject: [PATCH 4/4] emacs: Set as default editor

---
 home/cli.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/home/cli.nix b/home/cli.nix
index 70d0e48..ffeb20c 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -176,7 +176,11 @@ in {
     defaultCacheTtlSsh = 300;
   };
 
-  services.emacs = { enable = true; };
+  services.emacs = {
+    enable = true;
+    defaultEditor = true;
+    startWithUserSession = true;
+  };
 
   home.file.".local" = {
     recursive = true;