diff --git a/programs/emacs/default.nix b/programs/emacs/default.nix
index 12a393d..e678706 100644
--- a/programs/emacs/default.nix
+++ b/programs/emacs/default.nix
@@ -1,12 +1,11 @@
 {
-  config,
   pkgs,
   fonts,
   ...
 }: {
   programs.emacs = {
     # Clone emacs config from https://git.xenia.me.uk/pixelifytica/emacs.git
-    # git clone https://git.xenia.me.uk/pixelifytica/emacs.git ~/.config/emacs
+    # git clone https://git.xenia.me.uk/pixelifytica/emacs.git ~/.emacs.d
     enable = true;
     package = pkgs.emacs29-pgtk;
     extraConfig = let
@@ -121,26 +120,6 @@
         elfeed-tube
       ];
   };
-  services = {
-    emacs = {
-      enable = true;
-      package = config.programs.emacs.finalPackage;
-      defaultEditor = true;
-      client.enable = true;
-      socketActivation.enable = true;
-      startWithUserSession = false;
-    };
-    git-sync.repositories = with config.xdg.userDirs; {
-      org = {
-        path = "${documents}/Org";
-        uri = "git+https://git.xenia.me.uk/xenia/org.git";
-      };
-      references = {
-        path = "${documents}/References";
-        uri = "git+https://git.xenia.me.uk/xenia/references.git";
-      };
-    };
-  };
   home.packages = with pkgs; [
     # Emacs requirements
     imagemagick
diff --git a/programs/shell/default.nix b/programs/shell/default.nix
index 17b3045..2bdbbb0 100644
--- a/programs/shell/default.nix
+++ b/programs/shell/default.nix
@@ -65,6 +65,10 @@
         ignoreSpace = true;
         expireDuplicatesFirst = true;
       };
+      localVariables = {
+        "EDITOR" = "emacs -nw";
+        "VISUAL" = "emacs";
+      };
       shellAliases = {
         nixos-switch = "sudo nixos-rebuild switch --flake flake:my-nixos --show-trace";
         home-manager-switch = "nix run flake:my-home-manager -- switch --flake flake:my-home-manager --show-trace";