Add sections to configs.

Keeping it around in case a non-blesh option is wanted in the future.

.bash.d/.bash_aliases

@@ -0,0 +1,28 @@
+alias ,git='git config --global user.name "Shaun Reed" && git config --global user.email "shaunrd0@gmail.com"'
+# Some aliases don't make sense in the docker image, like shortcuts to fix plasmashell.
+if [ -f /.dockerenv ]; then
+  alias ,update='apt update -y && apt upgrade -y && apt upgrade --fix-broken --fix-missing --auto-remove'
+  alias ,init='apt update -y && apt install -y $DOT_PACKAGES'
+  alias ,swap='swapoff -a && swapon -a'
+else
+  alias ,update='sudo apt update -y && sudo apt upgrade -y && sudo apt upgrade --fix-broken --fix-missing --auto-remove'
+  alias ,init='sudo apt update -y && sudo apt install -y $DOT_PACKAGES'
+  # Clear kscreen cached settings
+  alias ,kscreen='rm -rf ~/.local/share/kscreen/*'
+  # Restart plasmashell
+  alias ,plasmashell='plasmashell --replace &> /dev/null &'
+  alias ,swap='sudo swapoff -a && sudo swapon -a'
+  alias ,vbox="ps aux www |grep 'VBoxClient --draganddrop' | awk '{print $2}' | xargs kill"
+fi
+
+# Add an "alert" alias for long running commands.  Use like so:
+#   sleep 10; alert
+alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+
+# Don't use tmux in vscode to avoid 'failure to resolve shell' errors.
+if command -v tmux &> /dev/null && [ -n "$PS1" ] && [[ ! "$TERM" =~ screen ]] && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then
+  if ! pstree -s $$ | grep -wq code; then
+    exec tmux >/dev/null 2>&1
+  fi
+fi
+

.bash.d/.bash_exports

@@ -1,39 +1,14 @@
-# Source ble.sh if installed.
-if [ -f ~/.local/share/blesh/ble.sh ]; then
-  source -- ~/.local/share/blesh/ble.sh
-fi
-
-# Source rust things if they exist
-if [ -f ~/.cargo/env ]; then
-  . ~/.cargo/env
-fi
-
-alias ,git='git config --global user.name "Shaun Reed" && git config --global user.email "shaunrd0@gmail.com"'
-# Some aliases don't make sense in the docker image, like shortcuts to fix plasmashell.
+# Used in setup script and dockerfile.
 if [ -f /.dockerenv ]; then
   export DOT_PACKAGES='git stow vim tmux ranger clang wget curl golang-go'
-  alias ,update='apt update -y && apt upgrade -y && apt upgrade --fix-broken --fix-missing --auto-remove'
-  alias ,init='apt update -y && apt install -y $DOT_PACKAGES'
-  alias ,swap='swapoff -a && swapon -a'
 else
+  # `vim-gtk3` is required to keep your system copy and paste buffers in sync with vim registers.
   export DOT_PACKAGES='git stow vim vim-gtk3 xsel xclip tmux ranger clang yakuake wget curl golang-go gawk'
-  alias ,update='sudo apt update -y && sudo apt upgrade -y && sudo apt upgrade --fix-broken --fix-missing --auto-remove'
-  alias ,init='sudo apt update -y && sudo apt install -y $DOT_PACKAGES'
-  # Clear kscreen cached settings
-  alias ,kscreen='rm -rf ~/.local/share/kscreen/*'
-  # Restart plasmashell
-  alias ,plasmashell='plasmashell --replace &> /dev/null &'
-  alias ,swap='sudo swapoff -a && sudo swapon -a'
-  alias ,vbox="ps aux www |grep 'VBoxClient --draganddrop' | awk '{print $2}' | xargs kill"
-  alias ,assistant="nohup $HOME/Qt/6.9.0/gcc_64/bin/assistant > /dev/null 2>&1 &"
 fi
 
 # colored GCC warnings and errors
 #export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
 
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
 export EDITOR="vim"
 export VISUAL="vim"
 export LS_COLORS="di=1;34:ln=31;47:so=32:pi=33:ex=1;32:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43"
