From 74357e75d7e2817a0544099fd6833069484c2fd9 Mon Sep 17 00:00:00 2001 From: pika Date: Thu, 22 May 2025 10:35:57 +0200 Subject: [PATCH] wip --- .bash/.plugins.sh | 26 -------------------------- .bashrc | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 .bash/.plugins.sh diff --git a/.bash/.plugins.sh b/.bash/.plugins.sh deleted file mode 100644 index fe0ea0d..0000000 --- a/.bash/.plugins.sh +++ /dev/null @@ -1,26 +0,0 @@ -_plugins() { - local bash_dir="$HOME/.bash/plugins" - if [ -d "$bash_dir" ]; then - echo_info "Plugins will be loadet.." - - # ─< plugins to configure (usually just the filename in the plugins list) >─────────────── - local plugAutopairs="autopairs.sh" - local sshCompletion="ssh" - - # ─< active plugins >───────────────────────────────────────────────────────────────────── - plugins=( - "$plugAutopairs" - "$sshCompletion" - ) - - # ─< loop through and source the plugins >──────────────────────────────────────────────── - for plugin in "${plugins[@]}"; do - if [ -f "${bash_dir}/${plugin}" ]; then - echo_plugin "${bash_dir}/${plugin}" - . "${bash_dir}/${plugin}" - fi - done - fi -} - -_plugins diff --git a/.bashrc b/.bashrc index b74f63e..195f92c 100644 --- a/.bashrc +++ b/.bashrc @@ -86,6 +86,12 @@ check_root() { fi } +_source() { + [[ -e "$1" ]] && + . "$1" && + echo "Sourced $1" +} + _sources() { local sourceDir="$HOME/.bash" local sourceOptions=( @@ -282,12 +288,16 @@ main() { # _sources # _blesh _init - [[ -e "$HOME/.bash_aliases" ]] && - . "$HOME/.bash_aliases" + _color_prompt_ _env check_root _end + + _source "$HOME/.bash_aliases" + _source "$HOME/.bash/plugins/autopairs.sh" + _source "$HOME/.fzf/shell/completion.bash" + _source "$HOME/.fzf/shell/key-bindings.bash" } main