Merge branch 'master' of https://github.com/xlogerais/config-bash

Remove xdg specific config that break some apps (firefox, chromium,...)
on Ubuntu 22.04+

aliases.d/fun

@@ -3,4 +3,7 @@
 # Fun
 alias matrix='tr -c "[:digit:]" " " < /dev/urandom | dd cbs=$COLUMNS conv=unblock | GREP_COLOR="1;32" grep --color "[^ ]"'
 
-alias starwars='beep -l 350 -f 392 -D 100 --new -l 350 -f 392 -D 100 --new -l 350 -f 392 -D 100 --new -l 250 -f 311.1 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 350 -f 392 -D 100 --new -l 250 -f 311.1 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 700 -f 392 -D 100 --new -l 350 -f 587.32 -D 100 --new -l 350 -f 587.32 -D 100 --new -l 350 -f 587.32 -D 100 --new -l 250 -f 622.26 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 350 -f 369.99 -D 100 --new -l 250 -f 311.1 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 700 -f 392 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 392 -D 100 --new -l 25 -f 392 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 739.98 -D 100 --new -l 25 -f 698.46 -D 100 --new -l 25 -f 659.26 -D 100 --new -l 25 -f 622.26 -D 100 --new -l 50 -f 659.26 -D 400 --new -l 25 -f 415.3 -D 200 --new -l 350 -f 554.36 -D 100 --new -l 250 -f 523.25 -D 100 --new -l 25 -f 493.88 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 25 -f 440 -D 100 --new -l 50 -f 466.16 -D 400 --new -l 25 -f 311.13 -D 200 --new -l 350 -f 369.99 -D 100 --new -l 250 -f 311.13 -D 100 --new -l 25 -f 392 -D 100 --new -l 350 -f 466.16 -D 100 --new -l 250 -f 392 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 700 -f 587.32 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 392 -D 100 --new -l 25 -f 392 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 739.98 -D 100 --new -l 25 -f 698.46 -D 100 --new -l 25 -f 659.26 -D 100 --new -l 25 -f 622.26 -D 100 --new -l 50 -f 659.26 -D 400 --new -l 25 -f 415.3 -D 200 --new -l 350 -f 554.36 -D 100 --new -l 250 -f 523.25 -D 100 --new -l 25 -f 493.88 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 25 -f 440 -D 100 --new -l 50 -f 466.16 -D 400 --new -l 25 -f 311.13 -D 200 --new -l 350 -f 392 -D 100 --new -l 250 -f 311.13 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 300 -f 392.00 -D 150 --new -l 250 -f 311.13 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 700 -f 392'
+if (command -v beep &> /dev/null)
+then
+	alias starwars='beep -l 350 -f 392 -D 100 --new -l 350 -f 392 -D 100 --new -l 350 -f 392 -D 100 --new -l 250 -f 311.1 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 350 -f 392 -D 100 --new -l 250 -f 311.1 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 700 -f 392 -D 100 --new -l 350 -f 587.32 -D 100 --new -l 350 -f 587.32 -D 100 --new -l 350 -f 587.32 -D 100 --new -l 250 -f 622.26 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 350 -f 369.99 -D 100 --new -l 250 -f 311.1 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 700 -f 392 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 392 -D 100 --new -l 25 -f 392 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 739.98 -D 100 --new -l 25 -f 698.46 -D 100 --new -l 25 -f 659.26 -D 100 --new -l 25 -f 622.26 -D 100 --new -l 50 -f 659.26 -D 400 --new -l 25 -f 415.3 -D 200 --new -l 350 -f 554.36 -D 100 --new -l 250 -f 523.25 -D 100 --new -l 25 -f 493.88 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 25 -f 440 -D 100 --new -l 50 -f 466.16 -D 400 --new -l 25 -f 311.13 -D 200 --new -l 350 -f 369.99 -D 100 --new -l 250 -f 311.13 -D 100 --new -l 25 -f 392 -D 100 --new -l 350 -f 466.16 -D 100 --new -l 250 -f 392 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 700 -f 587.32 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 392 -D 100 --new -l 25 -f 392 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 739.98 -D 100 --new -l 25 -f 698.46 -D 100 --new -l 25 -f 659.26 -D 100 --new -l 25 -f 622.26 -D 100 --new -l 50 -f 659.26 -D 400 --new -l 25 -f 415.3 -D 200 --new -l 350 -f 554.36 -D 100 --new -l 250 -f 523.25 -D 100 --new -l 25 -f 493.88 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 25 -f 440 -D 100 --new -l 50 -f 466.16 -D 400 --new -l 25 -f 311.13 -D 200 --new -l 350 -f 392 -D 100 --new -l 250 -f 311.13 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 300 -f 392.00 -D 150 --new -l 250 -f 311.13 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 700 -f 392'
+fi

