From 56ac50129f00f886ff5a5f6cfd3022ea7a3d601c Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 3 Oct 2017 19:14:49 +0200
Subject: [PATCH] Reorganize zsh aliases

---
 shell/+zsh/aliases.zsh |  4 ----
 shell/aliases.sh       | 10 +++++++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/shell/+zsh/aliases.zsh b/shell/+zsh/aliases.zsh
index caac9108..000c14f1 100644
--- a/shell/+zsh/aliases.zsh
+++ b/shell/+zsh/aliases.zsh
@@ -6,10 +6,6 @@ autoload -U zmv
 zman() { PAGER="less -g -s '+/^       "$1"'" man zshall; }
 alias ag='noglob ag'
 
-alias ddg='duckduckgo'
-alias bt='transmission-remote'
-alias ydl='youtube-dl'
-alias ydls='youtube-dl --extract-audio --audio-format m4a'
 remind() {
   local time=$1; shift
   sched $time "notify-send --urgency=critical 'Reminder' '$@'; ding";
diff --git a/shell/aliases.sh b/shell/aliases.sh
index 26a3892a..a93b187f 100644
--- a/shell/aliases.sh
+++ b/shell/aliases.sh
@@ -28,9 +28,6 @@ alias wget='wget -c'                # Resume dl if possible
 
 alias pubkey='cat ~/.ssh/id_rsa.pub'
 
-alias yd='youtube-dl'
-alias ydm='youtube-dl --extract-audio --audio-format aac'
-
 # Always enable colored `grep` output
 # Note: `GREP_OPTIONS="--color=auto"` is deprecated, hence the alias usage.
 alias grep='grep --color=auto'
@@ -44,6 +41,13 @@ alias exe='exercism'
 # .gitattributes | map dirname
 alias map="xargs -n1"
 
+alias ydl='youtube-dl'
+alias ydl-aac='youtube-dl --extract-audio --audio-format aac'
+alias ydl-m4a='youtube-dl --extract-audio --audio-format m4a'
+
+alias ddg='duckduckgo'
+alias bt='transmission-remote'
+
 take() { mkdir "$1" && cd "$1"; }
 hex()  { echo -n $@ | xxd -psdu; }