@@ -43,17 +18,6 @@ export DOTNET_ROOT=$HOME/.dotnet
 # Example path for autocompletion using libclang-9-dev package, obtained by the following command
 export LIBCLANG="$(command -v clang &>/dev/null && ldconfig -p | sort | grep libclang-[0-9]. | awk -F "> " '{print$2}' | tail -n 1)"
 
-# Source a top-secret alias file
-if [ -e ~/.bash_secrets ]; then
-  . ~/.bash_secrets
-fi
-
-if command -v tmux &> /dev/null && [ -n "$PS1" ] && [[ ! "$TERM" =~ screen ]] && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then
-  if ! pstree -s $$ | grep -wq code; then
-    exec tmux >/dev/null 2>&1
-  fi
-fi
-
 # Set the default terminal to use konsole, with kapper profile
 # + Execute tmux on start
 if [ -e ~/.local/share/konsole/kapper.profile ]; then
@@ -98,15 +62,6 @@ export LESS='--mouse --wheel-lines 2'
 # + -#2 to shift 2 columns horizontally when right / left arrow is pressed
 export LESS="$LESS -R -w -#2"
 
-
-if ! [ command -v conda &>/dev/null ] && [ -e ~/Code/Clones/mambaforge/bin/conda ] && ! grep -e conda ~/.bashrc &>/dev/null; then
-  if ! (~/Code/Clones/mambaforge/bin/conda init | awk -F "==>" '{print $1}'); then
-    echo "[dot] ERROR: Failed to initialize Conda."
-  fi
-  echo "[dot] WARN: Ran \`conda init\`; Conda was installed but not initialized"
-  source ~/.bashrc
-fi
-
 # For shared systems where history is not desired.
 # ln -sf /dev/null ~/.bash_history
 # HISTFILE=/dev/null

.bash.d/.bash_functions

@@ -0,0 +1,8 @@
+# $1: Version; defaults to 6.7.3
+# $2: Path to Qt; defaults to $HOME/Qt
+function assistant {
+  local version=${1:-6\.7\.3}
+  local path=${2:-$HOME/Qt}
+  nohup ${path%/}/$version/gcc_64/bin/assistant > /dev/null 2>&1 &
+}
+

.bash.d/.bash_sources

@@ -0,0 +1,15 @@
+# Source ble.sh if installed.
+if [ -f ~/.local/share/blesh/ble.sh ]; then
+  source -- ~/.local/share/blesh/ble.sh
+fi
+
+# Source rust things if they exist
+if [ -f ~/.cargo/env ]; then
+  . ~/.cargo/env
+fi
+
+# Source a top-secret alias file
+if [ -f ~/.bash.d/.bash_secrets ]; then
+  . ~/.bash.d/.bash_secrets
+fi
+

.bashrc

@@ -100,11 +100,20 @@ alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo
 # You may want to put all your additions into a separate file like
 # ~/.bash_aliases, instead of adding them here directly.
 # See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
 if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases
 fi
 
+# Source all files in ~/.bash.d, if it exists.
+# This can contain .bash_aliases, or other configs to append to your shell.
+if [ -d ~/.bash.d ]; then
+  for f in ~/.bash.d/.*; do
+    if [ -f $f ]; then
+      . $f
+    fi
+  done
+fi
+
 # 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).

.gitignore

@@ -1,4 +1,4 @@
-.bash_secrets
+**/.bash_secrets
 .vim/.netrwhist
 .idea/
 .config/Code/Backups/*
@@ -14,6 +14,8 @@
 .config/Code/Network*
 **/.config/.brightness
 .local/share/fonts/.uuid
+.local/share/blesh
+.local/share/doc
 
 # Byte-compiled / optimized / DLL files
 *__pycache__/

.inputrc

@@ -1,2 +1,4 @@
-"\e[A": history-search-backward
-"\e[B": history-search-forward
+# This will automatically trigger reverse search when using up / down in bash
+# However it doesn't feel natural with ble.sh, so it's commented out for now.
+#"\e[A": history-search-backward
+#"\e[B": history-search-forward

README.md

@@ -1,15 +1,19 @@
 ## Dotfiles
 
