From ea30b2722f177540fa8f1bbb54c3e3250475230d Mon Sep 17 00:00:00 2001 From: Pratik Tripathy Date: Thu, 21 Mar 2024 13:11:21 +0530 Subject: [PATCH] - NVIM: Mapped 'xt' to close-tab, Noice message for directory change sent to bottom - was too distracting - Kitty: Made the configuration more portable across *unix OSes --- common/.bashrc | 160 +++++++++--------- common/.config/kitty/kitty.conf | 2 +- common/.config/nvim/lua/config/keymaps.lua | 3 + common/.config/nvim/lua/plugins/ui.lua | 1 + .../nvim/lua/plugins/utility-plugs.lua | 2 +- common/.vim/key_maps.vim | 3 + 6 files changed, 88 insertions(+), 83 deletions(-) diff --git a/common/.bashrc b/common/.bashrc index d8b2c8f..06a703a 100644 --- a/common/.bashrc +++ b/common/.bashrc @@ -25,7 +25,7 @@ shopt -s checkwinsize # 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) + debian_chroot=$(cat /etc/debian_chroot) fi # set a fancy prompt (non-color, unless we know we "want" color) @@ -39,18 +39,18 @@ esac #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 + 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\$ ' + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' fi unset color_prompt force_color_prompt @@ -58,21 +58,21 @@ 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" - ;; + 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 - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' fi # colored GCC warnings and errors @@ -86,16 +86,14 @@ alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo # this, if it's already enabled in /etc/bash.bashrc and /etc/profile # sources /etc/bash.bashrc). if ! shopt -oq posix; then - if [ -f /usr/share/bash-completion/bash_completion ]; then - . /usr/share/bash-completion/bash_completion - elif [ -f /etc/bash_completion ]; then - . /etc/bash_completion - fi + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi fi -################################################################################ ############### Everything below this line are customizations ################## -################################################################################ # Do not let globbing complain on no match shopt -s nullglob @@ -104,7 +102,7 @@ shopt -s nullglob shopt -s autocd function timer_start { - timer=${timer:-$SECONDS} + timer=${timer:-$SECONDS} } trap 'timer_start' DEBUG @@ -112,61 +110,61 @@ trap 'timer_start' DEBUG PROMPT_COMMAND=jazz_my_prompt jazz_my_prompt() { - # Capture exit code of last command - # Below MUST be the 1st line of the function - local ex=$? + # Capture exit code of last command + # Below MUST be the 1st line of the function + local ex=$? - # Capture the last command's execution time - timer_show=$(($SECONDS - $timer)) - unset timer + # Capture the last command's execution time + timer_show=$((SECONDS - timer)) + unset timer - #----------------------------------------------------------------------------# - # Bash text colour specification: \e[;