diff --git a/home-manager/common/programs/core.nix b/home-manager/common/programs/core.nix
index 9aeb8232..b0364d6 100644
--- a/home-manager/common/programs/core.nix
+++ b/home-manager/common/programs/core.nix
@@ -23,6 +23,15 @@ with lib;
         # rsync for _The Cloud_ :tm:
         rclone
       ];
+      # Configure tmux
+      programs.tmux = {
+        enable = true;
+        aggressiveResize = true;
+        extraConfig = ''
+          set -g default-terminal "tmux-256color"
+          set -ag terminal-overrides ",xterm-256color:RGB"
+        '';
+      };
     })
     (mkIf config.nathan.programs.util.productivity {
       home.packages = with pkgs; [
diff --git a/home-manager/common/programs/emacs.nix b/home-manager/common/programs/emacs.nix
index 3168c2d..243d38d 100644
--- a/home-manager/common/programs/emacs.nix
+++ b/home-manager/common/programs/emacs.nix
@@ -73,5 +73,9 @@
       EDITOR = "emacsclient";
       VISUAL = "emacsclient";
     };
+    systemd.user.sessionVariables = {
+      EDITOR = "emacsclient";
+      VISUAL = "emacsclient";
+    };
   };
 }