From c43ead4a25ef5879948d985117906c56e68f8a73 Mon Sep 17 00:00:00 2001
From: dabruh <11458706-dabruh@users.noreply.gitlab.com>
Date: Mon, 28 Aug 2023 16:41:40 +0200
Subject: [PATCH] Split out aliases

---
 .config/shell/aliases/common | 35 +++++++++++------------------------
 .config/shell/aliases/k8s    |  9 +++++++++
 .config/shell/aliases/ytdlp  |  7 +++++++
 3 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 .config/shell/aliases/k8s
 create mode 100644 .config/shell/aliases/ytdlp

diff --git a/.config/shell/aliases/common b/.config/shell/aliases/common
index 2367790..86368ad 100644
--- a/.config/shell/aliases/common
+++ b/.config/shell/aliases/common
@@ -1,41 +1,28 @@
 #!/bin/bash
 
+# shellcheck disable=SC2139
 # Verbosity and settings that you pretty much just always are going to want.
 alias \
     bc="bc -ql" \
     cp="cp -iv" \
+    df='df -h' \
+    e="${EDITOR:-vim}" \
     ffmpeg="ffmpeg -hide_banner" \
+    free='free -m' \
+    g="git" \
+    ka="killall" \
     mkd="mkdir -pv" \
     mv="mv -iv" \
     rm="rm -vI" \
     shrd="shred -zuvn3" \
-    yt="yt-dlp --embed-metadata -i" \
-    yta="yt -x -f bestaudio/best -o '%(uploader)s - %(title)s [%(id)s].%(ext)s'" \
-    ytmp3="yta --audio-format mp3 --audio-quality 192K"
-
-# Kubernetes things
-alias \
-    cx="kubectl-ctx" \
-    f='flux' \
-    h='helm' \
-    k='kubectl' \
-    v='velero'
-
-# These common commands are just too long! Abbreviate them.
-alias \
-    ka="killall" \
-    g="git" \
-    e="${EDITOR:-vim}" \
-    p="pacman" \
-    z="zathura"
+    tmux='tmux -f ~/.config/tmux/tmux.conf'
 
 # Misc
 alias \
-    tmux='tmux -f ~/.config/tmux/tmux.conf' \
-    df='df -h' \
-    free='free -m' \
-    r='ranger' \
     w='curl https://wttr.in/'
 
-which codium >/dev/null && alias code=codium
+which codium >/dev/null && alias code=codium c=codium
+which pacman >/dev/null && alias p=pacman
+which zathura >/dev/null && alias z=zathura
+which ranger >/dev/null && alias r=ranger
 [ -s "$NVM_DIR/nvm.sh" ] && alias load-nvm="source '$NVM_DIR/nvm.sh'"
diff --git a/.config/shell/aliases/k8s b/.config/shell/aliases/k8s
new file mode 100644
index 0000000..b172248
--- /dev/null
+++ b/.config/shell/aliases/k8s
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Kubernetes things
+alias \
+    cx="kubectl-ctx" \
+    f='flux' \
+    h='helm' \
+    k='kubectl' \
+    v='velero'
diff --git a/.config/shell/aliases/ytdlp b/.config/shell/aliases/ytdlp
new file mode 100644
index 0000000..609df9a
--- /dev/null
+++ b/.config/shell/aliases/ytdlp
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Verbosity and settings that you pretty much just always are going to want.
+alias \
+    yt="yt-dlp --embed-metadata -i" \
+    yta="yt -x -f bestaudio/best -o '%(uploader)s - %(title)s [%(id)s].%(ext)s'" \
+    ytmp3="yta --audio-format mp3 --audio-quality 192K"