fix(macos): support orbstack in ssh config

natelandau · Oct 11, 2024 · 5ee78ba · 5ee78ba
1 parent 930b1ac
commit 5ee78ba
Show file tree

Hide file tree

Showing 3 changed files with 141 additions and 99 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -15,7 +15,7 @@ repos:
           - post-commit
           - push
   - repo: "https://github.com/pre-commit/pre-commit-hooks"
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-byte-order-marker
@@ -33,7 +33,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: "https://github.com/crate-ci/typos"
-    rev: v1.25.0
+    rev: v1.26.0
     hooks:
       - id: typos
 

diff --git a/dotfiles/dot_ssh/config.tmpl b/dotfiles/dot_ssh/config.tmpl
@@ -1,3 +1,10 @@
+{{- if and (eq .chezmoi.os "darwin") (joinPath .chezmoi.homeDir ".orbstack/ssh/config" | lstat) -}}
+# Added by OrbStack: 'orb' SSH host for Linux machines
+# This only works if it's at the top of ssh_config (before any Host blocks).
+# This won't be added again if you remove it.
+Include ~/.orbstack/ssh/config
+{{- end }}
+
 # Create a new key with:
 # ssh-keygen -f [filename] -t ed25519 -C "[comment]"
 # ssh-keygen -f [filename] -t rsa -b 4096 -C "[comment]"