diff --git a/files/git/.gitconfig b/files/git/.gitconfig index 8332737..a62c85e 100644 --- a/files/git/.gitconfig +++ b/files/git/.gitconfig @@ -6,8 +6,8 @@ [alias] a = add aa = add . + b = branch bl = blame - br = branch c = commit -v ca = commit -v --amend cm = commit -v -m diff --git a/files/shell/.bashrc b/files/shell/.bashrc index cb22d9a..bc90518 100644 --- a/files/shell/.bashrc +++ b/files/shell/.bashrc @@ -34,6 +34,11 @@ NEWLINE=$'\n' PROMPT_COMMAND=__prompt_command __prompt_command() { local EXIT="$?" + if [ $COLUMNS -lt 80 ]; then + export PROMPT_DIRTRIM=1 + else + export PROMPT_DIRTRIM=0 + fi export PS1="${HOST} ${DIR} ${GIT_NIX}${NEWLINE}" if [[ $(uname) == "OpenBSD" ]]; then diff --git a/files/shell/.shellrc.alias b/files/shell/.shellrc.alias index 33b600a..dac0068 100644 --- a/files/shell/.shellrc.alias +++ b/files/shell/.shellrc.alias @@ -15,6 +15,8 @@ alias gbl='git show $(git ls-files | fzf -e --reverse --bind "enter:become(git b alias gg=': | fzf --reverse --bind "change:reload(git grep {q})" --bind "enter:become($EDITOR {1} +{2})" --delimiter :' ### Abbreviations +alias d='docker' +alias dc='docker compose' alias dcr='dc down && dc up -d && dc logs -f' alias dh1='du . -h -d1' alias dhs='du . -hs' @@ -24,6 +26,7 @@ alias l='eza --icons --hyperlink' alias nd="nix develop ." alias nssh='SSH_AUTH_SOCK= ssh' alias s='kitten ssh' +alias r='. ranger' alias o='xdg-open' # to change a mime use: `xdg-mime default APPLICATION HANDLE` t() { tmux new-session -A -s ${1:-dev}