diff options
| author | Jesse Luehrs <doy@tozt.net> | 2024-02-27 21:47:56 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2024-02-27 21:47:56 -0500 |
| commit | 0179eebc614a5668048b510cb7a0776354c16dc3 (patch) | |
| tree | 37b6248fe5785d8abb0a00f7f6a778c81e1707aa | |
| parent | a8b20e6efbae662ae6d770417814a431755d1f68 (diff) | |
| download | conf-0179eebc614a5668048b510cb7a0776354c16dc3.tar.gz conf-0179eebc614a5668048b510cb7a0776354c16dc3.zip | |
make it possible to load shell config fragments
| -rw-r--r-- | bash/.bashrc | 10 | ||||
| -rw-r--r-- | sh/.config/sh/rc.d/aliases (renamed from sh/.config/sh/aliases) | 0 | ||||
| -rw-r--r-- | sh/.config/sh/rc.d/env (renamed from sh/.config/sh/env) | 0 | ||||
| -rw-r--r-- | zsh/.zshrc | 10 |
4 files changed, 8 insertions, 12 deletions
diff --git a/bash/.bashrc b/bash/.bashrc index 74ac5cf..0700cf3 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -4,8 +4,6 @@ test -d "$HOME/.cargo/bin" && export PATH="$HOME/.cargo/bin:$PATH" # environment {{{ PATH="${HOME}/.bin/local:${HOME}/.bin/$(hostname):${HOME}/.bin:$PATH" export PATH -# shellcheck source=sh/.config/sh/env -[ -f "$HOME/.config/sh/env" ] && source "$HOME"/.config/sh/env # }}} # Test for an interactive shell. {{{ # There is no need to set anything past this point for scp and rcp, and it's @@ -16,10 +14,10 @@ if [[ $- != *i* ]] ; then fi [ -z "$PS1" ] && return # }}} -# aliases {{{ -# shellcheck source=sh/.config/sh/aliases -[ -f "$HOME/.config/sh/aliases" ] && source "$HOME"/.config/sh/aliases -# }}} +for file in ~/.config/sh/rc.d/*; do + # shellcheck disable=SC1090 + source "$file" +done # completion {{{ #shellcheck disable=SC1091 [ -f /etc/bash_completion ] && source /etc/bash_completion diff --git a/sh/.config/sh/aliases b/sh/.config/sh/rc.d/aliases index c5b716f..c5b716f 100644 --- a/sh/.config/sh/aliases +++ b/sh/.config/sh/rc.d/aliases diff --git a/sh/.config/sh/env b/sh/.config/sh/rc.d/env index a715fdb..a715fdb 100644 --- a/sh/.config/sh/env +++ b/sh/.config/sh/rc.d/env @@ -6,13 +6,11 @@ test -d "$HOME/.cargo/bin" && export PATH="$HOME/.cargo/bin:$PATH" # tends to hard-set $PATH and such PATH="${HOME}/.bin/local:${HOME}/.bin/$(hostname):${HOME}/.bin:$PATH" export PATH -# shellcheck source=sh/.config/sh/env -[ -f "$HOME/.config/sh/env" ] && source "$HOME/.config/sh/env" -# }}} -# aliases {{{ -# shellcheck source=sh/.config/sh/aliases -[ -f "$HOME/.config/sh/aliases" ] && source "$HOME/.config/sh/aliases" # }}} +for file in ~/.config/sh/rc.d/*; do + # shellcheck disable=SC1090 + source "$file" +done # completion {{{ # shellcheck disable=SC2206 fpath=( \ |