From 494dd030ba0ec8e29ef2bc1fca0c687df8bb8c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 19 Apr 2026 11:07:03 +0200 Subject: [PATCH] fix padding length when changing working dir; fix alias --- private_dot_config/shell/alias | 23 +++++++++++------------ private_dot_config/zsh/dot_zshrc | 6 ++++-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/private_dot_config/shell/alias b/private_dot_config/shell/alias index c331d43..1eb769d 100644 --- a/private_dot_config/shell/alias +++ b/private_dot_config/shell/alias @@ -1,14 +1,14 @@ #!/bin/sh # 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 # some more ls aliases @@ -23,14 +23,13 @@ alias cat='batcat --plain' alias lsbc="lsblk | batcat --language=conf --plain" alias bathelp='batcat --plain --language=help' help() { - "$@" --help 2>&1 | bathelp + "$@" --help 2>&1 | bathelp } alias v=nvim -if [ -f $XDG_CONFIG_HOME/ssh/config ]; then - alias ssh="ssh -A -F $XDG_CONFIG_HOME/ssh/config" -else - alias ssh="ssh -A" +if [ -f "$XDG_CONFIG_HOME/ssh/config" ]; then + alias ssh="ssh -A -F $XDG_CONFIG_HOME/ssh/config" fi + alias ssh-add="ssh-add -t 4h" alias run-ssh-agent="eval $(ssh-agent)" diff --git a/private_dot_config/zsh/dot_zshrc b/private_dot_config/zsh/dot_zshrc index d6a1be7..37ca165 100644 --- a/private_dot_config/zsh/dot_zshrc +++ b/private_dot_config/zsh/dot_zshrc @@ -1,3 +1,4 @@ +#!/bin/bash # color stuff # return contrasted color @@ -117,14 +118,15 @@ PROMPT_PAD="." PROMPT_EXTRA_WIDTH=73 precmd() { - if (($COLUMNS > PROMPT_EXTRA_WIDTH)); then + local prompt_ln="${#${${PWD}/${HOME}/~}}" # len of path where $HOME is susbtiued by ~ (and is counted as 1) + if (($COLUMNS > PROMPT_EXTRA_WIDTH + prompt_ln)); then local exec_ts=$(($(date +%s%N) - STARTCMD_TS)) local seconds=$(echo "scale=9; $exec_ts / 1000000000" | bc) local hours=$((seconds / 3600)) local minutes=$(((seconds % 3600) / 60)) seconds=$((seconds % 60)) local exec_str=$(printf "%02d:%02d:%06.3f" hours minutes seconds) - local padding=$(printf %$(($COLUMNS - 73))s | tr ' ' $PROMPT_PAD) + local padding=$(printf %$(($COLUMNS - PROMPT_EXTRA_WIDTH - prompt_ln))s | tr ' ' $PROMPT_PAD) extra_prompt="%k%f${padding}${POWERLINE_STOP_INV}%K{${FG3}}%F{${BG3}}${POWERLINE_SEPARATOR}%K{${BG3}}%F{${FG3}} took ${exec_str} \uf252%K{${BG3}}%F{${BG2}}${POWERLINE_SEPARATOR}%K{${BG2}}%F{${FG2}}at $(date +%H:%M:%S) \uf017 %k%F{${BG2}}${POWERLINE_START_INV}" else extra_prompt=""