From 988fd01ab7e272918625e37fd6fe77b34c9224a2 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Wed, 2 Oct 2024 09:57:37 +0200 Subject: [PATCH] bash: update work profile (merge ubuntu with main) --- dotfiles/.bashrc | 24 +++++++++++++++++++++--- dotfiles/.environ | 2 ++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc index 52dc78b..21f7765 100644 --- a/dotfiles/.bashrc +++ b/dotfiles/.bashrc @@ -15,13 +15,31 @@ shopt -s histappend [[ -f $HOME/.bash_colors ]] && source "$HOME/.bash_colors" [[ -f $HOME/.bash_functions ]] && source "$HOME/.bash_functions" +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 +fi +while read -r completion ; do source "$completion" ; done < <(find $HOME/.bash_completion/*) + # Save working dir on every prompt. export PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"; pwd > $HOME/.cwd' -export PS1="${Yellow}\d \A ${Off}${Green}\u@\h: ${Off}\w ${Red}\$(parse_branch git)${BRed}\$(parse_branch fossil)${Off}\n-$ " +export PS1="${Red}\d \A ${Blue}\u@\h: ${Off}\w ${BGreen}\$(parse_branch git)${BPurple}\$(parse_branch fossil)${Off}\n-$ " + +# 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 +[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize # Use fzf if installed. -hash fzf 2>/dev/null && eval "$(fzf --bash)" -export FZF_DEFAULT_OPTS='--border=horizontal --info=inline --no-reverse --height=50%' +export FZF_DEFAULT_OPTS='--border=horizontal --info=inline --no-reverse --height=30%' [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" diff --git a/dotfiles/.environ b/dotfiles/.environ index 24ba281..bd645bc 100644 --- a/dotfiles/.environ +++ b/dotfiles/.environ @@ -20,3 +20,5 @@ add_path() case :$PATH: in *:$1:*) ;; *) PATH=$1:$PATH;; esac add_path $HOME/.local/bin add_path $PYTHONUSERBASE/bin add_path $HOME/.cargo/bin +add_path $HOME/.kubectl-plugins:$PATH +add_path $PATH:/opt/gradle/gradle-8.8/bin