aliases.d/git

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

aliases.d/lazygit

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

aliases.d/lsd

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

aliases.d/vim

@@ -1,20 +1,9 @@
 #!/bin/bash
 
 # Vim Editor
-if (command -v nvim &> /dev/null)
+if [ -x /usr/bin/vim ]
 then
-  alias vim=nvim
+  alias vi='vim -p'
+  alias view='vim -R'
+  alias vless='vim -u /usr/share/vim/vim*/macros/less.vim'
 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/kubectl

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

completion.d/poetry

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

rc.d/broot

@@ -1,23 +1 @@
-#!/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
+[[ -f ~/.config/broot/launcher/bash/br ]] && source ~/.config/broot/launcher/bash/br

rc.d/git

@@ -1,5 +0,0 @@
-#!/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/helm

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

rc.d/kubectl

@@ -1,8 +1,11 @@
 #!/bin/bash
 
-if (command -v kubectl &> /dev/null)
+if (which kubectl &> /dev/null)
 then
 
+  # activate completion
+  source <(kubectl completion bash)
+
   # create a quick alias
   alias k=kubectl
   alias ks="kubectl --namespace kube-system"

rc.d/stern

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