Merge branch 'dev' into dev

Reviewed-on: zenja/archx#1

archx.sh

@@ -432,7 +432,7 @@ postinstall_cli(){
 
 	curl https://share.zotan.services/repo.sh | bash
 	killall gpg-agent
-	pacman -Syu --needed --noconfirm git haveged neofetch htop dialog zsh kernel-modules-hook nftables yay
+	pacman -Syu --needed --noconfirm git haveged neofetch htop dialog zsh kernel-modules-hook nftables yay vnstat
 	systemctl enable haveged sshd
 
 	sed -i 's%#PasswordAuthentication yes%PasswordAuthentication no%g' /etc/ssh/sshd_config
@@ -467,6 +467,8 @@ postinstall_cli(){
 	if [[ -z $cinetwork ]]; then
 		systemctl enable dhcpcd
 	fi
+	
+	systemctl enable vnstat
 
 	chsh -s /bin/zsh $user
 	chsh -s /bin/zsh root
@@ -474,8 +476,10 @@ postinstall_cli(){
 	sudo -u $user zsh /tmp/prezto.sh
 	zsh /tmp/prezto.sh
 
-	btrfs subvolume snapshot / /.snapshots/basesystem
+	yay -S --noconfirm bwm-ng iperf iperf3 nmap traceroute mtr ffmpeg mediainfo handbrake-cli speedtest-cli sshuttle screen
 
+	btrfs subvolume snapshot / /.snapshots/basesystem
+	
 EOS
 }
 
@@ -483,7 +487,7 @@ postinstall_xorg(){
 	postinstall_cli
 	archchroot "/bin/bash" <<"EOS"
 	set -eo pipefail
-	pacman -S --needed --noconfirm xorg-server xorg-drivers ttf-opensans ttf-dejavu ttf-hack ttf-liberation networkmanager
+	pacman -S --needed --noconfirm xorg-server xorg-drivers ttf-opensans ttf-dejavu ttf-hack ttf-liberation networkmanager yt-dlp
 EOS
 	if [[ "$keylayout" == "us" ]]; then
 		return
@@ -665,4 +669,4 @@ archchroot(){
   arch-chroot /mnt $1
 }
 
-main $@
+main $@

macx-resources/Brewfile

@@ -4,7 +4,10 @@
 
 # taps
 tap "homebrew/bundle"
+tap "homebrew/cask"
+tap "homebrew/cask-drivers"
 tap "homebrew/cask-versions"
+tap "homebrew/core"
 tap "homebrew/services"
 tap "osx-cross/arm"
 tap "osx-cross/avr"
@@ -26,7 +29,6 @@ brew "whois"
 brew "watch"
 brew "stress"
 brew "iperf3"
-brew "gnu-sed"
 brew "ripgrep"
 brew "openssh"
 brew "iproute2mac"
@@ -53,7 +55,6 @@ brew "wireguard-tools"
 brew "go"
 brew "gcc"
 brew "glib"
-brew "node"
 brew "make"
 brew "cmake"
 brew "ninja"
@@ -63,32 +64,25 @@ brew "python"
 brew "git-lfs"
 brew "autoconf"
 brew "automake"
-brew "corepack"
 brew "uncrustify"
 brew "platformio"
-brew "rustup-init"
 brew "clang-format"
-brew "postgresql@14"
-brew "rust-analyzer"
 #brew "qmk/qmk/qmk" # FIXME: pillow dependency is currently broken
+brew "rustup-init"
+brew "rust-analyzer"
 
 # desktop apps
 ## basic / UX improvements
-cask "vivid"
 cask "iterm2"
 cask "alfred"
 cask "itsycal"
-cask "todoist"
 cask "contexts"
 cask "topnotch"
+cask "bartender"
 cask "rectangle"
-cask "appcleaner"
-cask "bluesnooze"
-cask "replacicon"
 cask "sublime-text"
 cask "sublime-merge"
 cask "google-chrome"
-#cask "bartender" # use setapp version instead
 
 ## messengers
 cask "nheko"
@@ -120,14 +114,11 @@ cask "mpv"
 cask "iina"
 cask "gimp"
 cask "mp3tag"
-cask "aegisub"
 cask "calibre"
 cask "spotify"
 cask "audacity"
 cask "avidemux"
 cask "inkscape"
-cask "engine-dj"
-cask "virtualdj"
 cask "fl-studio"
 cask "affinity-photo"
 
@@ -144,13 +135,11 @@ cask "pokemon-trading-card-game-online"
 ## system
 cask "utm"
 cask "maciasl"
-cask "parallels"
 cask "daisydisk"
 cask "little-snitch"
 cask "plistedit-pro"
 cask "amorphousdiskmark"
 cask "carbon-copy-cloner"
-#cask "istat-menus" # use setapp version instead
 
 ## networking
 cask "viscosity"

macx.sh

@@ -49,9 +49,6 @@ killall Dock
 echo "Disabling font smoothing"
 defaults -currentHost write -g AppleFontSmoothing -int 0
 
-echo "Disabling screenshot shadows"
-defaults write com.apple.screencapture disable-shadow -bool true
-
 echo "Fixing dotnet symlink"
 sudo ln -s /opt/homebrew/opt/dotnet/libexec /usr/local/share/dotnet