From 8009e7618ac7e4e782c1f67ef6307ebc549d0011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?boggs=20=F0=9F=8C=8A?= <6130147+b-ggs@users.noreply.github.com> Date: Wed, 29 Jan 2025 23:26:54 +0800 Subject: [PATCH] Bulk wip stuff --- bin/.bin/_slugify.py | 11 +++++ bin/.bin/drive_share_to_download_link.py | 25 ++++++---- just/.config/just/justfile | 24 +++++++--- zsh/.zshrc | 59 +++++++++++++----------- 4 files changed, 76 insertions(+), 43 deletions(-) create mode 100644 bin/.bin/_slugify.py diff --git a/bin/.bin/_slugify.py b/bin/.bin/_slugify.py new file mode 100644 index 0000000..0d5e9de --- /dev/null +++ b/bin/.bin/_slugify.py @@ -0,0 +1,11 @@ +# /// script +# requires-python = ">=3.12" +# dependencies = [ +# "python-slugify", +# ] +# /// + +import sys +from slugify import slugify + +print(slugify("".join(sys.argv[1:])), end="") diff --git a/bin/.bin/drive_share_to_download_link.py b/bin/.bin/drive_share_to_download_link.py index 9a262b2..24dfa71 100755 --- a/bin/.bin/drive_share_to_download_link.py +++ b/bin/.bin/drive_share_to_download_link.py @@ -2,13 +2,18 @@ import sys -def drive_share_to_download_link(share_link: str) -> str: - """Convert Google Drive share link to download link.""" - if not share_link.startswith("https://drive.google.com/file/d/"): - return "Invalid share link." - file_id = share_link.split("/")[5] - download_link = f"https://drive.google.com/uc?id={file_id}&export=download" - return download_link - -share_link = sys.argv.pop(1) -print(drive_share_to_download_link(share_link)) + +share_link = sys.argv[1] + +sys.stderr.write(share_link + "\n") + +if not share_link.startswith("https://drive.google.com/file/d/"): + sys.stderr.write("Invalid share link.") + sys.exit(1) +file_id = share_link.split("/")[5] +download_link = f"https://drive.google.com/uc?id={file_id}&export=download" + +sys.stderr.write("\n") +sys.stderr.write("⬇️") + +print(download_link, end="") diff --git a/just/.config/just/justfile b/just/.config/just/justfile index dda2ae8..ace1d92 100644 --- a/just/.config/just/justfile +++ b/just/.config/just/justfile @@ -1,10 +1,20 @@ -# Sync poetry dependencies -poi: - poetry sync +drive_share_to_download_link share_link: + #!/usr/bin/env python3 + import sys -activation_string := shell('poetry env activate') -# Activate poetry environment -pos: - poetry env activate + share_link = "{{share_link}}" + + sys.stderr.write(share_link + "\n") + + if not share_link.startswith("https://drive.google.com/file/d/"): + sys.stderr.write("Invalid share link.\n") + sys.exit(1) + file_id = share_link.split("/")[5] + download_link = f"https://drive.google.com/uc?id={file_id}&export=download" + + sys.stderr.write("\n") + sys.stderr.write("⬇️") + + print(download_link, end="") diff --git a/zsh/.zshrc b/zsh/.zshrc index afd0578..09f0a91 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -62,13 +62,13 @@ listwatch() { # aliases if [[ "$(uname)" == "Darwin" ]]; then - alias lock='open -a ScreenSaverEngine' - alias hidedesktop='defaults write com.apple.finder CreateDesktop false && killall Finder' - alias showdesktop='defaults write com.apple.finder CreateDesktop true && killall Finder' - alias resetdock='defaults write com.apple.dock tilesize -int 32; killall Dock' - alias flushdnscache='sudo dscacheutil -flushcache; sudo killall -HUP mDNSResponder' + alias lock='__print_and_execute open -a ScreenSaverEngine' + alias hidedesktop='__print_and_execute defaults write com.apple.finder CreateDesktop false && killall Finder' + alias showdesktop='__print_and_execute defaults write com.apple.finder CreateDesktop true && killall Finder' + alias resetdock='__print_and_execute defaults write com.apple.dock tilesize -int 32; killall Dock' + alias flushdnscache='__print_and_execute sudo dscacheutil -flushcache; sudo killall -HUP mDNSResponder' elif [[ "$(uname)" == "Linux" ]]; then - alias lock='i3lock' + alias lock='__print_and_execute i3lock' fi alias poi='__print_and_execute poetry sync' @@ -89,32 +89,30 @@ podestroyvenv() { fi } -alias van='python3 -m venv .venv' -alias vac='source .venv/bin/activate' -alias vad='deactivate' +alias van='__print_and_execute python3 -m venv .venv' +alias vac='__print_and_execute source .venv/bin/activate' +alias vad='__print_and_execute deactivate' -alias home='cd $HOME' -alias dev='cd $HOME/dev' -alias b-ggs='cd $HOME/dev/b-ggs' -alias dotfiles='cd $HOME/.files' -alias dotfilesprivate='cd $HOME/.files-private' -alias dump='mkdir -p $HOME/.dump && cd $HOME/.dump' -alias dotbin='cd $HOME/.bin' -alias Downloads='cd $HOME/Downloads' -alias Desktop='cd $HOME/Desktop' -alias dockerfiles='cd $HOME/dev/b-ggs/dockerfiles' -alias wslhome='cd $(wslpath $(wslvar USERPROFILE))' +alias home='__print_and_execute cd $HOME' +alias dev='__print_and_execute cd $HOME/dev' +alias b-ggs='__print_and_execute cd $HOME/dev/b-ggs' +alias dotfiles='__print_and_execute cd $HOME/.files' +alias dotfilesprivate='__print_and_execute cd $HOME/.files-private' +alias dump='__print_and_execute mkdir -p $HOME/.dump && cd $HOME/.dump' +alias dotbin='__print_and_execute cd $HOME/.bin' +alias Downloads='__print_and_execute cd $HOME/Downloads' +alias Desktop='__print_and_execute cd $HOME/Desktop' -alias known-hosts='$EDITOR $HOME/.ssh/known_hosts' -alias ssh-config='cd $HOME/.ssh-config' -alias authorized-keys='cd $HOME/.authorized-keys' +alias known-hosts='__print_and_execute $EDITOR $HOME/.ssh/known_hosts' +alias ssh-config='__print_and_execute cd $HOME/.ssh-config' +alias authorized-keys='__print_and_execute cd $HOME/.authorized-keys' -alias sshforward='ssh -L 8000:localhost:8000 -L 8143:localhost:8143 -L 8823:localhost:8823 -L 5678:localhost:5678 -L 3000:localhost:3000 -L 8086:localhost:8086 -L 5432:localhost:5432 -L 8080:localhost:8080 -L 8082:localhost:8082 -L 8001:localhost:8001 -CNT ' +alias sshforward='__print_and_execute ssh -L 8000:localhost:8000 -L 8143:localhost:8143 -L 8823:localhost:8823 -L 5678:localhost:5678 -L 3000:localhost:3000 -L 8086:localhost:8086 -L 5432:localhost:5432 -L 8080:localhost:8080 -L 8082:localhost:8082 -L 8001:localhost:8001 -CNT ' alias keychainloaddefault='__print_and_execute keychain --nogui -q $HOME/.ssh/id_ed25519' -alias ipify='curl -s https://api.ipify.org' -alias tmpdir='cd $(mktemp -d)' +alias ipify='__print_and_execute curl -s https://api.ipify.org' +alias tmpdir='__print_and_execute cd $(mktemp -d)' alias utcnow='__print_and_execute date -u +"%Y-%m-%dT%H:%M:%SZ" | __print_and_execute xargs echo -n' alias utcnowsafe='date -u +"%Y-%m-%dT%H%M%SZ" | xargs echo -n' @@ -179,6 +177,15 @@ else fi +# just +if [[ -f /opt/homebrew/bin/just ]]; then + eval "$(just --completions zsh)" + echo "$(__pill_text OK 2) just" +else + echo "$(__pill_text WARN 3) just not found" +fi + + # private zshrc if [ -f "$HOME/.private.zshrc" ]; then