diff --git a/home/features/cli/fish.nix b/home/features/cli/fish.nix
index 3419a13..7726444 100644
--- a/home/features/cli/fish.nix
+++ b/home/features/cli/fish.nix
@@ -1,18 +1,17 @@
 { pkgs, ... }: {
+  home.sessionVariables = {
+    EDITOR = "hx";
+    USER = "lu";
+    SHELL = pkgs.fish;
+    TERM = "xterm-256color";
+  };
+
   programs.fish = {
     enable = true;
 
     functions = { setpath = "test -e $argv[1]; and fish_add_path $argv[1]"; };
 
     interactiveShellInit = ''
-      if test -z "$XDG_RUNTIME_DIR"
-        set -x XDG_RUNTIME_DIR "/tmp/$USER-runtime-dir"
-        if test ! -e "$XDG_RUNTIME_DIR"
-          mkdir "$XDG_RUNTIME_DIR"
-          chmod 0700 "$XDG_RUNTIME_DIR"
-        end
-      end
-
       setpath /opt/local/bin
       setpath /opt/homebrew/bin
       setpath ~/.cargo/bin
@@ -21,11 +20,7 @@
       setpath ~/.local/bin
       setpath ~/.bun/bin
       setpath ~/Projects/Checkouts/arcanist/bin
-
-      set -x EDITOR hx
-      set -x USER lu
-      set -x SHELL (which fish)
-      set -x TERM xterm-256color
+      setpath ~/.config/emacs/bin
     '';
 
     shellAliases = {