diff --git a/.zsh_functions/download.zsh b/.zsh_functions/download.zsh index 0d289f8..669dd90 100644 --- a/.zsh_functions/download.zsh +++ b/.zsh_functions/download.zsh @@ -1,30 +1,30 @@ if ! typeset -f ytr >/dev/null; then - export PATH="$PATH:$HOME/.local/bin:$HOME/bin" +export PATH="$PATH:$HOME/.local/bin:$HOME/bin" - # ── 2. Load .env files from ~/.environment.d/ ─────────────────── - # Automatically export all variables defined while sourcing .env files - setopt allexport - for file in ~/.environment.d/*.env(.N); do - source "$file" - done - unset file - unsetopt allexport +# ── 2. Load .env files from ~/.environment.d/ ─────────────────── +# Automatically export all variables defined while sourcing .env files +setopt allexport +for file in ~/.environment.d/*.env(.N); do + source "$file" +done +unset file +unsetopt allexport - # Load a function that allows us to import other function definitions from - # the ZSH_FUNC_PATH without providing their exact location - source "$DOTFILES_DIR/.zsh_functions/autosource.sh" +# Load a function that allows us to import other function definitions from +# the ZSH_FUNC_PATH without providing their exact location +source "$DOTFILES_DIR/.zsh_functions/autosource.sh" - # Load the rest of the zsh configs in ~/.zshrc.d/ - setopt allexport - for file in ~/.zshrc.d/*.zsh(.N); do - source "$file" - done +# Load the rest of the zsh configs in ~/.zshrc.d/ +setopt allexport +for file in ~/.zshrc.d/*.zsh(.N); do + source "$file" +done - source ~/.zsh_functions/youtube.zsh +source ~/.zsh_functions/youtube.zsh fi mdl () { @@ -58,7 +58,7 @@ cd "$mount_point/$path_on_nas" echo "SMB share mounted successfully." if [[ "$*" == *"tidal.com"* ]]; then echo "TIDAL DETECTED" - tidal-dl -l $* + uvx tidal-dl -l $* else echo "Using qobuz-dl via uvx at: $(which uvx)" echo "QOBUZ URL: $*" @@ -69,43 +69,43 @@ echo "Unmounting SMB share..." sleep 1 /sbin/umount -f "$mount_point" cd $cwd -if declare -f jelly_rescan > /dev/null; then - echo "Waiting $jelly_wait secs before triggering automatic library scan..." - sleep $jelly_wait - jelly_rescan - echo "done" -fi +#if declare -f jelly_rescan > /dev/null; then +# echo "Waiting $jelly_wait secs before triggering automatic library scan..." +# sleep $jelly_wait +# jelly_rescan +# echo "done" +#fi } d () { - local url="${1:-$(pbpaste)}" - local used_clipboard=0 +local url="${1:-$(pbpaste)}" +local used_clipboard=0 - if [[ -z "$url" ]]; then - echo "No URL provided and clipboard is empty." - return 1 - fi +if [[ -z "$url" ]]; then + echo "No URL provided and clipboard is empty." + return 1 +fi - # Check if URL came from clipboard - if [[ -z "$1" ]]; then - echo "started via clipboard" - used_clipboard=1 - fi +# Check if URL came from clipboard +if [[ -z "$1" ]]; then + echo "started via clipboard" + used_clipboard=1 +fi - case "$url" in - (*youtube*|*youtu.be*) - echo "Detected YouTube URL: $url" - ytr "$url" - ;; - (*qobuz*) - echo "Detected Qobuz URL: $url" - mdl "$url" - if [[ $used_clipboard -eq 1 ]]; then - osascript -e "display dialog \"Done with Qobuz: $url\" buttons {\"OK\"}" - fi - ;; - (*) - echo "Unknown URL: $url" - ;; - esac +case "$url" in + (*youtube*|*youtu.be*) + echo "Detected YouTube URL: $url" + ytr "$url" + ;; + (*qobuz*) + echo "Detected Qobuz URL: $url" + mdl "$url" + if [[ $used_clipboard -eq 1 ]]; then + osascript -e "display dialog \"Done with Qobuz: $url\" buttons {\"OK\"}" + fi + ;; + (*) + echo "Unknown URL: $url" + ;; +esac } diff --git a/.zsh_functions/insta.zsh b/.zsh_functions/insta.zsh index a899cbd..65c6fa3 100644 --- a/.zsh_functions/insta.zsh +++ b/.zsh_functions/insta.zsh @@ -55,6 +55,7 @@ insta () { user_list=("${insta_default_users[@]}") fi + #local cmd=(uvx --with browser_cookie3 instaloader -b Firefox -B '/Users/janolehuebner/Library/Application Support/zen/Profiles/frbi8zqc.insta/cookies.sqlite' "${user_list[@]}" --fast-update --abort-on=302,400,401,429) local cmd=(uvx --with browser_cookie3 instaloader -b Safari "${user_list[@]}" --fast-update --abort-on=302,400,401,429) if $stories_only; then cmd+=(--stories --no-profile-pic --no-posts) diff --git a/.zsh_functions/jellyfin.zsh b/.zsh_functions/jellyfin.zsh index 79b15db..f8a6ab9 100644 --- a/.zsh_functions/jellyfin.zsh +++ b/.zsh_functions/jellyfin.zsh @@ -2,7 +2,5 @@ jelly_rescan(){ JELLYFIN_URL="http://$NAS_IP:8096" API_KEY="$(pass jelly)" LIBRARY_ID="8a05b0252259a1dbd62df97522638439" - -curl -X POST -H "X-Emby-Token: $API_KEY" \ - "$JELLYFIN_URL/Library/VirtualFolders/$LIBRARY_ID/Refresh" +curl -X POST -H "X-Emby-Token: $API_KEY" "$JELLYFIN_URL/Items/$LIBRARY_ID/Refresh?Recursive=true" } diff --git a/.zshrc.d/aliases.zsh b/.zshrc.d/aliases.zsh index c810788..d9a1746 100644 --- a/.zshrc.d/aliases.zsh +++ b/.zshrc.d/aliases.zsh @@ -5,8 +5,5 @@ alias nano="nvim" alias tg="terragrunt" alias tf="tofu" alias terraform="tofu" -alias pip="pip3" -alias python="python3" -alias cookies="open $HOME/Library/Containers/com.apple.Safari/Data/Library/Cookies/" alias dotfiles="git --work-tree=$HOME --git-dir=$HOME/.dotgit " -alias instaedit="nvim ~/.environment.d/insta.env" +alias instaloader="uvx --with browser_cookie3 instaloader"