diff --git a/nix/config/emacs/init.el b/nix/config/emacs/init.el
index c4d459d..8813bc7 100644
--- a/nix/config/emacs/init.el
+++ b/nix/config/emacs/init.el
@@ -515,6 +515,11 @@
   :init
   (savehist-mode))
 
+(use-package server
+  :defer 2
+  :config
+  (server-start))
+
 (use-package smartparens
   :hook ((prog-mode . smartparens-mode))
   :bind
diff --git a/nix/module/home-manager.nix b/nix/module/home-manager.nix
index 6558650..21bc694 100644
--- a/nix/module/home-manager.nix
+++ b/nix/module/home-manager.nix
@@ -154,6 +154,7 @@
       userName = "Tobias Ostner";
       userEmail = email;
       extraConfig = {
+        core.editor = "emacsclient -c -a ''";
         init.defaultBranch = "main";
         pull.rebase = true;
         rebase.updateRefs = true;
@@ -186,6 +187,7 @@
       syntaxHighlighting.enable = true;
       shellAliases = {
         ls = "ls --color=auto -F";
+        emacs = "emacsclient -c -a ''";
       };
     };
   };