From 8d94bab5efda3b4a0c82ea71b7cef2b31ed2bae1 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Mon, 22 May 2023 10:06:01 +0200
Subject: [PATCH] Updates from my work laptop

---
 .alias                | 16 +++++++++++-----
 .config/completions/k |  2 ++
 .config/git/config    | 18 ++++++++++++------
 .ps1                  |  4 ++--
 .void.bash_aliases    |  3 +++
 .void.bashrc          |  8 ++++++--
 6 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/.alias b/.alias
index 58f4994..321098b 100644
--- a/.alias
+++ b/.alias
@@ -1,23 +1,29 @@
-# exa and ls
+# utils
 alias ls="exa --group-directories-first -gm"
 alias ll="ls -lhF"
 alias lt="ll -TL $1"
 alias ld="ll -d"
 alias la="ll -a"
 
+alias cat="bat -pp"
+
 # applications
 alias code="code-oss"
 
 # dotfiles
 alias dot="git --git-dir=$HOME/git/dotfiles/ --work-tree=$HOME"
 
-# sane mkdir
-alias mkdir="mkdir -p"
-
 # k8s
 alias k="kubectl"
+alias kga="k get all"
+alias kgp="k get pod"
+alias kgsc="k get secrets"
+alias kgsv="k get services"
 
-which kubectx kubens &>/dev/null && \
+alias dps='docker ps --format '\''table {{.Names}}\t{{.Image}}\t{{.Status}}\t{{.Networks}}'\'''
+
+# kx, kn
+command -v kubectx kubens &>/dev/null && \
     alias kx="kubectx" && \
     alias kn="kubens"
 
diff --git a/.config/completions/k b/.config/completions/k
index 2666669..6a21e3f 100644
--- a/.config/completions/k
+++ b/.config/completions/k
@@ -1,3 +1,5 @@
 # alias for kubectl to k
 
+source <(kubectl completion bash)
+
 complete -o default -F __start_kubectl k
diff --git a/.config/git/config b/.config/git/config
index d68ef34..2e1c93d 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -2,15 +2,21 @@
     email = fanyx@posteo.net
     name = fanyx
 
+[includeIf "gitdir:~/b1/"]
+	path = ~/b1/.config/git/config
+
+[includeIf "gitdir:~/b1/sap/"]
+	path = ~/b1/sap/.config/git/config
+
 [alias]
 	co = checkout
 	cn = checkout -b
-	l = log --pretty='format:%h %G? %s%d' -n20 --graph
-	tags = tag -l
-	branches = branch -a
-	remotes = remote -v
-	s = status -sb
-	ss = s -uno
+    l = log --pretty='format:%h %G? %s%d' -n20 --graph --color
+    tags = tag -l
+    branches = branch -a
+    remotes = remote -v
+    s = status -sb
+    ss = s -uno
 
 [color]
 	diff = auto
diff --git a/.ps1 b/.ps1
index 5f3d07e..0f812c7 100644
--- a/.ps1
+++ b/.ps1
@@ -10,10 +10,10 @@ SMILEY="${GREEN}:)${NC}"
 FROWNY="${RED}:(${NC}"
 SELECT="if [ \$? = 0 ]; then echo \"${SMILEY}\"; else echo \"${FROWNY}\"; fi"
 
-GIT_BRANCH="$(__git_ps1 ' [%s]')"
+export PROMPT_DIRTRIM=2
 
 export PROMPT_DIRTRIM=2
 
 # actually export PS1
-PS1="${GREEN}\u@\h${NC}:${BLUE}\w${YELLOW}\$(__git_ps1 ' [%s]')${NC} \`${SELECT}\` \$ "
+PS1="${GREEN}\u@\h${NC}:${BLUE}\w${YELLOW}\$(__git_ps1 ' [%s]')${NC}\`${SELECT}\` \$ "
 
diff --git a/.void.bash_aliases b/.void.bash_aliases
index c5a9436..82a8333 100644
--- a/.void.bash_aliases
+++ b/.void.bash_aliases
@@ -11,6 +11,7 @@ alias cs="vim ~/.config/sxhkd/sxhkdrc"
 # use xtools instead
 # alias xin="doas xbps-install -S"
 alias xup="xi -Su"
+alias xun="xi -Sun | awk '{print \$2 \"\t\" \$1}' | sed \"s/-\([^- ]*_.*\)/ -> \1/\""
 
 complete -F _xbps_complete xi
 
@@ -26,3 +27,5 @@ alias xcln="xr -oO"
 
 # Docker
 alias dc=docker-compose
+
+eval "$(thefuck --alias)"
diff --git a/.void.bashrc b/.void.bashrc
index f6b8fbf..a7bc40c 100644
--- a/.void.bashrc
+++ b/.void.bashrc
@@ -21,12 +21,16 @@ if [[ -d ~/.config/completions ]]; then
     done
 fi
 
+# source distro and general purpose aliases
+[[ -r ~/.bash_aliases ]] && . ~/.bash_aliases
+
 # integrate git prompt functions
 # will break PS1 if not used
 [[ -f /usr/share/git/git-prompt.sh ]] && . /usr/share/git/git-prompt.sh
 
-# source distro and general purpose aliases
-[[ -r ~/.bash_aliases ]] && . ~/.bash_aliases
+# kube-ps1
+# located in ~/git/kube-ps1
+[[ -r ~/git/kube-ps1/kube-ps1.sh ]] && . ~/git/kube-ps1/kube-ps1.sh
 
 # set PS1 from file
 # USE ONLY AFTER GIT PROMPT