From 2afce59aa3f0302e7f86d4807b06daca19276c32 Mon Sep 17 00:00:00 2001 From: Tomasz Trebski Date: Mon, 11 Jan 2021 14:02:52 +0100 Subject: [PATCH 1/2] Add sshd config concept --- install.conf.yaml | 5 +++++ ssh/config | 1 + ssh/config.d/00-defaults.config | 10 ++++++++++ vim/after/ftplugin/sshconfig.vim | 4 ++++ vim/filetype.vim | 5 +---- vim/ftdetect/sshconfig.vim | 3 +++ 6 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 ssh/config create mode 100644 ssh/config.d/00-defaults.config create mode 100644 vim/after/ftplugin/sshconfig.vim create mode 100644 vim/ftdetect/sshconfig.vim diff --git a/install.conf.yaml b/install.conf.yaml index 25ea25a16..032ef336d 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -26,6 +26,11 @@ # neovim stuff ~/.config/nvim: nvim + ~/.ssh/config: ssh/config + ~/.ssh/config.d: + glob: true + path: ssh/config.d + # git stuff ~/.gitignore: gitignore ~/.gitattributes: gitattributes diff --git a/ssh/config b/ssh/config new file mode 100644 index 000000000..fb419af8b --- /dev/null +++ b/ssh/config @@ -0,0 +1 @@ +Include ~/.ssh/config.d/*.config diff --git a/ssh/config.d/00-defaults.config b/ssh/config.d/00-defaults.config new file mode 100644 index 000000000..fe5b3bf81 --- /dev/null +++ b/ssh/config.d/00-defaults.config @@ -0,0 +1,10 @@ +Host * + AddKeysToAgent yes + ForwardAgent yes + ForwardX11 no + ForwardX11Trusted yes + TCPKeepAlive no + SendEnv LANG LANGUAGE LC_* + GSSAPIAuthentication no + ServerAliveInterval 60 + ServerAliveCountMax 30 diff --git a/vim/after/ftplugin/sshconfig.vim b/vim/after/ftplugin/sshconfig.vim new file mode 100644 index 000000000..9ce283f0a --- /dev/null +++ b/vim/after/ftplugin/sshconfig.vim @@ -0,0 +1,4 @@ +setlocal nospell +setlocal encoding=utf-8 +setlocal tabstop=2 +setlocal shiftwidth=2 diff --git a/vim/filetype.vim b/vim/filetype.vim index 209788ccf..39e6b3ab0 100644 --- a/vim/filetype.vim +++ b/vim/filetype.vim @@ -1,8 +1,5 @@ scriptencoding utf-8 -" Copyright 2018-2020 @ kornicameister - -" unix as the standard file type set fileformats=unix,dos,mac augroup git_ft_config @@ -50,5 +47,5 @@ augroup END augroup asciidoc_ft_settings au! - au FileType asciidoc setlocal spell + au FileType asciidoc setlocal spell augroup END diff --git a/vim/ftdetect/sshconfig.vim b/vim/ftdetect/sshconfig.vim new file mode 100644 index 000000000..5945e628b --- /dev/null +++ b/vim/ftdetect/sshconfig.vim @@ -0,0 +1,3 @@ +au BufNewFile,BufRead *ssh/config setfiletype sshconfig +au BufNewFile,BufRead *ssh/config.d/*.config setfiletype sshconfig + From e186bb06e64e8b7c5df2a19451a8dceb0c77be69 Mon Sep 17 00:00:00 2001 From: Tomasz Trebski Date: Mon, 11 Jan 2021 14:05:46 +0100 Subject: [PATCH 2/2] fixup! Add sshd config concept --- vim/ftdetect/sshconfig.vim | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vim/ftdetect/sshconfig.vim b/vim/ftdetect/sshconfig.vim index 5945e628b..7d0a41888 100644 --- a/vim/ftdetect/sshconfig.vim +++ b/vim/ftdetect/sshconfig.vim @@ -1,3 +1,4 @@ -au BufNewFile,BufRead *ssh/config setfiletype sshconfig -au BufNewFile,BufRead *ssh/config.d/*.config setfiletype sshconfig - +augroup sshconfig_ft + au BufNewFile,BufRead *ssh/config setfiletype sshconfig + au BufNewFile,BufRead *ssh/config.d/*.config setfiletype sshconfig +augroup END