Skip to content

Commit

Permalink
ssh: revert to standard ~/.ssh/config file
Browse files Browse the repository at this point in the history
-F ignores /etc/ssh/ssh_config
  • Loading branch information
branchvincent committed Jul 20, 2024
1 parent c8b9e1d commit 784de0a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
4 changes: 0 additions & 4 deletions .config/fish/conf.d/__xdg.fish
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ set -gx CARGO_HOME $XDG_DATA_HOME/cargo
set -gx CARGO_INSTALL_ROOT ~/.local
set -gx RUSTUP_HOME $XDG_DATA_HOME/rustup

# ssh
set -gx GIT_SSH_COMMAND "ssh -F $XDG_CONFIG_HOME/ssh/config"
alias ssh $GIT_SSH_COMMAND

# uv
set -gx UV_CACHE_DIR $XDG_CACHE_HOME/uv
set -gx UV_PYTHON_INSTALL_DIR $XDG_DATA_HOME/uv/python
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@
/.config/fish/fish_variables
/.config/gcloud/
/.config/op/
/.config/ssh/known_hosts
/.config/zsh/*.zwc
!/.github/
!/.gitignore
!/.hushlogin
!/.pre-commit-config.yaml
!/.profile
!/.ssh/
/.ssh/*
!/.ssh/config
!/.vscode/
/.vscode/*
!/.vscode/settings.json
Expand Down
File renamed without changes.
5 changes: 3 additions & 2 deletions .config/ssh/config → .ssh/config
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# -*- mode: ssh-config -*-
Include ~/.config/ssh/conf.d/*.conf
Include ~/.ssh/conf.d/*.conf

Host *
ControlMaster auto
ControlPath ~/.local/state/ssh-%C
ControlPersist yes
SendEnv COLORTERM
UserKnownHostsFile ~/.config/ssh/known_hosts
ServerAliveInterval 300
UserKnownHostsFile ~/.ssh/known_hosts

0 comments on commit 784de0a

Please sign in to comment.