-Dotfiles configurations for headless Kubuntu linux environments. Be sure to clone recursively if you want to grab updated plugins / submodules included. For example, using Pathogen with Vim to manage plugins requires that the plugin to be installed are cloned to the `~/.vim/bundle/` directory. Cloning recursively allows git to clone these same nested repositories/submodules within this directory so Pathogen can handle running the Vim plugins.
+Dotfiles configurations for headless Kubuntu linux environments. Be sure to
+clone recursively if you want to grab updated plugins / submodules included. For
+example, using Pathogen with Vim to manage plugins requires that the plugin to
+be installed are cloned to the `~/.vim/bundle/` directory. Cloning recursively
+allows git to clone these same nested repositories/submodules within this
+directory so Pathogen can handle running the Vim plugins.
 
-Once installed, editing source code in vim supports features displayed in the screenshot below
+Once installed, editing source code in vim supports features displayed in the
+screenshot below
 
 ![Vim screenshot](VimScreenshot.png)
 
 ### Install
 
-If you don't install `vim-gtk3`, vim will not have access to your system clipboard, and your copy and paste buffers will not stay in sync.
-
 Installation instructions -
 
 ```bash
@@ -20,20 +24,6 @@ mv ~/.bashrc ~/.bashrc.backup
 stow . -t ~
 ```
 
-If you forget to clone recursively
-```bash
-git submodule update --init
-Submodule path '.vim/bundle/Colorizer': checked out '53ada285f0acc171acda4280b6144e468dded89f'
-Submodule path '.vim/bundle/ale': checked out '7265ceb6d050d1a4642741d248f11e4f2abd37e1'
-Submodule path '.vim/bundle/clang_complete': checked out '0b98d7533ad967aac3fc4c1a5b0508dafa8a676f'
-Submodule path '.vim/bundle/supertab': checked out '40fe711e088e2ab346738233dd5adbb1be355172'
-Submodule path '.vim/bundle/unicode.vim': checked out '29f43f7b1be94dccfac461f4da0a34410408111f'
-Submodule path '.vim/bundle/vim-airline': checked out '6d665580a3435f21ad560af192d854d4b608fff5'
-Submodule path '.vim/bundle/vim-airline-themes': checked out '0d5c5c1e2995126e76606a628316c8e3f5efb37a'
-Submodule path '.vim/bundle/vim-signify': checked out '16eee41d2b267523b84bd4ac111627588bfd1a47'
-```
-
-
 ### Docker
 
 You can run these dotfiles in a docker container -
