aliases.d/bat

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-if (command -v bat &>/dev/null); then
-  alias cat=bat
-fi

aliases.d/kubectl

@@ -6,16 +6,10 @@ if (command -v kubectl &>/dev/null); then
 	alias k="kubectl"
 	alias kg="kubectl get"
 	alias kd="kubectl describe"
-
 	alias ks="kubectl --namespace kube-system"
-	alias ksg="kubectl --namespace kube-system get"
-	alias ksd="kubectl --namespace kube-system describe"
 	alias kga="kubectl get --all-namespaces"
 	alias kuc="kubectl config unset current-context"
 	alias kun="kubectl config set-context --current --namespace="
+	alias kgworkers="kubectl get nodes --selector '!node-role.kubernetes.io/control-plane' --label-columns heat,topology.kubernetes.io/zone,topology.kubernetes.io/region --sort-by metadata.labels.heat"
 
-	alias kgnodes="kubectl get nodes --label-columns topology.kubernetes.io/region,topology.kubernetes.io/zone"
-	alias kgmasters="kubectl get nodes --selector 'node-role.kubernetes.io/control-plane' --label-columns topology.kubernetes.io/region,topology.kubernetes.io/zone"
-	alias kgworkers="kubectl get nodes --selector '!node-role.kubernetes.io/control-plane' --label-columns topology.kubernetes.io/region,topology.kubernetes.io/zone"
-	alias kgtaints="kubectl get nodes --output custom-columns=NAME:.metadata.name,TAINTS:.spec.taints"
 fi

completion.d/flux

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

completion.d/k3d

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

completion.d/minikube

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

profile.d/apps

@@ -8,9 +8,7 @@ if (command -v nvim &>/dev/null); then
 fi
 
 # PAGER
-if (command -v less &>/dev/null); then
-	export PAGER=less
-fi
+export PAGER=less
 
 # MANPAGER
 if (command -v nvim &>/dev/null); then
@@ -20,11 +18,7 @@ elif (command -v bat &>/dev/null); then
 fi
 
 # TERMINAL
-if (command -v kitty &>/dev/null); then
-	export TERMINAL=kitty
-fi
+export TERMINAL=kitty
 
 # BROWSER
-if (command -v firefox &>/dev/null); then
-	export BROWSER=firefox
-fi
+export BROWSER=firefox

profile.d/keychain

@@ -1,5 +1,6 @@
 #!/bin/bash
 
-if (command -v keychain &>/dev/null); then
-  eval "$(keychain --eval --noask ~/.ssh/{id_ed25519,id_rsa_native})"
+if $(which keychain &> /dev/null)
+then
+  eval $(keychain --agents ssh,gpg --eval)
 fi

rc.d/anyenv

@@ -4,6 +4,7 @@
 
 # git clone https://github.com/riywo/anyenv $HOME/.anyenv
 
-if (which anyenv &>/dev/null); then
+if ( which anyenv &> /dev/null )
+then
   eval "$(anyenv init -)"
 fi

rc.d/mcfly

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-if (command -v mcfly &>/dev/null); then
-  export MCFLY_PROMPT="❯ "
-  export MCFLY_INTERFACE_VIEW=BOTTOM
-  export MCFLY_RESULTS=50
-  export MCFLY_RESULTS_SORT=LAST_RUN
-  # export MCFLY_KEY_SCHEME=vim
-  export MCFLY_FUZZY=3
-  eval "$(mcfly init bash)"
+if (which mcfly &>/dev/null); then
+	export MCFLY_PROMPT="❯"
+	export MCFLY_INTERFACE_VIEW=BOTTOM
+	export MCFLY_RESULTS=50
+	export MCFLY_RESULTS_SORT=LAST_RUN
+	# export MCFLY_KEY_SCHEME=vim
+	export MCFLY_FUZZY=3
+	eval "$(mcfly init bash)"
 fi

rc.d/tmux

@@ -1,14 +1,17 @@
 #!/bin/bash
 
 # GNU Screen stuff
-if (command -v tmux &>/dev/null); then
-  if [ "$(pgrep -u "$UID" "tmux" | wc -l)" -gt 0 ]; then
-    if [[ $TERM != screen* ]]; then
+if ( which tmux &> /dev/null )
+then
+  if [ $(pgrep -u "$UID" "tmux" | wc -l) -gt 0 ]
+  then
+    if [[ $TERM != screen* ]]
+    then
       nb_sessions=$(tmux list-session | wc -l)
-      nb_sessions_attached=$(tmux list-session | grep -c "attached")
-      nb_sessions_detached=$(tmux list-session | grep -c -v "attached")
+      nb_sessions_attached=$(tmux list-session | grep "attached" | wc -l)
+      nb_sessions_detached=$(tmux list-session | grep -v "attached" | wc -l)
 
-      echo_info "Found ${nb_sessions} tmux session(s)"
+      echo_reverse "Found ${nb_sessions} tmux session(s)"
 
       echo " * ${nb_sessions_attached} attached"
       tmux list-sessions | grep "attached" | sed -e 's/^/     - /'
@@ -19,3 +22,4 @@ if (command -v tmux &>/dev/null); then
     fi
   fi
 fi
+