forked from zotan/os-bootstrap-core
Merge branch 'dev' into dev
This commit is contained in:
commit
b8d881c49f
6
archx.sh
6
archx.sh
|
@ -187,7 +187,7 @@ pacman_setup(){
|
||||||
echo "Waiting for pacman database to become available..."
|
echo "Waiting for pacman database to become available..."
|
||||||
sleep 5
|
sleep 5
|
||||||
done
|
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
|
mv /etc/pacman.d/mirrors /etc/pacman.d/mirrorlist
|
||||||
pacman -Sy --needed --noconfirm archlinux-keyring
|
pacman -Sy --needed --noconfirm archlinux-keyring
|
||||||
pacman -S --needed --noconfirm arch-install-scripts
|
pacman -S --needed --noconfirm arch-install-scripts
|
||||||
|
@ -207,11 +207,11 @@ partition_disk(){
|
||||||
if [[ $efi -eq 1 ]]; then
|
if [[ $efi -eq 1 ]]; then
|
||||||
sgdisk $disk -n=1:0:+1024M -t=1:ef00
|
sgdisk $disk -n=1:0:+1024M -t=1:ef00
|
||||||
sgdisk $disk -n=2:0:-$swapsize
|
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
|
else
|
||||||
sgdisk $disk -n=1:0:+1M -t=1:ef02
|
sgdisk $disk -n=1:0:+1M -t=1:ef02
|
||||||
sgdisk $disk -n=2:0:-$swapsize
|
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
|
fi
|
||||||
|
|
||||||
# Special naming for eMMC and NVME devices
|
# Special naming for eMMC and NVME devices
|
||||||
|
|
|
@ -52,6 +52,7 @@ brew "smartmontools"
|
||||||
brew "wireguard-tools"
|
brew "wireguard-tools"
|
||||||
|
|
||||||
## development
|
## development
|
||||||
|
brew "go"
|
||||||
brew "gcc"
|
brew "gcc"
|
||||||
brew "glib"
|
brew "glib"
|
||||||
brew "make"
|
brew "make"
|
||||||
|
@ -93,17 +94,17 @@ cask "telegram"
|
||||||
## documents and synchronization
|
## documents and synchronization
|
||||||
cask "obsidian"
|
cask "obsidian"
|
||||||
cask "syncthing"
|
cask "syncthing"
|
||||||
cask "google-drive"
|
|
||||||
#cask "mactex-no-gui" # disabled for disk space reasons
|
#cask "mactex-no-gui" # disabled for disk space reasons
|
||||||
|
|
||||||
## data transfer and encryption
|
## data transfer and encryption
|
||||||
cask "transmit"
|
cask "transmit"
|
||||||
cask "gpg-suite"
|
cask "gpg-suite-no-mail"
|
||||||
cask "tor-browser"
|
cask "tor-browser"
|
||||||
cask "balenaetcher"
|
cask "balenaetcher"
|
||||||
cask "monero-wallet"
|
cask "monero-wallet"
|
||||||
|
|
||||||
## development
|
## development
|
||||||
|
cask "kicad"
|
||||||
cask "hex-fiend"
|
cask "hex-fiend"
|
||||||
cask "jetbrains-toolbox"
|
cask "jetbrains-toolbox"
|
||||||
|
|
||||||
|
@ -156,7 +157,6 @@ cask "telegram-desktop"
|
||||||
brew "mas"
|
brew "mas"
|
||||||
|
|
||||||
## Development
|
## Development
|
||||||
mas "Xcode", id: 497799835
|
|
||||||
mas "Apple Configurator", id: 1037126344
|
mas "Apple Configurator", id: 1037126344
|
||||||
|
|
||||||
## iLife
|
## iLife
|
||||||
|
@ -165,6 +165,7 @@ mas "Numbers", id: 409203825
|
||||||
mas "Pages", id: 409201541
|
mas "Pages", id: 409201541
|
||||||
|
|
||||||
## Other
|
## Other
|
||||||
|
mas "Mona for Mastodon", id: 1659154653
|
||||||
mas "Amphetamine", id: 937984704
|
mas "Amphetamine", id: 937984704
|
||||||
mas "Navigator", id: 1590354537
|
mas "Navigator", id: 1590354537
|
||||||
mas "Reeder", id: 1529448980
|
mas "Reeder", id: 1529448980
|
||||||
|
|
|
@ -13,7 +13,7 @@ if type brew &>/dev/null; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
checkin () {
|
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
|
# 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='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-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='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'
|
||||||
|
|
16
macx.sh
16
macx.sh
|
@ -3,26 +3,32 @@
|
||||||
clear
|
clear
|
||||||
echo "macx.sh by ~zotan, bootstrapping system..."
|
echo "macx.sh by ~zotan, bootstrapping system..."
|
||||||
echo
|
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 ---"
|
echo "--- Installing Rosetta 2 ---"
|
||||||
/usr/sbin/softwareupdate --install-rosetta --agree-to-license
|
/usr/sbin/softwareupdate --install-rosetta --agree-to-license
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "--- Installing homebrew ---"
|
echo "--- Installing homebrew ---"
|
||||||
set -e
|
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
|
(echo; echo 'eval "$(/opt/homebrew/bin/brew shellenv)"') >> ~/.zprofile
|
||||||
eval "$(/opt/homebrew/bin/brew shellenv)"
|
eval "$(/opt/homebrew/bin/brew shellenv)"
|
||||||
export HOMEBREW_CASK_OPTS="--no-quarantine"
|
export HOMEBREW_CASK_OPTS="--no-quarantine"
|
||||||
set +e
|
set +e
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "--- Downloading Brewfile ---"
|
echo "--- Cloning os-bootstrap-core ---"
|
||||||
mkdir -p ~/Projects
|
mkdir ~/.os-bootstrap
|
||||||
git clone https://git.ztn.sh/zotan/os-install-scripts ~/Projects/os-install-scripts
|
git clone https://git.ztn.sh/zotan/os-bootstrap-core ~/.os-bootstrap/core
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "--- Linking to system Brewfile ---"
|
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
|
||||||
echo "--- Running brew bundle ---"
|
echo "--- Running brew bundle ---"
|
||||||
|
|
Loading…
Reference in a new issue