@@ -45,33 +35,38 @@ docker build -t dot .
 docker run -it dot bash
 ```
 
-This container has the following packages installed and uses `ubuntu:latest` as a base.
+### Configurations
 
-```
-git stow vim tmux ranger clang wget curl golang-go
-```
+#### Vim
 
+| Plugin              | Description                                                              | Repository                                                                                       |
+|---------------------|--------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------|
+| tmux plugin manager | Manages tmux plugins directly from GitHub.                               | [https://github.com/tmux-plugins/tpm](https://github.com/tmux-plugins/tpm)                       |
+| tmux-sensible       | Provides improved sane defaults for tmux behavior and usability.         | [https://github.com/tmux-plugins/tmux-sensible](https://github.com/tmux-plugins/tmux-sensible)   |
+| tmux-resurrect      | Saves and restores tmux sessions, panes, and layouts between restarts.   | [https://github.com/tmux-plugins/tmux-resurrect](https://github.com/tmux-plugins/tmux-resurrect) |
+| tmux-continuum      | Automatically saves tmux sessions and can restore them on system reboot. | [https://github.com/tmux-plugins/tmux-continuum](https://github.com/tmux-plugins/tmux-continuum) |
+| xclip               | Integrates tmux copy mode with the system clipboard under X11.           | [https://github.com/astrand/xclip](https://github.com/astrand/xclip)                             |
 
-### Install Clang Completion
+#### Tmux
 
-**These configurations require the installation of clang for clang completion**
+| Plugin             | Description                                                        | Repository                                                                                             |
+|--------------------|--------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------|
+| Colorizer          | Highlights color codes in Vim buffers (useful for CSS/ web).       | [https://github.com/chrisbra/Colorizer](https://github.com/chrisbra/Colorizer)                         |
+| ALE                | Asynchronous Lint Engine – linting & fixing in Vim asynchronously. | [https://github.com/dense-analysis/ale](https://github.com/dense-analysis/ale)                         |
+| clang_complete     | Auto-completion support for C/C++ using libclang.                  | [https://github.com/xavierd/clang_complete](https://github.com/xavierd/clang_complete)                 |
+| supertab           | Expand completions using `<Tab>` in insert mode.                   | [https://github.com/ervandew/supertab](https://github.com/ervandew/supertab)                           |
+| unicode.vim        | Unicode helpers (insert and inspect Unicode characters).           | [https://github.com/chrisbra/unicode.vim](https://github.com/chrisbra/unicode.vim)                     |
+| vim-airline        | Lean and fast status/tabline for Vim.                              | [https://github.com/vim-airline/vim-airline](https://github.com/vim-airline/vim-airline)               |
+| vim-airline-themes | Additional themes for vim-airline.                                 | [https://github.com/vim-airline/vim-airline-themes](https://github.com/vim-airline/vim-airline-themes) |
+| vim-signify        | Shows VCS (git/hg) changes in the sign column.                     | [https://github.com/mhinz/vim-signify](https://github.com/mhinz/vim-signify)                           |
 
-If you don't want clang completion, just remove the plugin directory from `~/.vim/bundle/`.
+#### Utilities
 
-If you don't remove clang completion and skip the following steps, vim will show errors when opening source code files. This is because these configurations use clang completion for source code auto completion and drop-down menus within vim.
-
-```bash
-sudo apt install clang
-source ~/.bashrc
-```
-
-
-### Gitmux
-
-To enable the gitmux status bar in tmux sessions
-
-```bash
-sudo apt install golang-go
-go install github.com/arl/gitmux@latest
-```
+| Tool / File          | Description                                                                                                        | Official Repository                                                                                      |
+|----------------------|--------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------|
+| ranger               | Console-based file manager with Vim-like keybindings, previews, and customizable commands.                         | [https://github.com/ranger/ranger](https://github.com/ranger/ranger)                                     |
+| ble.sh               | Advanced Bash line editor providing syntax highlighting, autosuggestions, and improved interactive shell behavior. | [https://github.com/akinomyoga/ble.sh](https://github.com/akinomyoga/ble.sh)                             |
+| GNU Stow             | Manages dotfiles using symlinks. Repository structure is organized for per-package Stow deployment.                | [https://www.gnu.org/software/stow/](https://www.gnu.org/software/stow/)                                 |
+| `.stow-local-ignore` | Stow configuration file that excludes specific files or patterns from being symlinked during deployment.           | [https://www.gnu.org/software/stow/manual/stow.html](https://www.gnu.org/software/stow/manual/stow.html) |
+| `setup.sh`           | Bootstrap script that automates symlink setup and environment initialization.                                      | (Repository-local script)                                                                                |
 

setup.sh

@@ -3,26 +3,28 @@ set -Eeuo pipefail
 
 # $1: Error message
 # $2: Error code
+# $3: Error line
 function fatal() {
   local msg=${1:-"Unspecified error"}
-  echo "[Error:$LINENO] Could not install dotfiles: $msg"
+  local line=${3:-9}
+  echo "[Error:$line] Could not install dotfiles: $msg"
   exit ${2:-1}
 }
-trap 'fatal "Trapped an unknown error" $?' ERR
+trap 'fatal "Trapped an unknown error" $? $LINENO' ERR
 
 if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
-  fatal "Run setup.sh from the root directory of the dotfiles repository." 2
+  fatal "Run setup.sh from the root directory of the dotfiles repository." 2 $LINENO
 fi
 git submodule update --init --recursive
 
 # Use alias for installing packages so we don't maintain several dependency lists.
-if ! [[ -f .bash_aliases ]]; then
-  fatal "Failed to locate .bash_aliases in path: $(pwd)" 3
+if ! [[ -f .bash.d/.bash_exports ]]; then
+  fatal "Failed to locate .bash.d/.bash_exports in path: $(pwd)" 3 $LINENO
 fi
-. .bash_aliases
+. .bash.d/.bash_exports
 
 if [[ -z ${DOT_PACKAGES:-} ]]; then
-	fatal "DOT_PACKAGES variable not found after sourcing $(pwd)/.bash_aliases" 4
+	fatal "DOT_PACKAGES variable not found after sourcing $(pwd)/.bash.d/.bash_aliases" 4 $LINENO
 fi
 sudo apt update -y && sudo apt install -y $DOT_PACKAGES
 go install github.com/arl/gitmux@latest