Merge branch 'dev' into dev

archx.sh

@@ -187,7 +187,7 @@ pacman_setup(){
 		echo "Waiting for pacman database to become available..."
 		sleep 5
 	done
-	sed '7iServer = https://arch.zotan.services/$repo/os/$arch\n' /etc/pacman.d/mirrorlist > /etc/pacman.d/mirrors
+	sed '7iServer = https://repo.ztn.sh/archlinux/$repo/os/$arch\n' /etc/pacman.d/mirrorlist > /etc/pacman.d/mirrors
 	mv /etc/pacman.d/mirrors /etc/pacman.d/mirrorlist
 	pacman -Sy --needed --noconfirm archlinux-keyring
 	pacman -S --needed --noconfirm arch-install-scripts
@@ -207,11 +207,11 @@ partition_disk(){
 	if [[ $efi -eq 1 ]]; then
 		sgdisk $disk -n=1:0:+1024M -t=1:ef00
 		sgdisk $disk -n=2:0:-$swapsize
-		sgdisk $disk -n=3:0:0 -t=2:8200
+		sgdisk $disk -n=3:0:0 -t=3:8200
 	else
 		sgdisk $disk -n=1:0:+1M -t=1:ef02
 		sgdisk $disk -n=2:0:-$swapsize
-		sgdisk $disk -n=3:0:0 -t=2:8200
+		sgdisk $disk -n=3:0:0 -t=3:8200
 	fi
 
 	# Special naming for eMMC and NVME devices

macx-resources/Brewfile

@@ -52,6 +52,7 @@ brew "smartmontools"
 brew "wireguard-tools"
 
 ## development
+brew "go"
 brew "gcc"
 brew "glib"
 brew "make"
@@ -93,17 +94,17 @@ cask "telegram"
 ## documents and synchronization
 cask "obsidian"
 cask "syncthing"
-cask "google-drive"
 #cask "mactex-no-gui" # disabled for disk space reasons
 
 ## data transfer and encryption
 cask "transmit"
-cask "gpg-suite"
+cask "gpg-suite-no-mail"
 cask "tor-browser"
 cask "balenaetcher"
 cask "monero-wallet"
 
 ## development
+cask "kicad"
 cask "hex-fiend"
 cask "jetbrains-toolbox"
 
@@ -156,7 +157,6 @@ cask "telegram-desktop"
 brew "mas"
 
 ## Development
-mas "Xcode", id: 497799835
 mas "Apple Configurator", id: 1037126344
 
 ## iLife
@@ -165,6 +165,7 @@ mas "Numbers", id: 409203825
 mas "Pages", id: 409201541
 
 ## Other
+mas "Mona for Mastodon", id: 1659154653
 mas "Amphetamine", id: 937984704
 mas "Navigator", id: 1590354537
 mas "Reeder", id: 1529448980

macx-resources/zshrc

@@ -13,7 +13,7 @@ if type brew &>/dev/null; then
 fi
 
 checkin () {
-  curl -H 'Authorization: Bearer replace_me_with_secret' -d '{"reason": "ping", "status": {"checkedIn": true, "train": {"type": "'$1'", "no": "'$2'"}, "toStation": {"name": "'$3'"}}}' https://zotan.pw/travelynx.php
+  curl -H "Authorization: Bearer $(cat ~/.os-bootstrap/secrets/travelynx_token)" -d '{"reason": "ping", "status": {"checkedIn": true, "train": {"type": "'$1'", "no": "'$2'"}, "toStation": {"name": "'$3'"}}}' https://zotan.pw/travelynx.php
 }
 
 # editor aliases
@@ -40,4 +40,4 @@ alias 'wg-reconnect'='sudo wg-quick down uplink && sudo wg-quick up uplink'
 alias dotnet-autocompile='dotnet publish --self-contained -p:PublishSingleFile=true -p:DebugType=embedded -p:EnableCompressionInSingleFile=false -p:PublishReadyToRun=true -p:PublishTrimmed=true -p:TrimmerSingleWarn=false -p:SuppressTrimAnalysisWarnings=false -p:DebuggerSupport=false -c Release -r osx-arm64 && dotnet publish --self-contained -p:PublishSingleFile=true -p:DebugType=embedded -p:EnableCompressionInSingleFile=true -p:PublishReadyToRun=true -p:PublishTrimmed=true -p:TrimmerSingleWarn=false -p:SuppressTrimAnalysisWarnings=false -p:DebuggerSupport=false -c Release -r osx-x64 && dotnet publish --self-contained -p:PublishSingleFile=true -p:DebugType=embedded -p:EnableCompressionInSingleFile=true -p:PublishReadyToRun=true -p:PublishTrimmed=true -p:TrimmerSingleWarn=false -p:SuppressTrimAnalysisWarnings=false -p:DebuggerSupport=false -c Release -r linux-x64 && dotnet publish --self-contained -p:PublishSingleFile=true -p:DebugType=embedded -p:EnableCompressionInSingleFile=true -p:PublishReadyToRun=true -p:PublishTrimmed=true -p:TrimmerSingleWarn=false -p:SuppressTrimAnalysisWarnings=false -p:DebuggerSupport=false -c Release -r win-x64'
 alias dotnet-autocompile-notrim='dotnet publish --self-contained -p:PublishSingleFile=true -p:DebugType=embedded -p:EnableCompressionInSingleFile=false -p:PublishReadyToRun=true -p:TrimmerSingleWarn=false -p:SuppressTrimAnalysisWarnings=false -p:DebuggerSupport=false -c Release -r osx-arm64 && dotnet publish --self-contained -p:PublishSingleFile=true -p:DebugType=embedded -p:EnableCompressionInSingleFile=true -p:PublishReadyToRun=true -p:TrimmerSingleWarn=false -p:SuppressTrimAnalysisWarnings=false -p:DebuggerSupport=false -c Release -r osx-x64 && dotnet publish --self-contained -p:PublishSingleFile=true -p:DebugType=embedded -p:EnableCompressionInSingleFile=true -p:PublishReadyToRun=true -p:TrimmerSingleWarn=false -p:SuppressTrimAnalysisWarnings=false -p:DebuggerSupport=false -c Release -r linux-x64 && dotnet publish --self-contained -p:PublishSingleFile=true -p:DebugType=embedded -p:EnableCompressionInSingleFile=true -p:PublishReadyToRun=true -p:TrimmerSingleWarn=false -p:SuppressTrimAnalysisWarnings=false -p:DebuggerSupport=false -c Release -r win-x64'
 alias dotnet-autocompile-maconly='dotnet publish --self-contained -p:PublishSingleFile=true -p:DebugType=embedded -p:EnableCompressionInSingleFile=false -p:PublishReadyToRun=true -p:PublishTrimmed=true -p:TrimmerSingleWarn=false -p:SuppressTrimAnalysisWarnings=false -p:DebuggerSupport=false -c Release -r osx-arm64'
-alias dotnet-autocompile-maconly-notrim='dotnet publish --self-contained -p:PublishSingleFile=true -p:DebugType=embedded -p:EnableCompressionInSingleFile=false -p:PublishReadyToRun=true -p:TrimmerSingleWarn=false -p:SuppressTrimAnalysisWarnings=false -p:DebuggerSupport=false -c Release -r osx-arm64'
+alias dotnet-autocompile-maconly-notrim='dotnet publish --self-contained -p:PublishSingleFile=true -p:DebugType=embedded -p:EnableCompressionInSingleFile=false -p:PublishReadyToRun=true -p:TrimmerSingleWarn=false -p:SuppressTrimAnalysisWarnings=false -p:DebuggerSupport=false -c Release -r osx-arm64'

macx.sh

@@ -3,26 +3,32 @@
 clear
 echo "macx.sh by ~zotan, bootstrapping system..."
 echo
+echo "--- Opening sudo session ---"
+# From https://gist.github.com/cowboy/3118588
+sudo -v
+while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null &
+caffeinate -disu -w $$ &
+echo
 echo "--- Installing Rosetta 2 ---"
 /usr/sbin/softwareupdate --install-rosetta --agree-to-license
 
 echo
 echo "--- Installing homebrew ---"
 set -e
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 (echo; echo 'eval "$(/opt/homebrew/bin/brew shellenv)"') >> ~/.zprofile
 eval "$(/opt/homebrew/bin/brew shellenv)"
 export HOMEBREW_CASK_OPTS="--no-quarantine"
 set +e
 
 echo
-echo "--- Downloading Brewfile ---"
-mkdir -p ~/Projects
-git clone https://git.ztn.sh/zotan/os-install-scripts ~/Projects/os-install-scripts
+echo "--- Cloning os-bootstrap-core ---"
+mkdir ~/.os-bootstrap
+git clone https://git.ztn.sh/zotan/os-bootstrap-core ~/.os-bootstrap/core
 
 echo
 echo "--- Linking to system Brewfile ---"
-ln -s ~/Projects/os-install-scripts/macx-resources/Brewfile ~/.Brewfile
+ln -s ~/.os-bootstrap/core/macx-resources/Brewfile ~/.Brewfile
 
 echo
 echo "--- Running brew bundle ---"