diff --git a/home/Vanguard.nix b/home/Vanguard.nix
index 1549016..e4148ff 100644
--- a/home/Vanguard.nix
+++ b/home/Vanguard.nix
@@ -1,7 +1,6 @@
 {pkgs, ...}: {
   imports = [
     ./default.nix
-    ./work.nix
     ../programs/games/default.nix
   ];
   home.packages = with pkgs; [
diff --git a/programs/emacs/default.nix b/programs/emacs/default.nix
index a116233..ec45e93 100644
--- a/programs/emacs/default.nix
+++ b/programs/emacs/default.nix
@@ -1,4 +1,5 @@
 {
+  config,
   pkgs,
   fonts,
   ...
@@ -7,6 +8,14 @@
     ./python/default.nix
     ./lua/default.nix
   ];
+  services.emacs = {
+    enable = true;
+    package = config.programs.emacs.finalPackage;
+    defaultEditor = true;
+    client.enable = true;
+    socketActivation.enable = false;
+    startWithUserSession = true;
+  };
   programs.emacs = {
     # Clone emacs config from https://git.xenia.me.uk/pixelifytica/emacs.git
     # git clone https://git.xenia.me.uk/pixelifytica/emacs.git ~/.emacs.d
diff --git a/programs/shell/default.nix b/programs/shell/default.nix
index 8470d1b..9492eee 100644
--- a/programs/shell/default.nix
+++ b/programs/shell/default.nix
@@ -66,10 +66,6 @@
         ignoreSpace = true;
         expireDuplicatesFirst = true;
       };
-      localVariables = {
-        "EDITOR" = "emacs -nw";
-        "VISUAL" = "emacs";
-      };
       initExtra = ''
         ## completion config and styling
         zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
diff --git a/programs/shell/ssh.nix b/programs/shell/ssh.nix
index 6d2b04b..e684630 100644
--- a/programs/shell/ssh.nix
+++ b/programs/shell/ssh.nix
@@ -30,6 +30,10 @@
         user = "elitherl";
         hostname = "freia027.hpc.l";
       };
+      "heimdall" = {
+        user = "elitherl";
+        hostname = "heimdall003.jet.uk";
+      };
     };
   };
 }