Some updates, from vlc to iina

install/1_languages.sh

@@ -9,7 +9,6 @@ rbenv global 3.0.0
 curl -L https://git.io/n-install | bash
 n v8
 n v12
-n latest
 n lts
 npm install -g npm@latest
 npm update -g
@@ -21,6 +20,3 @@ brew install pyenv # restart terminal, then:
 pyenv install 3.9.2
 pyenv global 3.9.2
 pip install --upgrade pip
-mkdir /usr/local/Cellar/python@3.9
-ln -s ~/.pyenv/versions/3.9.2 /usr/local/Cellar/python@3.9/3.9.2_2
-brew link --overwrite python@3.9

install/2_cli-tools.sh

@@ -1,7 +1,8 @@
 #!/usr/bin/env zsh
 
-brew tap homebrew/services
 brew tap homebrew-ffmpeg/ffmpeg
+brew tap homebrew/cask-drivers
+brew tap homebrew/services
 
 # install additional brew packages -- see _install.sh too
 brew install clipper

install/6_software.sh

@@ -11,6 +11,7 @@ brew install --cask firefox
 brew install --cask forklift
 brew install --cask google-chrome
 brew install --cask hammerspoon
+brew install --cask iina
 brew install --cask imagealpha
 brew install --cask imageoptim
 brew install --cask iterm2
@@ -22,11 +23,10 @@ brew install --cask qlcolorcode
 brew install --cask qlstephen
 brew install --cask sequel-pro
 brew install --cask signal
-brew install --cask skype
 brew install --cask sketch
+brew install --cask skype
 brew install --cask spotify
 brew install --cask telegram
-brew install --cask vlc
 brew install --cask vmware-fusion
 brew install --cask zoom
 
@@ -38,6 +38,11 @@ ln -s ~/dotfiles/karabiner ~/.config/karabiner
 brew install --cask font-fira-code
 brew install --cask ubiquiti-unifi-controller
 
+# Tell unifi-controller to use brew-installed java
+sudo ln -s /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk /Applications/UniFi.app/Contents/PlugIns/adoptopenjdk-8.jdk
+sudo v /Applications/UniFi.app/Contents/Info.plist
+# THEN add this: <key>JVMRuntime</key> <string>adoptopenjdk-8.jdk</string>
+
 # set some options for qlcolorcode
 defaults write org.n8gray.QLColorCode font "Fira Code"
 defaults write org.n8gray.QLColorCode fontSizePoints 9

zsh/aliases

@@ -35,9 +35,9 @@ alias brewup='brew update && brew upgrade && brew cu -a -f -y && brew cleanup'
 alias upall='brewup && npm-check -gu'
 
 # temp fix for dnsmasq-bootup/unifi-java fuckup
-# <key>JVMRuntime</key> <string>adoptopenjdk-8.jdk</string>
 alias dnsmasqfix='sudo brew services stop dnsmasq && sudo mkdir /usr/local/etc/dnsmasq.d && sudo brew services start dnsmasq'
 alias unififix='sudo ln -s /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk /Applications/UniFi.app/Contents/PlugIns/adoptopenjdk-8.jdk && sudo v /Applications/UniFi.app/Contents/Info.plist'
+# THEN: <key>JVMRuntime</key> <string>adoptopenjdk-8.jdk</string>
 
 # other often used stuff, mostly node/npm
 alias ns="npm start"
@@ -52,9 +52,4 @@ alias dnsflush='sudo dscacheutil -flushcache'
 alias lock="/System/Library/CoreServices/Menu\ Extras/User.menu/Contents/Resources/CGSession -suspend"
 
 # imagemagick downsampling shortcuts (c&p retina folder, run, done!)
-alias jpg25='mogrify -format jpg -resize 25% -strip -quality 80 *.jpg'
-alias jpg50='mogrify -format jpg -resize 50% -strip -quality 80 *.jpg'
-alias png25='mogrify -format png -resize 25% -strip -quality 80 *.png'
-alias png50='mogrify -format png -resize 50% -strip -quality 80 *.png'
-alias webimg='mogrify -format jpg -resize 1600x1600 -strip -quality 70'
 alias anigif='convert -delay 12 -loop 0 *.jpg animated.gif'

zsh/functions

@@ -69,3 +69,8 @@ webvideo720p () {
 webvideoposter () {
   ffmpeg -ss 00:00:02 -i $1 -frames:v 1 $1.jpg
 }
+
+webgallery () {
+  mogrify -format jpg -resize '47.6190476%' -strip -quality 75 *.HEIC
+  rm *.HEIC
+}

zsh/zsh-completions

@@ -1 +1 @@
-Subproject commit f1ab6110ced9b5451e2125214497fedd270414c7
+Subproject commit 43fecdfe87312aaecaa2310dfbd629d8c2eca442