- NVIM: Mapped '<leader>xt' to close-tab, Noice message for directory

change sent to bottom  - was too distracting
- Kitty: Made the configuration more portable across *unix OSes
This commit is contained in:
Pratik Tripathy
2024-03-21 13:11:21 +05:30
parent 39992add32
commit ea30b2722f
6 changed files with 88 additions and 83 deletions

View File

@@ -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[<COLOUR>;<STYLE>m
# Colours: 31=red, 32=green, 33=yellow, 34=blue, 35=purple, 36=cyan, 37=white
# Styles: 0=normal, 1=bold, 2=dimmed, 4=underlined, 7=highlighted
#----------------------------------------------------------------------------#
#----------------------------------------------------------------------------#
# Bash text colour specification: \e[<COLOUR>;<STYLE>m
# Colours: 31=red, 32=green, 33=yellow, 34=blue, 35=purple, 36=cyan, 37=white
# Styles: 0=normal, 1=bold, 2=dimmed, 4=underlined, 7=highlighted
#----------------------------------------------------------------------------#
local reset="\[\e[0m\]"
local normal=';0m'
local bold=';1m'
local boldyellow="\[\e[32${bold}\]"
local boldwhite="\[\e[37${bold}\]"
local normalwhite="\[\e[37${normal}\]"
local yellow_highlight="\[\e[31;7m\]"
local reset="\[\e[0m\]"
local normal=';0m'
local bold=';1m'
local boldyellow="\[\e[32${bold}\]"
local boldwhite="\[\e[37${bold}\]"
local normalwhite="\[\e[37${normal}\]"
local yellow_highlight="\[\e[31;7m\]"
# Add color preference BEFORE the item
local hostname="${normalwhite}\h"
local username="${boldwhite}\u"
local jobs="${boldwhite}jobs:\j"
local history_cnt="${normalwhite}!\!"
local timestamp="${normalwhite}\D{%H:%M:%S(%z) %d%b}"
local session_cmd_cnt="${normalwhite}#\#"
local pwd="${boldwhite}\w"
local isroot="${boldwhite}\$"
# Add color preference BEFORE the item
local hostname="${normalwhite}\h"
local username="${boldwhite}\u"
local jobs="${boldwhite}jobs:\j"
local history_cnt="${normalwhite}!\!"
local timestamp="${normalwhite}\D{%H:%M:%S(%z) %d%b}"
local session_cmd_cnt="${normalwhite}#\#"
local pwd="${boldwhite}\w"
local isroot="${boldwhite}\$"
# Set prompt content
# If exit code of last command is non-zero, prepend this code to the prompt
local exit_code=''
if [[ "$ex" -eq 0 ]]; then
exit_code="${boldwhite}"
else
exit_code="${yellow_highlight}$ex\a${reset}"
fi
# Set prompt content
# If exit code of last command is non-zero, prepend this code to the prompt
local exit_code=''
if [[ "$ex" -eq 0 ]]; then
exit_code="${boldwhite}"
else
exit_code="${yellow_highlight}$ex\a${reset}"
fi
# Style each group separately
local groupstart="${boldyellow}["
local groupend="${boldyellow}]"
group1="${groupstart}${username}@${hostname}${groupend}"
group2="${groupstart}${jobs}${groupend}"
group3="${groupstart}${history_cnt}${groupend}"
group4="${groupstart}${session_cmd_cnt}${groupend}"
group5="${groupstart}${timestamp}${groupend}"
group6="${groupstart}${exit_code}${groupend}"
group8="${groupstart}${pwd}${groupend}"
group9="${groupstart}${normalwhite}${timer_show}s${groupend}"
# Style each group separately
local groupstart="${boldyellow}["
local groupend="${boldyellow}]"
group1="${groupstart}${username}@${hostname}${groupend}"
group2="${groupstart}${jobs}${groupend}"
group3="${groupstart}${history_cnt}${groupend}"
group4="${groupstart}${session_cmd_cnt}${groupend}"
group5="${groupstart}${timestamp}${groupend}"
group6="${groupstart}${exit_code}${groupend}"
group8="${groupstart}${pwd}${groupend}"
group9="${groupstart}${normalwhite}${timer_show}s${groupend}"
# Position each group where you would like them
PS1="\n${group1}-${group2}-${group3}-${group4}-${group5}\n${group6}-${group9}-${group8}\n${isroot}${reset} "
# Position each group where you would like them
PS1="\n${group1}-${group2}-${group3}-${group4}-${group5}\n${group6}-${group9}-${group8}\n${isroot}${reset} "
}
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
@@ -178,18 +176,18 @@ HISTFILE="$XDG_STATE_HOME/shell/bash_history"
[ ! -f "$XDG_CONFIG_HOME/exercism/exercism_completion.bash" ] || source "$XDG_CONFIG_HOME/exercism/exercism_completion.bash"
if command -v zoxide >/dev/null; then
eval "$(zoxide init --cmd cd bash)"
fi
# [ctrl+r]:replaces shell command search
# [ctrl+t]:fzf & over the files & directories under the current one & paste it to prompt
# [alt+c] :fzf & cd into a directory under the current one
[ -f $XDG_STATE_HOME/shell/fzf.bash ] && source $XDG_STATE_HOME/shell/fzf.bash
[ -f "$XDG_STATE_HOME/shell/fzf.bash" ] && source "$XDG_STATE_HOME/shell/fzf.bash"
if command -v zoxide >/dev/null; then
eval "$(zoxide init --cmd cd bash)"
fi
# Source aliases and shell functions
for alias_file in "$XDG_CONFIG_HOME"/shell/*.sh; do source "$alias_file"; done
# TIP: Following should be executed AFTER the aliases are sourced
command -v op >/dev/null && bind '"^O":"op\n"' # Fuzzyfind projects and open in nvim
command -v op >/dev/null && bind '"^O":"op\n"' # Fuzzyfind projects and open in nvim
command -v pnew >/dev/null && bind '"^[o":"pnew\n"' # Create a new project quickly

View File

@@ -1051,7 +1051,7 @@ map ctrl+shift+l kitten pass_keys.py right ctrl+shift+l "^.* - nvim$"
# Redundant, they are used for scrollback.nvim as well
# But, this would work even if we uninstall scrollback.nvim
listen_on unix:@mykitty
listen_on unix:/tmp/mykitty
allow_remote_control yes
#: Tab bar {{{

View File

@@ -88,3 +88,6 @@ vim.keymap.set("n", "]e", diagnostic_goto(true, "ERROR"), { desc = "Next Error"
vim.keymap.set("n", "[e", diagnostic_goto(false, "ERROR"), { desc = "Prev Error" })
vim.keymap.set("n", "]w", diagnostic_goto(true, "WARN"), { desc = "Next Warning" })
vim.keymap.set("n", "[w", diagnostic_goto(false, "WARN"), { desc = "Prev Warning" })
-- Close Tab
vim.keymap.set("n", "<leader>xt", "<cmd>tabclose<cr>", { desc = "Close current tab" })

View File

@@ -156,6 +156,7 @@ return {
{ find = "<ed" },
{ find = "The only match" },
{ find = "DB:" },
{ find = "cwd:" },
},
},
},

View File

@@ -2,7 +2,7 @@ return {
-- Navigate between NVIM & Tmux splits seamlessly
{ "christoomey/vim-tmux-navigator" },
-- Navigate between NVIM & kitty splits seamlessly
-- Navigate between NVIM & kitty splits
{
"knubie/vim-kitty-navigator",
build = "cp ./*.py ~/.config/kitty/",

View File

@@ -127,3 +127,6 @@ nnoremap <leader>u :UndotreeToggle<CR>
" Fugitive
nnoremap <leader>gg :0G<cr>
" Close Tab
nnoremap <leader>xt :tabclose