From 72a71caa6adb26a1adb0ea5372260d6b660fe290 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 17 Oct 2023 17:11:29 +0100
Subject: [PATCH] Make TRAMP (and vterm over tramp) work better

Finally set TRAMP environment from remote .profile
---
 home/emacs/doom/config.el | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/home/emacs/doom/config.el b/home/emacs/doom/config.el
index 4d12d038..d6a3e8d2 100644
--- a/home/emacs/doom/config.el
+++ b/home/emacs/doom/config.el
@@ -126,26 +126,14 @@
         '(("d" "default" plain "%?"
            :target (file+head "${slug}.org" "#+title: ${title}\n")))))
 
+;; VTERM settings
+(after! vterm
+  (setq vterm-tramp-shells
+        '(("ssh" "/bin/bash")
+          ("sshx" "/bin/bash"))))
+
 ;; TRAMP host specific configs
 (after! tramp
   (setq tramp-default-method "sshx"
-        tramp-default-remote-shell "/bin/bash"
-        tramp-remote-path '("~/.local/bin"
-                            "/run/wrappers/bin"
-                            "/run/current-system/sw/bin"
-                            tramp-default-remote-path
-                            "/bin"
-                            "/usr/bin"
-                            "/sbin"
-                            "/usr/sbin"
-                            "/usr/local/bin"
-                            "/usr/local/sbin"
-                            "/local/bin"
-                            "/local/freeware/bin"
-                            "/local/gnu/bin"
-                            "/usr/freeware/bin"
-                            "/usr/pkg/bin"
-                            "/usr/contrib/bin"
-                            "/opt/bin"
-                            "/opt/sbin"
-                            "/opt/local/bin")))
+        tramp-default-remote-shell "/bin/sh"
+        tramp-remote-path '(tramp-own-remote-path tramp-default-remote-path)))