From 1f8448008dc39e35b0700467e88d59f51f8a6a58 Mon Sep 17 00:00:00 2001 From: Dominic Date: Tue, 29 Jul 2025 11:10:11 -0400 Subject: [PATCH] updating bash --- .bashrc | 85 +++++++++++++++++++++++++-------------------------------- 1 file changed, 37 insertions(+), 48 deletions(-) diff --git a/.bashrc b/.bashrc index 36afc23..1a7870a 100644 --- a/.bashrc +++ b/.bashrc @@ -1,55 +1,26 @@ -# Enable the subsequent settings only in interactive sessions -case $- in - *i*) ;; - *) return;; -esac -# Path to your oh-my-bash installation. -export OSH='/home/dominic/.oh-my-bash' +# ----- START THEME ----- +RESTORE='\033[0m' +PURPLE='\033[00;35m' +LRED='\033[01;31m' +LGREEN='\033[01;32m' +LBLUE='\033[01;34m' +LCYAN='\033[01;36m' -# Set name of the theme to load. Optionally, if you set this to "random" -# it'll load a random theme each time that oh-my-bash is loaded. -OSH_THEME="zork" +virtual_env() { + if [ -n "$VIRTUAL_ENV" ]; then + echo "(${VIRTUAL_ENV##*/})" + fi + echo "" +} -# To disable the uses of "sudo" by oh-my-bash, please set "false" to -# this variable. The default behavior for the empty value is "true". -OMB_USE_SUDO=true +parse_git_branch() { + git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' +} -# Which completions would you like to load? (completions can be found in ~/.oh-my-bash/completions/*) -# Custom completions may be added to ~/.oh-my-bash/custom/completions/ -# Example format: completions=(ssh git bundler gem pip pip3) -# Add wisely, as too many completions slow down shell startup. -completions=( - git - composer - ssh -) - -# Which aliases would you like to load? (aliases can be found in ~/.oh-my-bash/aliases/*) -# Custom aliases may be added to ~/.oh-my-bash/custom/aliases/ -# Example format: aliases=(vagrant composer git-avh) -# Add wisely, as too many aliases slow down shell startup. -aliases=( - general -) - -# Which plugins would you like to load? (plugins can be found in ~/.oh-my-bash/plugins/*) -# Custom plugins may be added to ~/.oh-my-bash/custom/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. -plugins=( - git - bashmarks -) - -# Which plugins would you like to conditionally load? (plugins can be found in ~/.oh-my-bash/plugins/*) -# Custom plugins may be added to ~/.oh-my-bash/custom/plugins/ -# Example format: -# if [ "$DISPLAY" ] || [ "$SSH" ]; then -# plugins+=(tmux-autoattach) -# fi - -source "$OSH"/oh-my-bash.sh +export VIRTUAL_ENV_DISABLE_PROMPT=1 +export PS1="${TITLEBAR}┌─${LRED}\$(virtual_env)${RESTORE}[${LCYAN}\u${RESTORE}@${LBLUE}\h${RESTORE}][\w]${PURPLE}\$(parse_git_branch)${RESTORE}\n└─▶ " +# ----- END THEME ----- export VISUAL=vim export EDITOR="$VISUAL" @@ -68,3 +39,21 @@ alias ga="git add" alias gcc="git checkout -b" alias activate="source venv/bin/activate" + +alias dmenu="dmenu -nf '#BBBBBB' -nb '#3A515D' -sb '#83C092' -sf '#000000' -fn 'monospace-16'" + + + +# PYWAL --------------------- +# Import colorscheme from 'wal' asynchronously +# & # Run the process in the background. +# ( ) # Hide shell job control messages. +# Not supported in the "fish" shell. +alias wal="wal -o $HOME/.config/wal/done.sh" +(cat ~/.cache/wal/sequences &) + +# Alternative (blocks terminal for 0-3ms) +cat ~/.cache/wal/sequences + +# To add support for TTYs this line can be optionally added. +source ~/.cache/wal/colors-tty.sh