aliases.d/git

@@ -1,29 +1,29 @@
 #!/bin/bash
 
 # Git
-if [ -x /usr/bin/git ]
+if [ -x /usr/bin/git ]; then
-then
+    alias gs='git status'
-  alias gs='git status'
+    alias ga='git add'
-  alias ga='git add'
+    alias gc='git commit'
-  alias gc='git commit'
+    alias gca='git commit -a'
-  alias gca='git commit -a'
+    alias gf='git fetch'
-  alias gu='git pull'
+    alias gu='git pull'
-  alias gp='git pull && git push'
+    alias gp='git pull && git push'
-  alias gd='git diff'
+    alias gd='git diff'
-  alias gdc='git diff --cached'
+    alias gdc='git diff --cached'
-  alias gb='git branch'
+    alias gb='git branch'
-  alias gco='git checkout'
+    alias gco='git checkout'
-  alias gw='git whatchanged'
+    alias gw='git whatchanged'
-  alias gl='git log --graph'
+    alias gl='git log --graph'
 
-  alias gstatus='git status'
+    alias gstatus='git status'
-  alias glog='git log'
+    alias glog='git log'
-  alias glast='git last'
+    alias glast='git last'
-  alias gshow='git show'
+    alias gshow='git show'
-  alias gdiff='git diff'
+    alias gdiff='git diff'
-  alias gcommit='git commit'
+    alias gcommit='git commit'
-  alias gcommitall='git commit --all'
+    alias gcommitall='git commit --all'
-  alias greset='git reset'
+    alias greset='git reset'
-  alias gpull='git pull'
+    alias gpull='git pull'
-  alias gpush='git pull && git push'
+    alias gpush='git pull && git push'
 fi

aliases.d/gopass

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if (command -v 'gopass' && ! command -v pass ) &> /dev/null
+then
+  alias pass='gopass'
+fi

aliases.d/kubectl

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if (command -v kubectl &> /dev/null)
+then
+
+  # create a quick alias
+  alias k=kubectl
+  alias ks="kubectl --namespace kube-system"
+
+  # add completion for the alias as well
+  complete -o default -F __start_kubectl k
+  complete -o default -F __start_kubectl ks
+
+fi

aliases.d/lazygit

@@ -0,0 +1,5 @@
+# Lazygit
+if ( which lazygit &> /dev/null )
+then
+  alias lg='lazygit'
+fi

aliases.d/lsd

@@ -0,0 +1,5 @@
+# LSD
+if ( command -v lsd &> /dev/null )
+then
+  alias ls='lsd'
+fi

aliases.d/mutt

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if (which mutt &> /dev/null); then
-  if [ "$TERM" = "rxvt-unicode" ]; then
-    alias mutt="TERM=rxvt-unicode-256color SOCKS_SERVER=10.181.176.208:1080 socksify mutt"
-  else
-    alias mutt="SOCKS_SERVER=10.181.176.208:1080 socksify mutt"
-  fi
-fi

aliases.d/nvim

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Vim Editor
+if [ -x ~/AppImages/nvim.appimage ]
+then
+  alias nvim='~/AppImages/nvim.appimage'
+fi

aliases.d/vim

@@ -1,9 +1,20 @@
 #!/bin/bash
 
 # Vim Editor
-if [ -x /usr/bin/vim ]
+if (command -v nvim &> /dev/null)
 then
-  alias vi='vim -p'
+  alias vim=nvim
-  alias view='vim -R'
-  alias vless='vim -u /usr/share/vim/vim74/macros/less.vim -c "colorscheme mustangpp"'
 fi
+
+# if (command -v lvim &>/dev/null); then
+# 	alias vim=lvim
+# elif (command -v nvim &>/dev/null); then
+# 	alias vim=nvim
+# fi
+
+# if [ -x /usr/bin/vim ]
+# then
+#   alias vi='vim -p'
+#   alias view='vim -R'
+#   alias vless='vim -u /usr/share/vim/vim*/macros/less.vim'
+# fi

