fix: modernize dotfiles and fix various bugs

- batcharge.py: fix parsing for new macOS battery format
- bin/f: add missing shebang
- bin/tor.sh: quote variables
- bin/crlf.sh: quote variables, cross-platform sed
- bin/git-open: add GitLab/Bitbucket support, remove hardcoded domain
- bin/push: modernize git branch detection
- bin/splash: fix cowfile check syntax
- .aliases: fix shell syntax error
- .exports: fix empty LC_ALL
- .functions: quote variables, fix typos
- .gitconfig: dynamic default branch detection
- .gdbinit: comment out hardcoded path
- .wgetrc: update to modern user agent
- .zshrc: dynamic terraform path
- .osx: remove npm anti-pattern
- bootstrap.sh: fix typo
- setup_mac.sh: fix requirements.pip path
- setup_fedora.sh: fix typos, pgadmin4, mkdir before tar
- osx_defaults.sh: remove defunct userscripts.org
- vscode: remove version-specific extension path
- requirements.pip: remove deprecated packages

Author: CuriousLearner

.aliases

@@ -8,25 +8,25 @@ sed 's/$/ --force/' |
 sed '\$!s/$/ \&/' > ~/dotfiles/setup/vscode/install-extensions.sh"
 
 # Django Stuff
-alias djrun='find . -maxdepth 2 -name 'manage.py' -exec python3 "{}" runserver \;'
-alias djsu='find . -maxdepth 2 -name 'manage.py' -exec python3 "{}" createsuperuser --email="admin@localhost.com" \;'
-alias djmm='find . -maxdepth 2 -name 'manage.py' -exec python3 "{}" makemigrations \;'
-alias djmig='find . -maxdepth 2 -name 'manage.py' -exec python3 "{}" migrate \;'
+alias djrun='find . -maxdepth 2 -name "manage.py" -exec python3 "{}" runserver \;'
+alias djsu='find . -maxdepth 2 -name "manage.py" -exec python3 "{}" createsuperuser --email="admin@localhost.com" \;'
+alias djmm='find . -maxdepth 2 -name "manage.py" -exec python3 "{}" makemigrations \;'
+alias djmig='find . -maxdepth 2 -name "manage.py" -exec python3 "{}" migrate \;'
 alias djsh='find . -maxdepth 2 -name manage.py -exec python3 "{}" shell \;'
 alias djshp='find . -maxdepth 2 -name manage.py -exec python3 "{}" shell_plus --print-sql \;'
 
 alias pepfix='autopep8 --max-line-length=120 -i'
 
 # Virtualenv
-alias sv='if [[ ! -d "venv" && ! -L "venv" ]] ; then; virtualenv -p $(command -v python3) venv; touch requirements.txt; fi; source venv/bin/activate; export PS1="(${${PWD##*/}:0:5}…/venv)$_OLD_VIRTUAL_PS1"'
+alias sv='if [[ ! -d "venv" && ! -L "venv" ]]; then virtualenv -p $(command -v python3) venv; touch requirements.txt; fi; source venv/bin/activate; export PS1="(${${PWD##*/}:0:5}…/venv)$_OLD_VIRTUAL_PS1"'
 alias sv3=sv
 # Note: sv2 removed - Python 2 reached end of life in 2020
 
 # ------------------------------------------------------------------------------
 # | Git Commands                                                               |
 # ------------------------------------------------------------------------------
-# Undo a `git push`
-alias undopush="git push -f origin HEAD^:master"
+# Undo a `git push` (uses default branch)
+alias undopush='git push -f origin HEAD^:$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed "s@^refs/remotes/origin/@@" || echo "main")'
 
 alias gp='git push origin HEAD'
 alias gpf='git push origin HEAD --force-with-lease'
@@ -40,9 +40,9 @@ alias gs='git status'
 alias gcl='git clone'
 alias gcm='git commit -m'
 alias gaa='git add :/; git status -sb'
-# Updates master of upstream project and falls back to your patch branch
+# Updates default branch of upstream project and falls back to your patch branch
 # so that you can start rebasing/merging
-alias gsync='git checkout master;git pull upstream master;git push origin master; git checkout -'
+alias gsync='default_branch=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed "s@^refs/remotes/origin/@@" || echo "main"); git checkout $default_branch; git pull upstream $default_branch; git push origin $default_branch; git checkout -'
 
 # ------------------------------------------------------------------------------
 # | Network                                                                    |

.exports

@@ -35,7 +35,8 @@ export LC_MESSAGES="en_US.UTF-8"
 export LC_MONETARY="en_US.UTF-8"
 export LC_NUMERIC="en_US.UTF-8"
 export LC_TIME="en_US.UTF-8"
-export LC_ALL=
+# LC_ALL intentionally not set - allows individual LC_* variables to take effect
+# export LC_ALL="en_US.UTF-8"  # Uncomment to override all locale settings
 
 
 export PYTHONHASHSEED=random

.functions

