From c2dc12417c68208db8237987a1885a3de594f0b1 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 3 Jun 2024 09:54:42 +0100
Subject: [PATCH] ssh: add keys to agent (new config syntax), remove heimdall

Set TERM env var to xterm-256color in foot config instead of as ssh
override, might fix emacs remote shell issues where it should be
TERM=dumb
---
 programs/desktop/foot/default.nix |  1 +
 programs/shell/ssh.nix            | 11 +----------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/programs/desktop/foot/default.nix b/programs/desktop/foot/default.nix
index 4a38de3..98179b1 100644
--- a/programs/desktop/foot/default.nix
+++ b/programs/desktop/foot/default.nix
@@ -8,6 +8,7 @@
     server.enable = true;
     settings = {
       main = {
+        term = "xterm-256color";
         locked-title = false;
         font = "${fonts.monospace.name}:size=${toString fonts.sizes.applications}";
         dpi-aware = false;
diff --git a/programs/shell/ssh.nix b/programs/shell/ssh.nix
index b180a3e..6d2b04b 100644
--- a/programs/shell/ssh.nix
+++ b/programs/shell/ssh.nix
@@ -5,16 +5,13 @@
   ];
   programs.ssh = {
     enable = true;
+    addKeysToAgent = "yes";
     forwardAgent = true;
     compression = true;
     serverAliveInterval = 15;
     serverAliveCountMax = 3;
     controlMaster = "auto";
     controlPersist = "10s";
-    extraConfig = ''
-      AddKeysToAgent=yes
-      SetEnv TERM=xterm-256color
-    '';
     matchBlocks = {
       "git*".user = "git";
       "legion" = {
@@ -32,12 +29,6 @@
       "freia" = {
         user = "elitherl";
         hostname = "freia027.hpc.l";
-        forwardX11Trusted = true;
-      };
-      "heimdall" = {
-        user = "elitherl";
-        hostname = "heimdall003.jet.uk";
-        forwardX11Trusted = true;
       };
     };
   };