From 33270abf661194e6ded439557ed5a5ae1bdfe6fa Mon Sep 17 00:00:00 2001 From: shokinn Date: Tue, 11 Jun 2024 07:52:12 +0200 Subject: [PATCH] Include ssh_config; rename Host susanoo --- config.yaml | 15 ++++++++++++++- dotfiles/commonfunc | 2 +- dotfiles/ssh/config | 12 ++++++++++++ dotfiles/z_profile | 2 +- dotfiles/zshenv | 4 ++-- dotfiles/zshrc | 6 +++--- 6 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 dotfiles/ssh/config diff --git a/config.yaml b/config.yaml index 0e2a5e8..98ecd9c 100644 --- a/config.yaml +++ b/config.yaml @@ -138,6 +138,10 @@ dotfiles: f_secretfiles: dst: ~/.bin/secretfiles src: bin/secretfiles + f_config: + src: ssh/config + dst: ~/.ssh/config + chmod: '600' profiles: AINCRAD: dotfiles: @@ -162,6 +166,7 @@ profiles: - f_wsladdhypervroute - f_wslenablehypervforwarding - f_wslshowhypervforwarding + - f_config AINCRAD-wsl: dotfiles: - d_fonts @@ -185,6 +190,7 @@ profiles: - f_wsladdhypervroute - f_wslenablehypervforwarding - f_wslshowhypervforwarding + - f_config sbx0nucmac01.home.pphg.tech: dotfiles: - f_vimrc @@ -200,7 +206,8 @@ profiles: - f_c3check - f_zprofile - f_commonfunc - susanoo.int.r3w.de: + - f_config + susanoo.local: dotfiles: - f_vimrc - f_zshrc @@ -218,6 +225,7 @@ profiles: - f_rmquarantine - f_commonfunc - f_secretfiles + - f_config yoetunheimr: dotfiles: - d_bspwm @@ -248,6 +256,7 @@ profiles: - f_wsladdhypervroute - f_wslenablehypervforwarding - f_wslshowhypervforwarding + - f_config YOETUNHEIMR-wsl: dotfiles: - d_fonts @@ -271,6 +280,7 @@ profiles: - f_wsladdhypervroute - f_wslenablehypervforwarding - f_wslshowhypervforwarding + - f_config ymir: dotfiles: - f_zshrc @@ -294,6 +304,7 @@ profiles: - f_commonfunc - f_gpgagent - f_secretfiles + - f_config workspace: dotfiles: - d_fonts @@ -305,6 +316,7 @@ profiles: - d_colors - f_zprofile - f_commonfunc + - f_config WVDEWOBMC001307: dotfiles: - f_vimrc @@ -325,3 +337,4 @@ profiles: - f_rmquarantine - f_commonfunc - f_secretfiles + - f_config diff --git a/dotfiles/commonfunc b/dotfiles/commonfunc index 09869f5..abb3f0d 100644 --- a/dotfiles/commonfunc +++ b/dotfiles/commonfunc @@ -124,7 +124,7 @@ EOF fi } -{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.int.r3w.de' @@%} +{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.local' @@%} ####################################### # Shows a netstat -tulpn styled output on mac. # Globals: diff --git a/dotfiles/ssh/config b/dotfiles/ssh/config new file mode 100644 index 0000000..e31ea6b --- /dev/null +++ b/dotfiles/ssh/config @@ -0,0 +1,12 @@ +Include /Users/phg/.colima/ssh_config + +# +# {{@@ header() @@}} +# + +Include config.d/* +Include config.d/*/* + +{%@@ if profile == 'susanoo.local' or profile == 'WVDEWOBMC001307' @@%}Host * + IdentityAgent "~/Library/Group Containers/group.strongbox.mac.mcguill/agent.sock" +{%@@ endif @@%} diff --git a/dotfiles/z_profile b/dotfiles/z_profile index d85e764..1f95fe6 100644 --- a/dotfiles/z_profile +++ b/dotfiles/z_profile @@ -9,7 +9,7 @@ export VISUAL EDITOR='vim' export EDITOR -{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.int.r3w.de' @@%} +{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.local' @@%} [[ $(command -v /opt/homebrew/bin/brew) ]] && eval "$(/opt/homebrew/bin/brew shellenv)" # Added by Toolbox App diff --git a/dotfiles/zshenv b/dotfiles/zshenv index c9774b8..a570e47 100644 --- a/dotfiles/zshenv +++ b/dotfiles/zshenv @@ -17,7 +17,7 @@ export ANSIBLE_NOCOWS=1 # Include ~/.local/bin to PATH [[ -d "{{@@ env['HOME'] @@}}/.local/bin" ]] && export PATH="{{@@ env['HOME'] @@}}/.local/bin:${PATH}" -{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.int.r3w.de' @@%}# Include /opt/homebrew/opt/gnu-getopt/bin to PATH +{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.local' @@%}# Include /opt/homebrew/opt/gnu-getopt/bin to PATH [[ -d "/opt/homebrew/opt/gnu-getopt/bin" ]] && export PATH="/opt/homebrew/opt/gnu-getopt/bin:${PATH}" {%@@ endif @@%}# Include $(go env GOPATH) to PATH @@ -49,7 +49,7 @@ export GPG_TTY=$(tty) # X410 (Windows X11 Server) export DISPLAY=$(cat /etc/resolv.conf | grep nameserver | awk '{print $2; exit;}'):0.0 {%@@ endif @@%} -{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.int.r3w.de' @@%} +{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.local' @@%} export HOMEBREW_CASK_OPTS="--appdir=~/Applications" {%@@ endif @@%} diff --git a/dotfiles/zshrc b/dotfiles/zshrc index 23432e6..1ee08f8 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -112,7 +112,7 @@ plugins=( #zsh-completions (https://github.com/zsh-users/zsh-completions/issues/603) zsh-navigation-tools zsh-ssh -{%@@ if profile == 'ymir' or profile == 'susanoo.int.r3w.de' @@%} # Mac specifics +{%@@ if profile == 'ymir' or profile == 'susanoo.local' @@%} # Mac specifics brew iterm2 macos @@ -123,7 +123,7 @@ plugins=( autoload -U compinit && compinit -{%@@ if profile == 'ymir' or profile == 'susanoo.int.r3w.de' @@%} +{%@@ if profile == 'ymir' or profile == 'susanoo.local' @@%} # Source fzf-tab-completions # source {{@@ env['HOME'] @@}}/.oh-my-zsh/custom/plugins/fzf-tab-completion/zsh/fzf-zsh-completion.sh # zstyle ':completion:*' fzf-search-display true @@ -190,7 +190,7 @@ fi # Include $(go env GOPATH) to PATH [[ $(command -v go) ]] && [[ -d "$(go env GOPATH)/bin" ]] && export PATH="$(go env GOPATH)/bin:${PATH}" -{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.int.r3w.de' @@%} +{%@@ if profile == 'WVDEWOBMC001307' or profile == 'susanoo.local' @@%} # Decide which homebrew installation (x64_86 / arm64) should be used if [ "$(sysctl -n sysctl.proc_translated)" = "1" ]; then local brew_path="/usr/local/homebrew/bin"