completion.d/helm

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if (command -v helm &> /dev/null)
+then
+  source <( helm completion bash )
+fi

completion.d/kubectl

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if ( which kubectl ) &> /dev/null
+if (command -v kubectl &> /dev/null)
 then
   source <(kubectl completion bash)
 fi

completion.d/poetry

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if ( command -v poetry &> /dev/null )
+then
+  source <(poetry completions bash)
+fi

completion.d/stern

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if (command -v stern &> /dev/null)
+then
+  source <(stern --completion bash)
+fi

profile.d/apps

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # Defined prefered applications
-export TERMINAL=urxvtc
+export TERMINAL=kitty
 export PAGER=less
-export EDITOR=vim
+export EDITOR=nvim
-export BROWSER=surf
+export BROWSER=firefox
 

profile.d/xdg

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Defined prefered applications
-export XDG_RUNTIME_DIR=$HOME/.cache

rc.d/asdf

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [ -f ~/.asdf/asdf.sh ]
+then
+
+  # activate asdf
+  source ~/.asdf/asdf.sh
+
+  # activate completion
+  source ~/.asdf/completions/asdf.bash
+
+fi

rc.d/broot

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+if (command -v broot &>/dev/null); then
+    # This script was automatically generated by the broot program
+    # More information can be found in https://github.com/Canop/broot
+    # This function starts broot and executes the command
+    # it produces, if any.
+    # It's needed because some shell commands, like `cd`,
+    # have no useful effect if executed in a subshell.
+    function br {
+        local cmd cmd_file code
+        cmd_file=$(mktemp)
+        if broot --outcmd "$cmd_file" "$@"; then
+            cmd=$(<"$cmd_file")
+            rm -f "$cmd_file"
+            eval "$cmd"
+        else
+            code=$?
+            rm -f "$cmd_file"
+            return "$code"
+        fi
+    }
+fi

rc.d/direnv

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+if ( which asdf &> /dev/null )
+then
+
+  if ( asdf which direnv &> /dev/null )
+  then
+
+    # Hook direnv into your shell.
+    eval "$(asdf exec direnv hook bash)"
+
+    # A shortcut for asdf managed direnv.
+    direnv() { asdf exec direnv "$@"; }
+
+    return
+  fi
+
+elif ( which direnv &> /dev/null )
+then
+
+  # Hook direnv into your shell.
+  eval "$(direnv hook bash)"
+
+fi

rc.d/git

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if (command -v git && command -v fzf) &>/dev/null; then
+    function gsb { git checkout "$(git branch --all | fzf | tr -d '[:space:]')"; }
+fi

rc.d/krew

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if [ -d ~/.krew/bin ]
+then
+  export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
+fi

rc.d/lsd

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if (which lsd &> /dev/null)
+then
+
+  # create a aliases
+  alias ls='lsd'
+  alias lt='lsd --tree'
+
+fi

rc.d/mcfly

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if (which mcfly &> /dev/null)
+then
+  export MCFLY_INTERFACE_VIEW=BOTTOM
+  export MCFLY_RESULTS=25
+  export MCFLY_RESULTS_SORT=LAST_RUN
+  eval "$(mcfly init bash)"
+fi

rc.d/mcfly.bash

