Enhance Bash default configuration robustness

defaults/bash/aliases

@@ -1,11 +1,26 @@
 # File system
-alias ls='eza -lh --group-directories-first --icons=auto'
-alias lsa='ls -a'
-alias lt='eza --tree --level=2 --long --icons --git'
-alias lta='lt -a'
+if command -v eza &> /dev/null; then
+  alias ls='eza -lh --group-directories-first --icons=auto'
+  alias lsa='ls -a'
+  alias lt='eza --tree --level=2 --long --icons --git'
+  alias lta='lt -a'
+fi
+
 alias ff="fzf --preview 'batcat --style=numbers --color=always {}'"
 alias fd='fdfind'
-alias cd='z'
+
+if command -v zoxide &> /dev/null; then
+  alias cd="zd"
+  zd() {
+    if [ $# -eq 0 ]; then
+      builtin cd ~ && return
+    elif [ -d "$1" ]; then
+      builtin cd "$1"
+    else
+      z "$@" && printf "\U000F17A9 " && pwd || echo "Error: Directory not found"
+    fi
+  }
+fi
 
 # Directories
 alias ..='cd ..'
@@ -14,14 +29,14 @@ alias ....='cd ../../..'
 
 # Tools
 n() { if [ "$#" -eq 0 ]; then nvim .; else nvim "$@"; fi; }
-alias g='git'
 alias d='docker'
 alias r='rails'
 alias bat='batcat'
 alias lzg='lazygit'
 alias lzd='lazydocker'
 
 # Git
+alias g='git'
 alias gcm='git commit -m'
 alias gcam='git commit -a -m'
 alias gcad='git commit -a --amend'

configs/bashrc → defaults/bash/envs

@@ -1,5 +1,4 @@
-source ~/.local/share/omakub/defaults/bash/rc
-
 # Editor used by CLI
 export EDITOR="nvim"
 export SUDO_EDITOR="$EDITOR"
+export BAT_THEME=ansi

defaults/bash/rc

@@ -3,3 +3,5 @@ source ~/.local/share/omakub/defaults/bash/aliases
 source ~/.local/share/omakub/defaults/bash/functions
 source ~/.local/share/omakub/defaults/bash/prompt
 source ~/.local/share/omakub/defaults/bash/init
+source ~/.local/share/omakub/defaults/bash/envs
+[[ $- == *i* ]] && bind -f ~/.local/share/omakub/defaults/bash/inputrc

defaults/bashrc

@@ -0,0 +1,14 @@
+# All the default Omakub aliases and functions
+# (don't mess with these directly, just overwrite them here!)
+source ~/.local/share/omakub/defaults/bash/rc
+
+# Add your own exports, aliases, and functions here.
+#
+# Make an alias for invoking commands you use constantly
+# alias p='python'
+#
+# Use VSCode instead of neovim as your default editor
+# export EDITOR="code"
+#
+# Set a custom prompt with the directory revealed
+# PS1="\W \[\e]0;\w\a\]$PS1"

defaults/xcompose

@@ -26,4 +26,4 @@ include "%L"
 <Multi_key> <m> <b> : "🤯" # blowing
 
 # Typography
-<Multi_key> <space> <space> : "—"
+<Multi_key> <space> <space> : "—"

install/terminal/a-shell.sh

@@ -1,12 +1,7 @@
 #!/bin/bash
 
 # Configure the bash shell using Omakub defaults
-[ -f ~/.bashrc ] && mv ~/.bashrc ~/.bashrc.bak
-cp ~/.local/share/omakub/configs/bashrc ~/.bashrc
+cp ~/.local/share/omakub/defaults/bashrc ~/.bashrc
 
 # Load the PATH for use later in the installers
-source ~/.local/share/omakub/defaults/bash/shell
-
-[ -f ~/.inputrc ] && mv ~/.inputrc ~/.inputrc.bak
-# Configure the inputrc using Omakub defaults
-cp ~/.local/share/omakub/configs/inputrc ~/.inputrc
+source ~/.local/share/omakub/defaults/bash/shell

migrations/1762596558.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+echo "Move .bashrc to use Omakub defaults"
+
+mv ~/.bashrc ~/.bashrc.bak
+mv ~/.inputrc ~/.inputrc.bak
+cp ~/.local/share/omakub/defaults/bashrc ~/.bashrc