mirror of
https://github.com/pratiktri/dotfiles.git
synced 2026-02-04 08:41:43 +05:30
fix(bash): Issues with prompt & code cleanup
- removed: last command time on prompt broke `$_` - cleanup: Removed old stuff
This commit is contained in:
@@ -1,91 +1,24 @@
|
|||||||
# ~/.bashrc: executed by bash(1) for non-login shells.
|
|
||||||
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
|
|
||||||
# for examples
|
|
||||||
# Sets environment variables for login non-interactive shells (VS Code & Zed)
|
|
||||||
[ -z "$XDG_CONFIG_HOME" ] && source "$HOME"/.profile
|
[ -z "$XDG_CONFIG_HOME" ] && source "$HOME"/.profile
|
||||||
|
|
||||||
# If not running interactively, don't do anything
|
[ -f /etc/bashrc ] && . /etc/bashrc
|
||||||
case $- in
|
|
||||||
*i*) ;;
|
|
||||||
*) return ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# append to the history file, don't overwrite it
|
|
||||||
shopt -s histappend
|
shopt -s histappend
|
||||||
|
|
||||||
# check the window size after each command and, if necessary,
|
|
||||||
# update the values of LINES and COLUMNS.
|
|
||||||
shopt -s checkwinsize
|
shopt -s checkwinsize
|
||||||
|
|
||||||
# If set, the pattern "**" used in a pathname expansion context will
|
|
||||||
# match all files and zero or more directories and subdirectories.
|
|
||||||
#shopt -s globstar
|
|
||||||
|
|
||||||
# make less more friendly for non-text input files, see lesspipe(1)
|
|
||||||
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
|
|
||||||
|
|
||||||
# set variable identifying the chroot you work in (used in the prompt below)
|
|
||||||
if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
|
|
||||||
debian_chroot=$(cat /etc/debian_chroot)
|
|
||||||
fi
|
|
||||||
|
|
||||||
# set a fancy prompt (non-color, unless we know we "want" color)
|
|
||||||
case "$TERM" in
|
case "$TERM" in
|
||||||
xterm-color | *-256color) color_prompt=yes ;;
|
xterm-color | *-256color) color_prompt=yes ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# uncomment for a colored prompt, if the terminal has the capability; turned
|
|
||||||
# off by default to not distract the user: the focus in a terminal window
|
|
||||||
# should be on the output of commands, not on the prompt
|
|
||||||
#force_color_prompt=yes
|
|
||||||
|
|
||||||
if [ -n "$force_color_prompt" ]; then
|
|
||||||
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
|
|
||||||
# We have color support; assume it's compliant with Ecma-48
|
|
||||||
# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
|
|
||||||
# a case would tend to support setf rather than setaf.)
|
|
||||||
color_prompt=yes
|
|
||||||
else
|
|
||||||
color_prompt=
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$color_prompt" != yes ]; then
|
|
||||||
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
|
|
||||||
fi
|
|
||||||
|
|
||||||
unset color_prompt force_color_prompt
|
unset color_prompt force_color_prompt
|
||||||
|
|
||||||
# If this is an xterm set the title to user@host:dir
|
|
||||||
case "$TERM" in
|
|
||||||
xterm* | rxvt*)
|
|
||||||
PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
|
|
||||||
;;
|
|
||||||
*) ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# enable color support of ls and also add handy aliases
|
|
||||||
if [ -x /usr/bin/dircolors ]; then
|
if [ -x /usr/bin/dircolors ]; then
|
||||||
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
|
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
|
||||||
alias ls='ls --color=auto'
|
alias ls='ls --color=auto'
|
||||||
#alias dir='dir --color=auto'
|
|
||||||
#alias vdir='vdir --color=auto'
|
|
||||||
|
|
||||||
alias grep='grep --color=auto'
|
alias grep='grep --color=auto'
|
||||||
alias fgrep='fgrep --color=auto'
|
alias fgrep='fgrep --color=auto'
|
||||||
alias egrep='egrep --color=auto'
|
alias egrep='egrep --color=auto'
|
||||||
fi
|
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$//'\'')"'
|
|
||||||
|
|
||||||
# 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).
|
|
||||||
if ! shopt -oq posix; then
|
if ! shopt -oq posix; then
|
||||||
if [ -f /usr/share/bash-completion/bash_completion ]; then
|
if [ -f /usr/share/bash-completion/bash_completion ]; then
|
||||||
. /usr/share/bash-completion/bash_completion
|
. /usr/share/bash-completion/bash_completion
|
||||||
@@ -102,12 +35,6 @@ shopt -s nullglob
|
|||||||
## When only a directory is entered without cd, cd into it
|
## When only a directory is entered without cd, cd into it
|
||||||
shopt -s autocd
|
shopt -s autocd
|
||||||
|
|
||||||
function timer_start {
|
|
||||||
timer=${timer:-$SECONDS}
|
|
||||||
}
|
|
||||||
|
|
||||||
trap 'timer_start' DEBUG
|
|
||||||
|
|
||||||
PROMPT_COMMAND=jazz_my_prompt
|
PROMPT_COMMAND=jazz_my_prompt
|
||||||
|
|
||||||
jazz_my_prompt() {
|
jazz_my_prompt() {
|
||||||
@@ -115,10 +42,6 @@ jazz_my_prompt() {
|
|||||||
# Below MUST be the 1st line of the function
|
# Below MUST be the 1st line of the function
|
||||||
local ex=$?
|
local ex=$?
|
||||||
|
|
||||||
# Capture the last command's execution time
|
|
||||||
timer_show=$((SECONDS - timer))
|
|
||||||
unset timer
|
|
||||||
|
|
||||||
#----------------------------------------------------------------------------#
|
#----------------------------------------------------------------------------#
|
||||||
# Bash text colour specification: \e[<COLOUR>;<STYLE>m
|
# Bash text colour specification: \e[<COLOUR>;<STYLE>m
|
||||||
# Colours: 31=red, 32=green, 33=yellow, 34=blue, 35=purple, 36=cyan, 37=white
|
# Colours: 31=red, 32=green, 33=yellow, 34=blue, 35=purple, 36=cyan, 37=white
|
||||||
@@ -162,7 +85,6 @@ jazz_my_prompt() {
|
|||||||
group5="${groupstart}${timestamp}${groupend}"
|
group5="${groupstart}${timestamp}${groupend}"
|
||||||
group6="${groupstart}${exit_code}${groupend}"
|
group6="${groupstart}${exit_code}${groupend}"
|
||||||
group8="${groupstart}${pwd}${groupend}"
|
group8="${groupstart}${pwd}${groupend}"
|
||||||
group9="${groupstart}${normalwhite}${timer_show}s${groupend}"
|
|
||||||
|
|
||||||
# Position each group where you would like them
|
# Position each group where you would like them
|
||||||
PS1="\n${group1}-${group2}-${group3}-${group4}-${group5}\n${group6}-${group9}-${group8}\n${isroot}${reset} "
|
PS1="\n${group1}-${group2}-${group3}-${group4}-${group5}\n${group6}-${group9}-${group8}\n${isroot}${reset} "
|
||||||
|
|||||||
Reference in New Issue
Block a user