@@ -1,60 +0,0 @@
-#!/bin/bash
-
-if ( ! which mcfly &> /dev/null ); then return; fi
-
-# Avoid loading this file more than once
-if [[ "$__MCFLY_LOADED" == "loaded" ]]; then
-  return 0
-fi
-
-__MCFLY_LOADED="loaded"
-export MCFLY_SESSION_ID=$(cat /dev/urandom | env LC_ALL=C tr -dc 'a-zA-Z0-9' | fold -w 24 | head -n 1)
-export MCFLY_HISTORY=$(mktemp -t mcfly.XXXX)
-export HISTFILE="${HISTFILE:-$HOME/.bash_history}"
-
-if [[ -f "$HISTFILE" ]];
-then
-  tail -n100 "${HISTFILE}" >| ${MCFLY_HISTORY}
-else
-  printf "Welcome to McFly\n" >| ${MCFLY_HISTORY}
-fi
-
-# Ignore commands with a leading space
-#export HISTCONTROL="ignorespace"
-
-# Append new history items to .bash_history
-shopt -s histappend
-
-# Setup a function to be used by $PROMPT_COMMAND.
-function mcfly_prompt_command {
-  local exit_code=$? # Record exit status of previous command.
-  history -a ${MCFLY_HISTORY} # Append history to $MCFLY_HISTORY.
-  # Run mcfly with the saved code. It will:
-  # * append commands to $HISTFILE, (~/.bash_history by default)
-  #   for backwards compatibility and to load in new terminal sessions;
-  # * find the text of the last command in $MCFLY_HISTORY and save it to the database.
-  mcfly add --exit ${exit_code} --append-to-histfile
-  # Clear the in-memory history and reload it from $MCFLY_HISTORY
-  # (to remove instances of '#mcfly: ' from the local session history).
-  history -cr ${MCFLY_HISTORY}
-  return ${exit_code} # Restore the original exit code by returning it.
-}
-
-# Set $PROMPT_COMMAND run mcfly_prompt_command and then any existing $PROMPT_COMMAND.
-PROMPT_COMMAND="mcfly_prompt_command;$PROMPT_COMMAND"
-
-# If this is an interactive shell, take ownership of ctrl-r.
-# The logic here is:
-#   1. Jump to the beginning of the edit buffer, add 'mcfly: ', and comment out the current line. We comment out the line
-#      to ensure that all possible special characters, including backticks, are ignored. This commented out line will
-#      end up as the most recent entry in the $MCFLY_HISTORY file.
-#   2. Type "mcfly search" and then run the command. McFly will pull the last line from the $MCFLY_HISTORY file,
-#      which should be the commented-out search from step #1. It will then remove that line from the history file and
-#      render the search UI pre-filled with it.
-if [[ $- =~ .*i.* ]]; then
-  if set -o | grep "vi " | grep -q on; then
-    bind "'\C-r': '\e0i#mcfly: \e\C-j mcfly search\C-j'"
-  else
-    bind "'\C-r': '\C-amcfly: \e# mcfly search\C-j'"
-  fi
-fi

rc.d/prompt

@@ -2,19 +2,41 @@
 
 # Customize the prompt
 
-if (which powerline-go &> /dev/null); then
+POWERLINE_LOCATION=$(command -v powerline-go || command -v powerline) &>/dev/null
-   function _update_ps1() {
+POWERLINE=$(basename "$POWERLINE_LOCATION")
-     PS1="$(powerline-go -error $?)"
+
-   }
+if [ "${POWERLINE}" = "powerline-go" ]; then
-   if [ "$TERM" != "linux" ] ; then
+
-     export PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND"
+	echo "Using $POWERLINE"
-   fi
+
+	function _update_ps1() {
+		PS1=$($POWERLINE -jobs "$(jobs -p | wc -l)" -error $? -modules "ssh,host,wsl,user,cwd,direnv,venv,perms,git,jobs,exit,root" -modules-right "docker,docker-context,kube,terraform-workspace,termtitle" -newline)
+	}
+
+	if [ "$TERM" != "linux" ]; then PROMPT_COMMAND="$PROMPT_COMMAND; _update_ps1"; fi
+
+elif [ "${POWERLINE}" = "powerline" ]; then
+
+	echo "Using $POWERLINE"
+
+	# Run powerline daemon
+	powerline-daemon -q
+	# Cache powerline location
+	# To locate this directory, run: pip show powerline-status
+	export POWERLINE_LOCATION="/home/xavier/.local/lib/python3.10//site-packages/powerline" # Set up powerline environment
+	export POWERLINE_CONFIG_COMMAND=powerline-config
+	export POWERLINE_BASH_CONTINUATION=1
+	export POWERLINE_BASH_SELECT=1# Invoke binding script
+	. "$POWERLINE_LOCATION/bindings/bash/powerline.sh"
+
 else
-  if [ "$UID" -eq 0 ]; then
+
-    export PS1='\[\e[01;31m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] '
+	if [ "$UID" -eq 0 ]; then
-  else
+		export PS1='\[\e[01;31m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] '
-    export PS1='\[\e[01;32m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] '
+	else
-  fi
+		export PS1='\[\e[01;32m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] '
+	fi
+
 fi
 
 # Limit the path to 3 levels