From 2e55c7385a5f6a2202831ec06761f2c3e2d9eeee Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Fri, 1 Dec 2023 10:51:18 +0100 Subject: [PATCH] added local source file overrides --- dot_config/zsh/dot_zshenv | 5 +++-- dot_config/zsh/dot_zshrc | 3 +++ dot_config/zsh/files/sshcomp.zsh | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv index 2bda25f..fb046e3 100644 --- a/dot_config/zsh/dot_zshenv +++ b/dot_config/zsh/dot_zshenv @@ -1,6 +1,6 @@ -# deduplicate path and add local bin to path +# deduplicate path and add local bin to path typeset -U path PATH -export PATH="$HOME"/.local/bin:"$PATH" +export PATH="$HOME"/.local/bin:"$XDG_DATA_HOME"/JetBrains/Toolbox/scripts:"$PATH" # xdg stuff export XDG_CACHE_HOME="$HOME"/.cache @@ -43,6 +43,7 @@ export RUSTUP_HOME="$XDG_DATA_HOME"/rustup export GNUPGHOME="$XDG_DATA_HOME"/gnupg export W3M_DIR="$XDG_DATA_HOME"/w3m export GIBO_BOILERPLATES="$XDG_DATA_HOME"/giboboilerplates +export PATH="$XDG_DATA_HOME"/JetBrains/Toolbox/scripts:"$PATH" # other programs export LESSHISTFILE="$XDG_STATE_HOME"/less/history diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index 3d11cb4..a6cb68f 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -8,6 +8,9 @@ eval "$potentialBanner[$RANDOM%$#potentialBanner+1]" # source plugins eval "$(sheldon source)" +# local overrides +for sourced in "$XDG_DATA_HOME"/zsh/files/*; do source $sourced; done + # theme potentialTheme=('atomic.omp.json' 'emodipt-extend.omp.json' 'kali.omp.json' 'lambda.omp.json' 'nordtron.omp.json') export POSH_THEME="$XDG_DATA_HOME/omp/themes/$potentialTheme[$RANDOM%$#potentialTheme+1]" diff --git a/dot_config/zsh/files/sshcomp.zsh b/dot_config/zsh/files/sshcomp.zsh index 33fc146..799786b 100644 --- a/dot_config/zsh/files/sshcomp.zsh +++ b/dot_config/zsh/files/sshcomp.zsh @@ -9,7 +9,7 @@ zstyle ':completion:*:(ssh|mosh):*' group-order users hosts-domain hosts-host us zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:users' ignored-patterns '*' zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-host' ignored-patterns '*(.|:)*' loopback localhost broadcasthost 'ip6-*' 'hbz*' zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-domain' ignored-patterns '<->.<->.<->.<->' '^[-[:alnum:]]##(.[-[:alnum:]]##)##' '*@*' '*.eeleater.org' '*.hbz-nrw.de' -zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.0.*' '255.255.255.255' '::1' 'fe80::*' 'ff02::*' +zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.*' '255.255.255.255' '::1' 'fe80::*' 'ff02::*' [ -r ~/.ssh/config ] && _ssh_config=($(cat ~/.ssh/config | sed -ne 's/Host[=\t ]//p')) || _ssh_config=() [ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$(