diff --git a/.config/bash/bashrc b/.config/bash/bashrc index 3e136fe..6ad1247 100644 --- a/.config/bash/bashrc +++ b/.config/bash/bashrc @@ -68,6 +68,9 @@ export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quo # ~/.bash_aliases, instead of adding them here directly. # See /usr/share/doc/bash-doc/examples in the bash-doc package. +source "${HOME}/.config/aliases" +source "${HOME}/.config/bash/tools/automated-deploy.bashrc" + # enable programmable completion features (you don't need to enable # this, if it's already enabled in /etc/bash.bashrc and /etc/profile # sources /etc/bash.bashrc). diff --git a/.config/bash/hosts/btwscar-wsl-Alpine.bashrc b/.config/bash/hosts/btwscar-wsl-Alpine.bashrc index f1bcffd..e3529da 100644 --- a/.config/bash/hosts/btwscar-wsl-Alpine.bashrc +++ b/.config/bash/hosts/btwscar-wsl-Alpine.bashrc @@ -1,4 +1,7 @@ #!/usr/bin/env bash -alias generate-hash="abuild checksum && abuild -r" +alias rehash-and-build="abuild checksum && abuild -r" export GIT_EDITOR="code-insiders --wait" + +# handled locally via automated-deploy.bashrc +#source "${HOME}/.config/bash/tools/nixpkgs.bashrc" diff --git a/.config/bash/tools/automated-deploy.bashrc b/.config/bash/tools/automated-deploy.bashrc new file mode 100644 index 0000000..c9895dc --- /dev/null +++ b/.config/bash/tools/automated-deploy.bashrc @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +for file in "${HOME}"/.config/bash/tools/*.bashrc; do + if [ "$file" == "${HOME}/.config/bash/tools/automated-deploy.bashrc" ]; then + echo "avoiding source loop, skipping $file" + else + [ $DEBUG != "" ] && echo "sourcing $file" + source "$file" + fi +done diff --git a/.config/bash/tools/nixpkgs.bashrc b/.config/bash/tools/nixpkgs.bashrc new file mode 100644 index 0000000..6e95733 --- /dev/null +++ b/.config/bash/tools/nixpkgs.bashrc @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +if [[ -d "$HOME/.nix-profile/etc/profile.d/nix.sh" ]] && [[ $FF_DISABLE_NIXPKGS != "true" ]]; then + source "${HOME}/.nix-profile/etc/profile.d/nix.sh" +fi \ No newline at end of file diff --git a/.profile b/.profile index c6cff5c..49568d0 100644 --- a/.profile +++ b/.profile @@ -7,7 +7,7 @@ if [ -n "$BASH_VERSION" ]; then fi fi -export PATH="/usr/local/bin${PATH:+:}$PATH" # ~vern specifics and more +export PATH="/usr/local/bin${PATH:+:}$PATH:$HOME/.local/share/JetBrains/Toolbox/scripts:$HOME/.local/bin" # ~vern specifics and more mesg n 2> /dev/null || true # then import the rest @@ -20,9 +20,6 @@ if [ -f "$HOME/.config/localconfig.env" ]; then . "$HOME/.config/localconfig.env" fi -# Added by Toolbox App -export PATH="$PATH:/home/ajhalili2006/.local/share/JetBrains/Toolbox/scripts" - # Import asdf to shell #export ASDF_DIR="$HOME/.asdf" #. "$HOME/.asdf/asdf.sh"