From 0c945b42695aa9eabb1d3eb33020851b21e226a1 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Tue, 24 Sep 2024 22:31:59 +0200
Subject: checkpoint

---
 config/essentials/shell/aliases.sh   | 5 +++--
 config/essentials/shell/functions.sh | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'config/essentials/shell')

diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh
index 239dc47..c37c702 100644
--- a/config/essentials/shell/aliases.sh
+++ b/config/essentials/shell/aliases.sh
@@ -292,7 +292,7 @@ alias fzh="fzf --tac < $HISTFILE | tee /dev/stderr | clipp"
 alias ffwin='hyprctl clients -j | jq '\''.[].pid'\'' | fzf --preview "hyprctl clients -j | jq '\''.[] | select(.pid == {}) | {class, title, workspace, xwayland}'\''"'
 alias pff='find ${PASSWORD_STORE_DIR:=~/src/password-store/} -name "*.gpg" | sed -e "s@$PASSWORD_STORE_DIR/@@" -e '\''s/\.gpg$//'\'' | fzf | xargs pass show -c'
 alias fzps='fzf --print0 | xargs -0I{}'
-alias ytdl='yt-dlp --restrict-filenames --embed-chapters -f "b" -S "res:1080" -P "$HOME/vids/youtube/" -o "%(channel)s/%(title)s.%(ext)s"'
+alias ytdl='yt-dlp --restrict-filenames --embed-chapters -S "res:1080" -o "%(channel)s - %(title)s.%(ext)s"'
 
 # emacs aliases
 alias emacsd='emacs --daemon'
@@ -318,7 +318,8 @@ alias dbsmu='rsync -rlpP db:/media/basilisk/music/ /media/kilimanjaro/music'
 
 # git
 alias config='GIT_WORK_TREE=~/src/dotfiles/ GIT_DIR=~/src/dotfiles/.git'
-alias cfg='vi ~/src/dotfiles/"$(config git ls-files | fzf || exit)"'
+alias cfg='edit_git_file ~/src/dotfiles/'
+alias nvcfg='edit_git_file ~/.config/nvim'
 alias gmod='git status --short | sed '\''/^\s*M/!d;s/^\s*M\s*//'\'' | fzf | xargs vi'
 alias gclc='git clone "$(clipo)"'
 
diff --git a/config/essentials/shell/functions.sh b/config/essentials/shell/functions.sh
index cf10365..2a21655 100644
--- a/config/essentials/shell/functions.sh
+++ b/config/essentials/shell/functions.sh
@@ -348,3 +348,10 @@ prj () {
     [ -d "$d" ] || exit 1
     cd "$pfx"/"$d"
 }
+
+edit_git_file () {
+    GIT_WORK_TREE="$1" GIT_DIR="$1"/.git git rev-parse --show-toplevel > /dev/null 2>&1 || return 1
+    f="$(GIT_WORK_TREE="$1" GIT_DIR="$1"/.git git ls-files | fzf)"
+    [ "$f" ] || return 2
+    $EDITOR "$1"/"$f"
+}
-- 
cgit v1.2.3