feat: replace fish by bash

Author: Adrien Folie

Makefile

@@ -1,6 +1,6 @@
-.PHONY: all re clean test fish git vim vifm tmux vscode
+.PHONY: all re clean test bash git vim vifm tmux vscode
 
-all: git vim tmux fish vifm vscode
+all: git vim tmux bash vifm vscode
 
 re: clean all
 
@@ -10,8 +10,8 @@ clean:
 test:
 	scripts/test.exp
 
-fish:
-	fish/install.sh
+bash:
+	bash/install.sh
 
 git:
 	git/install.sh

bash/bashrc

@@ -8,96 +8,13 @@ export TERM=xterm-256color
 export LC_ALL=en_US.UTF-8
 export PAGER=most
 
-# Prompt configuration
-# Colors
-RESET="\[\033[0m\]"
-RED="\[\033[0;31m\]"
-YELLOW="\[\033[0;33m\]"
-BLUE="\[\033[0;34m\]"
-WHITE="\[\033[0;37m\]"
-GREEN="\[\033[0;32m\]"
-PURPLE="\[\033[0;35m\]"
-
-# Git prompt symbols
-GIT_PROMPT_PREFIX="["
-GIT_PROMPT_SUFFIX="]"
-GIT_PROMPT_SEPARATOR="|"
-GIT_PROMPT_STAGED="$RED● "
-GIT_PROMPT_CONFLICTS="$RED✖ "
-GIT_PROMPT_CHANGED="$BLUE✚ "
-GIT_PROMPT_UNTRACKED="…"
-GIT_PROMPT_STASHED="⚑ "
-GIT_PROMPT_CLEAN="$GREEN✔"
-
-# Git status function
-git_status() {
-    local branch staged conflicts changed untracked stashed clean
-    
-    # Get current branch
-    branch=$(git symbolic-ref HEAD 2>/dev/null)
-    if [[ -n "$branch" ]]; then
-        branch=${branch##*/}
-        
-        # Count staged files
-        staged=$(git diff --staged --numstat | wc -l)
-        # Count conflicts
-        conflicts=$(git diff --name-only --diff-filter=U | wc -l)
-        # Count changed files
-        changed=$(git diff --numstat | wc -l)
-        # Count untracked files
-        untracked=$(git ls-files --others --exclude-standard | wc -l)
-        # Check if stash exists
-        if [[ -n $(git stash list) ]]; then
-            stashed=1
-        else
-            stashed=0
-        fi
-        # Check if clean
-        if [[ $staged -eq 0 && $conflicts -eq 0 && $changed -eq 0 && $untracked -eq 0 ]]; then
-            clean=1
-        else
-            clean=0
-        fi
-        
-        # Build status string
-        local status="$GIT_PROMPT_PREFIX$PURPLE$branch$RESET$GIT_PROMPT_SEPARATOR"
-        
-        [[ $staged -gt 0 ]] && status+="$GIT_PROMPT_STAGED"
-        [[ $conflicts -gt 0 ]] && status+="$GIT_PROMPT_CONFLICTS"
-        [[ $changed -gt 0 ]] && status+="$GIT_PROMPT_CHANGED"
-        [[ $untracked -gt 0 ]] && status+="$GIT_PROMPT_UNTRACKED"
-        [[ $stashed -gt 0 ]] && status+="$GIT_PROMPT_STASHED"
-        [[ $clean -eq 1 ]] && status+="$GIT_PROMPT_CLEAN"
-        
-        echo -n "$status$RESET$GIT_PROMPT_SUFFIX"
-    fi
-}
-
-# Set prompt command
-PROMPT_COMMAND=__prompt_command
-
-__prompt_command() {
-    local EXIT="$?"
-    local PATH_SHORT="${PWD/#$HOME/\~}"
-    local TIME="\$(date +%R)"
-    
-    PS1="$YELLOW$PATH_SHORT$RESET"
-    
-    # Add git status if in a git repository
-    if git rev-parse --git-dir > /dev/null 2>&1; then
-        PS1+=" \$(git_status)"
-    fi
-    
-    PS1+="\n$WHITE$TIME$RESET \$ "
-}
-
-# rbenv setup
+# Ruby
 if command -v rbenv >/dev/null 2>&1; then
     export PATH="$HOME/.rbenv/bin:$PATH"
     eval "$(rbenv init -)"
 fi
 
-# nvm setup
+# Node
 export NVM_DIR="$HOME/.nvm"
 export NVM_DEFAULT_VERSION=20
 
@@ -107,36 +24,32 @@ if [ -d "$NVM_DIR" ]; then
     command -v nvm >/dev/null 2>&1 && nvm use "$NVM_DEFAULT_VERSION" >/dev/null 2>&1
 fi
 
-# golang configuration
+# Golang
 if command -v go >/dev/null 2>&1; then
     export GOPATH="$HOME/dev/go"
 fi
 
-# brew configuration
+# Brew
 if command -v brew >/dev/null 2>&1; then
     alias python=/opt/homebrew/bin/python3
 fi
 
-# PATH modifications
+# Rust
 if [ -d "$HOME/.cargo/bin" ]; then
     export PATH="$HOME/.cargo/bin:$PATH"
 fi
 
-# Vi mode
 set -o vi
 
 # Aliases
 alias ll='ls -lF'
 alias la='ls -lA'
 alias git='hub'
 
-# Load all configurations from conf.d
-if [ -d "$HOME/.config/bash/conf.d" ]; then
-    for file in "$HOME/.config/bash/conf.d"/*.sh; do
-        [ -r "$file" ] && source "$file"
-    done
+# Prompt setup
+if [ -f "$HOME/.config/bash/prompt.bash" ]; then
+    source "$HOME/.config/bash/prompt.bash"
 fi
 
 # Load local customizations if they exist
-[ -f "$HOME/.bashrc.local" ] && source "$HOME/.bashrc.local"
-
+[ -f "$HOME/.bashrc.local" ] && source "$HOME/.bashrc.local"

bash/conf.d/tools.sh

@@ -1,22 +1,8 @@
-#!/bin/bash
-
+#!/bin/sh
 set -e
 
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-CONFIG_DIR="$HOME/.config/bash"
-
-# Create necessary directories
-mkdir -p "$CONFIG_DIR/conf.d"
-
-# Create symlinks
-ln -sf "$SCRIPT_DIR/bashrc" "$HOME/.bashrc"
-ln -sf "$SCRIPT_DIR/bash_profile" "$HOME/.bash_profile"
-ln -sf "$SCRIPT_DIR/conf.d" "$CONFIG_DIR/"
-
-# Install dependencies if they don't exist
-command -v hub >/dev/null 2>&1 || echo "Warning: 'hub' is not installed. Install it for git alias functionality."
-command -v rbenv >/dev/null 2>&1 || echo "Warning: 'rbenv' is not installed. Install it for Ruby version management."
-
-echo "Bash configuration installed successfully!"
-echo "Please restart your shell or run 'source ~/.bashrc' to apply changes."
+mkdir -p "$HOME/.config/bash"
 
+ln -sf "$PWD/bash/bashrc" "$HOME/.bashrc"
+ln -sf "$PWD/bash/bash_profile" "$HOME/.bash_profile"
+ln -sf "$PWD/bash/prompt.bash" "$HOME/.config/bash/prompt.bash"

bash/install.sh

@@ -0,0 +1,45 @@
+# Color codes
+YELLOW='\[\e[0;33m\]'
+BLUE='\[\e[0;34m\]'
+MAGENTA='\[\e[1;35m\]'
+RED='\[\e[0;31m\]'
+GREEN='\[\e[1;32m\]'
+WHITE='\[\e[1;37m\]'
+RESET='\[\e[0m\]'
+
+# Git status function (simplified for Bash)
+bash_git_prompt() {
+    git rev-parse --is-inside-work-tree &>/dev/null || return
+
+    local branch
+    branch=$(git symbolic-ref --quiet --short HEAD 2>/dev/null || git rev-parse --short HEAD 2>/dev/null)
+    [ -z "$branch" ] && return
+
+    local staged conflicts changed untracked stashed clean
+    staged=$(git diff --cached --numstat 2>/dev/null | wc -l)
+    conflicts=$(git diff --name-only --diff-filter=U 2>/dev/null | wc -l)
+    changed=$(git diff --numstat 2>/dev/null | wc -l)
+    untracked=$(git ls-files --others --exclude-standard 2>/dev/null | wc -l)
+    stashed=$(git stash list 2>/dev/null | wc -l)
+    clean=0
+    if [[ $staged -eq 0 && $conflicts -eq 0 && $changed -eq 0 && $untracked -eq 0 ]]; then
+        clean=1
+    fi
+
+    # Use raw ANSI codes, not Bash variables, for color in the status string
+    local status
+    status="[\033[1;35m${branch}\033[0m"
+
+    [[ $staged -ne 0 ]]    && status+="|\033[0;31m● $staged\033[0m"
+    [[ $conflicts -ne 0 ]] && status+="|\033[0;31m✖ $conflicts\033[0m"
+    [[ $changed -ne 0 ]]   && status+="|\033[0;34m✚ $changed\033[0m"
+    [[ $untracked -ne 0 ]] && status+="|\033[0;33m…$untracked\033[0m"
+    [[ $stashed -ne 0 ]]   && status+="|\033[0;33m⚑ $stashed\033[0m"
+    [[ $clean -eq 1 ]]     && status+="|\033[1;32m✔\033[0m"
+
+    status+="]"
+    echo -ne " $status"
+}
+
+# Set PS1 to mimic your Fish prompt (use double quotes for variable expansion)
+PS1="${YELLOW}\w${RESET}\$(bash_git_prompt) \n${WHITE}\A${RESET}  \$ "

bash/prompt.bash

@@ -10,7 +10,7 @@ end
 
 # rbenv
 if type rbenv >/dev/null 2>&1
-    source (rbenv init - | psub)
+    status --is-interactive; and source (rbenv init -|psub)
 end
 
 # golang