From 237c05ed1dcd31e76964d0bc5adb6a206692d23a Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Thu, 26 Dec 2024 08:53:26 +0100 Subject: [PATCH] Update config --- .chezmoiignore | 4 ++-- dot_config/nvim/spell/en.utf-8.add | 4 ++++ dot_gitconfig => dot_gitconfig.tmpl | 2 ++ dot_ssh/config.tmpl | 2 ++ dot_zshrc.tmpl | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) rename dot_gitconfig => dot_gitconfig.tmpl (83%) diff --git a/.chezmoiignore b/.chezmoiignore index 7d16727..a60b979 100644 --- a/.chezmoiignore +++ b/.chezmoiignore @@ -11,10 +11,10 @@ LICENSE .xsession .config/openbox/* .config/nvim/lua/plugins/lsp.lua +.config/nvim/lazy-lock.json +.config/nvim/lazyvim.json {{ else }} .config/fish/conf.d/fish-ssh-agent.fish .config/fish/functions/__ssh_agent_* .config/zed/* -.config/nvim/lazy-lock.json -.config/nvim/lazyvim.json {{ end }} diff --git a/dot_config/nvim/spell/en.utf-8.add b/dot_config/nvim/spell/en.utf-8.add index ebdb6b2..adc8e73 100644 --- a/dot_config/nvim/spell/en.utf-8.add +++ b/dot_config/nvim/spell/en.utf-8.add @@ -1,4 +1,8 @@ ClusterCockpit +sqlite +InfluxDB +HPC +JSON subclusters subcluster nvidia diff --git a/dot_gitconfig b/dot_gitconfig.tmpl similarity index 83% rename from dot_gitconfig rename to dot_gitconfig.tmpl index 3bcbe99..6a157e5 100644 --- a/dot_gitconfig +++ b/dot_gitconfig.tmpl @@ -9,5 +9,7 @@ smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true +{{- if ne .chezmoi.hostname "fangorn" }} [commit] gpgsign = true +{{- end }} diff --git a/dot_ssh/config.tmpl b/dot_ssh/config.tmpl index d983d5d..661bd29 100644 --- a/dot_ssh/config.tmpl +++ b/dot_ssh/config.tmpl @@ -8,7 +8,9 @@ VerifyHostKeyDNS yes AddKeysToAgent no ForwardAgent no ForwardX11 no +{{- if ne .chezmoi.hostname "fangorn" }} PKCS11Provider {{ .pkcslib }} +{{- end }} Host csnhr Hostname csnhr.nhr.fau.de diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index edef713..3dd8e58 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -65,6 +65,7 @@ alias bkp-home='doas restic -r /mnt/nfs/BSD/restic-repo --verbose backup --one- alias bkp-etc='doas restic -r /mnt/nfs/BSD/restic-repo --verbose backup /etc' alias bkp-list='doas restic -r /mnt/nfs/BSD/restic-repo snapshots' {{- else }} +alias lg='lazygit' {{ if eq .chezmoi.os "darwin" }} source $HOME/perl5/perlbrew/etc/bashrc export XDG_CONFIG_HOME="$HOME/.config"