merge: work

.config/zsh/.kubectl_aliases

@@ -12,25 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-function kn() {
-    (set -e
-        local ctx="${1%/*}"
-        local ns="$2"
+function kx() {
+    1="$(echo - "$1" | tr -c '[:alnum:]-_' '[ *]')"
+    local ctx="$(echo - "$1" | awk '{print $1}')"
+    local ns="${2-$(echo - "$1" | awk '{print $2}')}"
 
-        if [ -z "$ns" ] && [ "$ctx" != "$1" ]; then
-            ns="${1#*/}"
-        fi
-        if [ -n "$ns" ]; then
-            kubectx "${ctx:l}"
-        else
-            ns="$ctx"
-        fi
-        kubens "${ns:l}"
-    )
+    kubectx ${ctx:l}
+    [ -n "$ns" ] && kubens "${ns:l}"
 }
-compdef -e _kubens.zsh kn
+compdef -e _kubectx.zsh kx
 
-alias kx='kubectx'
+alias kn='kubens'
 alias k='kubectl'
 alias ksys='kubectl --namespace=kube-system'
 alias ka='kubectl apply --recursive -f'

.config/zsh/.zsh_aliases

@@ -1,25 +1,35 @@
+# system
 alias cls='clear && ls -lah'
-alias config='git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
 alias startgui='sway 2> $HOME/sway.log'
 alias tmp='cd $(mktemp -d)'
-alias umnt='sudo umount /mnt -R'
-alias vi='$EDITOR'
-alias epitest='docker run -it --rm -v $PWD:/usr/app/ epitechcontent/epitest-docker bash'
-alias automount='MNT=$(udisksctl mount -b /dev/sda1 2> /dev/null || udisksctl mount -b /dev/sdb1) && cd ${MNT/* }'
-alias autoumount='umount /media/*/* /run/media/*/*'
 alias update="paru -Syu; sudo npm update -g; pip freeze | cut -f1 -d= | xargs pip install -U; config submodule update --remote --recursive --init"
+alias vi='$EDITOR'
 
+# conf
+alias config='git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
+alias viconf='$EDITOR $XDG_CONFIG_HOME/nvim'
 alias wconf='$EDITOR $HOME/.config/sway'
 alias zshconf='$EDITOR $ZDOTDIR/.zshrc && . $ZDOTDIR/.zshrc'
 
+# dev
+alias epitest='docker run -it --rm -v $PWD:/usr/app/ epitechcontent/epitest-docker bash'
+
+# disk
+alias automount='MNT=$(udisksctl mount -b /dev/sda1 2> /dev/null || udisksctl mount -b /dev/sdb1) && cd ${MNT/* }'
+alias autoumount='umount /media/*/* /run/media/*/*'
+alias umnt='sudo umount /mnt -R'
+
+# compatibility
 alias ssh='TERM=linux ssh'
 
+# gaming
 alias minecraft='DRI_PRIME=1 minecraft-launcher'
 
-function fnalias() {
-    $1 $(sed 's/--color=.\+/--color=force/' <<< "${@:2}")
+# alias
+function coloralias() {
+    $1 $(echo - "${@:2}" | sed 's/--color=.\+/--color=force/')
 }
 
 alias sudo='sudo '
-alias watch='fnalias watch -c '
+alias watch='coloralias watch -c '
 alias xargs='xargs '

.config/zsh/ohmyzsh

@@ -1 +1 @@
-Subproject commit fc44c49cca9d5e499097392d3f42b1375d0253ba
+Subproject commit f4dc8c5be365668810783ced01a86ff8f251bfd7