spacemacs: move tramp settings to "user-init"

1 files changed, 11 insertions, 9 deletions

diff --git a/_spacemacs.d/init.el b/_spacemacs.d/init.el
index e11ec1f..3072b03 100644
--- a/_spacemacs.d/init.el
+++ b/_spacemacs.d/init.el
@@ -354,6 +354,17 @@
   It is called immediately after `dotspacemacs/init'.
   You are free to put almost any user code here.  The exception is
   org related code, which should be placed in `dotspacemacs/user-config'."
+  ;;
+  ;; Helm uses Tramp which tries to figure out some SSH/DNS settings at
+  ;; startup.  However, the ISP may redirect non-existing addresses to
+  ;; their own servers, which causes long timeouts and blocks the startup.
+  ;; Credit:
+  ;; + Spacemacs: FAQ: Why is Spacemacs hanging on startup?
+  ;;   https://github.com/syl20bnr/spacemacs/blob/master/doc/FAQ.org
+  (setq tramp-ssh-controlmaster-options
+        (concat "-o ControlPath='tramp.%%C' "
+                "-o ControlMaster=auto "
+                "-o ControlPersist=no"))
   )
 
 
@@ -419,15 +430,6 @@
   ;; Display tildes in the fringe on empty lines
   (global-vi-tilde-fringe-mode)
   ;;
-  ;; Loading `tramp' may block Emacs for a long time due to network issues
-  ;; Credit:
-  ;; + https://github.com/syl20bnr/spacemacs/issues/3422#issuecomment-148919047
-  ;; + https://github.com/emacs-helm/helm/issues/1000#issuecomment-119487649
-  (setq tramp-ssh-controlmaster-options
-        (concat "-o ControlPath='tramp.%%C' "
-                "-o ControlMaster=auto "
-                "-o ControlPersist=no"))
-  ;;
   ;; Enable fill column indicator in most modes, except for `org-mode'
   ;; Credit: https://github.com/syl20bnr/spacemacs/issues/4506
   ;; WARNING: