settings.d/autosave-history.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-[[ "${CONFIG_AUTOSAVE_HISTORY}" == "1" ]] && export "PROMPT_COMMAND=history -a"

settings.d/better-completion.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-if [ "${CONFIG_BETTER_COMPLETION}" == "1" ]; then
- bind 'set show-all-if-ambiguous on'
- bind 'TAB:menu-complete'
-fi

settings.d/custom-prompt.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ "${CONFIG_CUSTOM_PROMPT}" == "1" ]]; then
- export "PS1=\[\033[38;5;33m\][\[$(tput sgr0)\]\[\033[38;5;38m\]\u\[$(tput sgr0)\]\[\033[38;5;33m\]@\[$(tput sgr0)\]\[\033[38;5;38m\]\H\[$(tput sgr0)\]\[\033[38;5;33m\]:\[$(tput sgr0)\]\[\033[38;5;38m\]\W\[$(tput sgr0)\] \[$(tput sgr0)\]\[\033[38;5;214m\]\$?\[$(tput sgr0)\]\[\033[38;5;33m\]]\\$\[$(tput sgr0)\] "
- export "PS2=\[\033[38;5;196m\][incomplete]: \033[0;10m"
- export "PS4=\${0}:\${LINENO}+ "
-fi

settings.d/editor.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-export "EDITOR=${CONFIG_EDITOR}"

settings.d/flow-control.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-[[ "${CONFIG_FLOW_CONTROl}" == "0" ]] && stty -ixon
-[[ "${CONFIG_FLOW_CONTROL}" == "1" ]] && stty ixon

settings.d/replacement-pkgmgr.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -n "${CONFIG_REPLACE_PKGMGR_ORIGINAL}" ] && [ -n "${CONFIG_REPLACE_PKGMGR_REPLACEMENT}" ]; then
- # shellcheck disable=SC2139
- alias "${CONFIG_REPLACE_PKGMGR_ORIGINAL}=${CONFIG_REPLACE_PKGMGR_REPLACEMENT}"
-fi

startup.sh

@@ -32,20 +32,17 @@ cd "${BASHRCD_HOMEDIR}" || (
 [[ -f "init.d/aliases.sh" ]] && source "init.d/aliases.sh"
 [[ -f "init.d/functions.sh" ]] && source "init.d/functions.sh"
 
-# Create default configuration file
+# Create new configuration file
 if [ ! -f "config.sh" ]; then
 	if [ -n "${BASHRCD_SYSTEM}" ] && [ "${UID}" != "0" ]; then
 		echo ":: Warning: Can't create system-wide configuration file as normal user."
 	else	
 		$(which cat) << EOF >> config.sh
 #!/usr/bin/env bash
-# Example configuration
-
+CONFIG_FLOW_CONTROL=0
 CONFIG_AUTOSAVE_HISTORY=1
-CONFIG_BETTER_COMPLETION=1
 CONFIG_CUSTOM_PROMPT=1
 CONFIG_EDITOR=nano
-CONFIG_FLOW_CONTROL=0
 CONFIG_REPLACE_PKGMGR_ORIGINAL=pacman
 CONFIG_REPLACE_PKGMGR_REPLACEMENT=paru
 EOF
@@ -55,11 +52,30 @@ fi
 # Load configuration file
 [[ -f "config.sh" ]] && source "config.sh"
 
-# Run settings scripts
-for file in settings.d/*; do
- # shellcheck disable=SC1090
- source "${file}"
-done
+# Process configuration changes
+# -> Flow control
+[[ "${CONFIG_FLOW_CONTROl}" == "0" ]] && stty -ixon
+[[ "${CONFIG_FLOW_CONTROL}" == "1" ]] && stty ixon
+
+# -> Autosave history
+[[ "${CONFIG_AUTOSAVE_HISTORY}" == "1" ]] && export "PROMPT_COMMAND=history -a"
+
+# -> Custom prompt
+if [[ "${CONFIG_CUSTOM_PROMPT}" == "1" ]]; then
+ export "PS1=\[\033[38;5;33m\][\[$(tput sgr0)\]\[\033[38;5;38m\]\u\[$(tput sgr0)\]\[\033[38;5;33m\]@\[$(tput sgr0)\]\[\033[38;5;38m\]\H\[$(tput sgr0)\]\[\033[38;5;33m\]:\[$(tput sgr0)\]\[\033[38;5;38m\]\W\[$(tput sgr0)\] \[$(tput sgr0)\]\[\033[38;5;214m\]\$?\[$(tput sgr0)\]\[\033[38;5;33m\]]\\$\[$(tput sgr0)\] "
+ export "PS2=\[\033[38;5;196m\][incomplete]: \033[0;10m"
+ export "PS4=\${0}:\${LINENO}+ "
+fi
+
+# -> Editor
+export "EDITOR=${CONFIG_EDITOR}"
+
+# -> Package manager replacement
+if [ -n "${CONFIG_REPLACE_PKGMGR_ORIGINAL}" ] && [ -n "${CONFIG_REPLACE_PKGMGR_REPLACEMENT}" ]; then
+ # shellcheck disable=SC2139
+ alias "${CONFIG_REPLACE_PKGMGR_ORIGINAL}=${CONFIG_REPLACE_PKGMGR_REPLACEMENT}"
+fi
+
 
 # Initialize shell programs
 for file in programs.d/*; do