@@ -1,15 +1,15 @@
 # list/describe ec2 instances in all the regions
 function ec2-list-all(){
-  for region in `aws ec2 describe-regions --output text | cut -f3`
+  for region in $(aws ec2 describe-regions --output text | cut -f3)
   do
 	   echo -e "\nListing Instances in region:'$region'..."
 	   echo -e "https://console.aws.amazon.com/ec2/v2/home?region=$region"
-	   aws ec2 describe-instances --region $region | jq '.Reservations[] | ( .Instances[] | {state: .State.Name, name: .KeyName, type: .InstanceType, key: .KeyName})'
+	   aws ec2 describe-instances --region "$region" | jq '.Reservations[] | ( .Instances[] | {state: .State.Name, name: .KeyName, type: .InstanceType, key: .KeyName})'
   done
 }
 
 function svg-to-base64() {
-  echo "background: transparent url('data:image/svg+xml;base64,"$(openssl base64 < $@)"') no-repeat center center;"
+  echo "background: transparent url('data:image/svg+xml;base64,$(openssl base64 < "$@")') no-repeat center center;"
 }
 
 function dj() {
@@ -32,7 +32,7 @@ function chpwd() {
 # ------------------------------------------------------------------------------
 
 openssl-to-pem () {
-	openssl pkcs12 -in $1 -out $1.pem -nodes -clcerts
+	openssl pkcs12 -in "$1" -out "$1.pem" -nodes -clcerts
 }
 
 # ------------------------------------------------------------------------------
@@ -85,8 +85,8 @@ supertouch() {
 
 # Create a .tar.gz archive, using `zopfli`, `pigz` or `gzip` for compression
 function targz() {
-  local tmpFile="${@%/}.tar"
-  tar -cvf "${tmpFile}" --exclude=".DS_Store" "${@}" || return 1
+  local tmpFile="${*%/}.tar"
+  tar -cvf "${tmpFile}" --exclude=".DS_Store" "$@" || return 1
 
   size=$(
 	stat -f"%z" "${tmpFile}" 2> /dev/null; # OS X `stat`
@@ -166,12 +166,12 @@ function fixcrlf(){
 
 # Create new directories and enter the first one
 function md() {
-  mkdir -pv "$@" && cd "$1"
+  mkdir -pv "$@" && cd "$1" || return
 }
 
 # Copy w/ progress
 cp_p () {
-  rsync -WavP --human-readable --progress $1 $2
+  rsync -WavP --human-readable --progress "$1" "$2"
 }
 
 # ------------------------------------------------------------------------------
@@ -210,7 +210,7 @@ function phpserver() {
 # | Git                                                                        |
 # ------------------------------------------------------------------------------
 
-# function to normalize a crupt git repo
+# function to normalize a corrupt git repo
 function git_normalize_eol(){
   echo "* text=auto" >>.gitattributes
   rm .git/index     # Remove the index to force git to
@@ -222,12 +222,12 @@ function git_normalize_eol(){
 }
 
 function gitignore() {
-	curl -s https://www.gitignore.io/api/$@;
+	curl -s "https://www.gitignore.io/api/$*"
 }
 
 
 # take this repo and copy it to somewhere else minus the .git stuff.
 function gitexport(){
   mkdir -p "$1"
-  git archive master | tar -x -C "$1"
+  git archive HEAD | tar -x -C "$1"
 }

.gdbinit

@@ -1 +1,2 @@
-add-auto-load-safe-path ~/personal/cpython/
+# Add CPython source directory for debugging (adjust path as needed)
+# add-auto-load-safe-path ~/personal/cpython/

.gitconfig

@@ -13,7 +13,7 @@
     di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"
 
     # Pull in remote changes for the current repository and all its submodules
-    p = !"git pull; git submodule foreach git pull origin master"
+    p = !"git pull; git submodule foreach git pull origin HEAD"
 
     # Clone a repository including all submodules
     c = clone --recursive
@@ -60,12 +60,13 @@
     # List contributors with number of commits
     contributors = shortlog --summary --numbered
 
-    # Merge GitHub pull request on top of the `master` branch
+    # Merge GitHub pull request on top of the default branch
     mpr = "!f() { \
+        default_branch=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@' || echo 'main'); \
         if [ $(printf \"%s\" \"$1\" | grep '^[0-9]\\+$' > /dev/null; printf $?) -eq 0 ]; then \
             git fetch origin refs/pull/$1/head:pr/$1 && \
-            git rebase master pr/$1 && \
-            git checkout master && \
+            git rebase $default_branch pr/$1 && \
+            git checkout $default_branch && \
             git merge pr/$1 && \
             git branch -D pr/$1 && \
             git commit --amend -m \"$(git log -1 --pretty=%B)\n\nCloses #$1.\"; \

.osx

@@ -11,7 +11,7 @@ then
 fi
 
 # Get OS X Software Updates, and update installed Ruby gems, Homebrew, npm, and their installed packages
-alias update='sudo softwareupdate -i -a; brew update; brew upgrade; brew cleanup; npm install npm -g; npm update -g; sudo gem update'
+alias update='sudo softwareupdate -i -a; brew update; brew upgrade; brew cleanup; npm update -g; sudo gem update'
 
 # Empty the Trash on all mounted volumes and the main HDD
 alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; rm -rfv ~/.Trash"

.wgetrc

@@ -34,5 +34,5 @@ robots = off
 # Print the HTTP and FTP server responses
 server_response = on
 
-# Disguise as IE 9 on Windows 7
-user_agent = Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)
+# Use a modern user agent (Chrome on macOS)
+user_agent = Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36

.zshrc

@@ -46,7 +46,10 @@ command -v pack >/dev/null && . "$(pack completion --shell zsh)"
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
 
 autoload -U +X bashcompinit && bashcompinit
-complete -o nospace -C /usr/local/bin/terraform terraform
+# Terraform completion - auto-detect path for Intel/Apple Silicon Macs
+if command -v terraform &>/dev/null; then
+  complete -o nospace -C "$(which terraform)" terraform
+fi
 
 # Sign commits via GPG
 export GPG_TTY=$(tty)

bin/batcharge.py

@@ -4,39 +4,50 @@
 # saved to ~/bin/batcharge.py and from
 # http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/#my-right-prompt-battery-capacity
 
-import math, subprocess
+import math
+import re
+import subprocess
+import sys
+
+result = subprocess.run(
+    ["ioreg", "-rc", "AppleSmartBattery"],
+    capture_output=True,
+    text=True
+)
+output = result.stdout
+
+# Match top-level "MaxCapacity" = <number> (not nested in BatteryData)
+# Use regex to find standalone capacity values
+max_match = re.search(r'^\s+"MaxCapacity"\s*=\s*(\d+)', output, re.MULTILINE)
+cur_match = re.search(r'^\s+"CurrentCapacity"\s*=\s*(\d+)', output, re.MULTILINE)
 
-p = subprocess.Popen(["ioreg", "-rc", "AppleSmartBattery"], stdout=subprocess.PIPE)
-output = p.communicate()[0]
+if not max_match or not cur_match:
+    sys.exit(0)  # No battery or can't parse
 
-o_max = [l for l in output.splitlines() if b'MaxCapacity' in l][0]
-o_cur = [l for l in output.splitlines() if b'CurrentCapacity' in l][0]
+b_max = float(max_match.group(1))
+b_cur = float(cur_match.group(1))
 
-b_max = float(o_max.rpartition(b'=')[-1].strip())
-b_cur = float(o_cur.rpartition(b'=')[-1].strip())
+if b_max == 0:
+    sys.exit(0)
 
 charge = b_cur / b_max
 charge_threshold = int(math.ceil(10 * charge))
 
 # Output
-
-total_slots, slots = 10, []
-filled = int(math.ceil(charge_threshold * (total_slots / 10.0))) * u'◼'
+total_slots = 10
+filled = int(math.ceil(charge_threshold * (total_slots / 10.0))) * '◼'
 # old arrow: ▹▸▶
-empty = (total_slots - len(filled)) * u'◻'
-
-out = (filled + empty).encode('utf-8')
-import sys
+empty = (total_slots - len(filled)) * '◻'
 
-color_green = '%{%}'
-color_yellow = '%{%}'
-color_red = '%{%}'
-color_reset = '%{%}'
+color_green = '%{[32m%}'
+color_yellow = '%{[33m%}'
+color_red = '%{[31m%}'
+color_reset = '%{[00m%}'
 color_out = (
     color_green if len(filled) > 6
     else color_yellow if len(filled) > 4
     else color_red
 )
 
-out = str(color_out) + str(out) + str(color_reset)
+out = color_out + filled + empty + color_reset
 sys.stdout.write(out)

bin/crlf.sh

@@ -15,7 +15,8 @@ function _crlf_file() {
         dos2unix "$1"
       else
         # Fallback: use sed if dos2unix is not installed
-        sed -i'' -e 's/\r$//' "$1"
+        # Use temp file for cross-platform compatibility (BSD vs GNU sed)
+        sed 's/\r$//' "$1" > "$1.tmp" && mv "$1.tmp" "$1"
       fi
     fi
   fi
@@ -24,12 +25,12 @@ function _crlf_file() {
 # Single file
 if [ "$1" != "" ] && [ "$1" != "--force" ]; then
   [ "$2" == "--force" ] && force=1 || force=0
-  _crlf_file "$1" $force
+  _crlf_file "$1" "$force"
   exit 0
 fi
 
 # All files
 [ "$1" == "--force" ] && force=1 || force=0
 for file in $(find . -type f -not -path "*/.git/*" -not -path "*/node_modules/*" -print0 | xargs -0 file | grep ASCII | cut -d: -f1); do
-  _crlf_file "$file" $force
+  _crlf_file "$file" "$force"
 done