diff --git a/.gitignore b/.gitignore index 956b9ac..60304bb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,10 @@ home/user/.config/nvim/spell home/user/.config/zsh/zshrc.d/* !home/user/.config/zsh/zshrc.d/00_zhashd.sh + +home/user/.zshenv.d/* +!home/user/.zshenv.d/.gitkeep + home/user/.config/zsh/.zcalc_history .zcompdump diff --git a/TARGETS.sh b/TARGETS.sh index 3e9159f..7a853ee 100644 --- a/TARGETS.sh +++ b/TARGETS.sh @@ -4,7 +4,7 @@ less:.lesskey .infokey tmux:.config/tmux .tmux .config/systemd/user/tmux.service .local/bin/tmux_start_session.sh .local/bin/tmux_list_sessions.sh .local/bin/tmux_attach_session.sh .local/bin/tmux_kill_sessions.sh .local/bin/tmux_start_projects.sh t: note: -zsh:.config/zsh .zshenv .inputrc %colors +zsh:.config/zsh .zshenv .zshenv.d .inputrc %colors alacritty:.config/alacritty nvim:.config/nvim .editorconfig .editrc .local/bin/vim_askpass_helper ssh: diff --git a/home/user/.config/zsh/aliases b/home/user/.config/zsh/aliases index e72690a..1d8f8d1 100644 --- a/home/user/.config/zsh/aliases +++ b/home/user/.config/zsh/aliases @@ -195,4 +195,4 @@ alias -g RED='2> >(while read line; do printf "\033[0;31m${line}\033[0m\n"; done alias -g BEEP='&& beep -f 800 -l 250 -n -f 1000 -l 500 || beep -f 800 -l 250 -n -f 500 -l 500' -alias -g PROXY="http_proxy='socks5://localhost:1080'" +alias -g PROXY='http_proxy="socks5://${SOCKS5_SERVER:-localhost}"' diff --git a/home/user/.config/zsh/sourcer b/home/user/.config/zsh/sourcer index 2aca767..0a7113c 100644 --- a/home/user/.config/zsh/sourcer +++ b/home/user/.config/zsh/sourcer @@ -11,6 +11,7 @@ _sod() { local filename for filename in $(ls "${dir_to_source}" | sort -n) do + # shellcheck disable=SC1090 source "${dir_to_source}/${filename}" done fi @@ -35,4 +36,4 @@ source "${ZDOTDIR}/mappings" source "${ZDOTDIR}/accept_line" -_sod "${ZDOTDIR}/zshrc.d" \ No newline at end of file +_sod "${ZDOTDIR}/zshrc.d" diff --git a/home/user/.local/bin/pchromium b/home/user/.local/bin/pchromium index 118a45d..0d04437 100755 --- a/home/user/.local/bin/pchromium +++ b/home/user/.local/bin/pchromium @@ -2,6 +2,10 @@ temp_dir="$(mktemp -d)" -chromium --proxy-server=socks5://localhost:1080 --user-data-dir="${temp_dir}" --new-window --proxy-bypass-list='10.0.0.0/8,192.168.0.0/16' +chromium \ + "--proxy-server=socks5://${SOCKS5_SERVER:-localhost}" \ + --user-data-dir="${temp_dir}" \ + --new-window \ + --proxy-bypass-list='10.0.0.0/8,192.168.0.0/16' rm -r "${temp_dir}" diff --git a/home/user/.xprofile b/home/user/.xprofile index 2927baf..40494b2 100644 --- a/home/user/.xprofile +++ b/home/user/.xprofile @@ -1 +1 @@ -export PATH="$PATH:$HOME/.local/bin" +export PATH="${PATH}:${HOME}/.local/bin" diff --git a/home/user/.zshenv b/home/user/.zshenv index 3bc8fcc..fc5bdef 100644 --- a/home/user/.zshenv +++ b/home/user/.zshenv @@ -64,3 +64,19 @@ export XDG_PICTURES_DIR="${HOME}/pictures" export XDG_PUBLICSHARE_DIR="${HOME}/public" export XDG_TEMPLATES_DIR="${HOME}/templates" export XDG_VIDEOS_DIR="${HOME}/videos" + + +_sod() { + local -r dir_to_source="${1}" + + if [ -d "${dir_to_source}" ] && [ -n "$(ls "${dir_to_source}")" ]; then + local filename + for filename in $(ls "${dir_to_source}" | sort -n) + do + # shellcheck disable=SC1090 + source "${dir_to_source}/${filename}" + done + fi +} + +_sod "${HOME}/.zshenv.d" diff --git a/home/user/.zshenv.d/.gitkeep b/home/user/.zshenv.d/.gitkeep new file mode 100644 index 0000000..e69de29