From b28158a9c244a48ca8ca9868572f1a0dae91d18f Mon Sep 17 00:00:00 2001
From: Christoffer Martinsson <cm@cmtec.se>
Date: Sat, 23 Nov 2024 11:41:51 +0100
Subject: [PATCH] Testing

---
 config/hypr/hyprland.conf | 11 +++--
 update.sh                 | 95 +++++++++++++++++++++------------------
 2 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index baaf1bc..f250266 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -45,8 +45,11 @@ $menu = wofi --show drun
 
 # Autostart necessary processes (like notifications daemons, status bars, etc.)
 # Or execute your favorite apps at launch like this:
+exec = gsettings set org.gnome.desktop.interface gtk-theme "Adwaita:dark"   # for GTK3 apps
+exec = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"   # for GTK4 apps
 
-exec-once = waybar 
+
+# exec-once = waybar 
 exec-once = $terminal
 exec-once = $browser
 # exec-once = nm-applet &
@@ -61,6 +64,8 @@ exec-once = $browser
 
 env = XCURSOR_SIZE,24
 env = HYPRCURSOR_SIZE,24
+env = QT_QPA_PLATFORM,wayland
+env = QT_QPA_PLATFORMTHEME,qt5ct   # for Qt apps
 
 
 #####################
@@ -106,7 +111,7 @@ decoration {
 
     # https://wiki.hyprland.org/Configuring/Variables/#blur
     blur {
-        enabled = true
+        enabled = false
         size = 3
         passes = 1
 
@@ -211,7 +216,7 @@ device {
 ###################
 
 # See https://wiki.hyprland.org/Configuring/Keywords/
-$mainMod = SUPER # Sets "Windows" key as main modifier
+$mainMod = SHIFT ALT # Sets "Windows" key as main modifier
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
 bind = $mainMod, Q, exec, $terminal
diff --git a/update.sh b/update.sh
index e8766eb..266cabb 100755
--- a/update.sh
+++ b/update.sh
@@ -38,8 +38,11 @@ if [ "$OS" == "Ubuntu" ]; then
 	sudo apt install -y imagemagick gpg ninja-build gettext cmake unzip curl python3 python3-pip python3-venv \
 		build-essential libssl-dev libffi-dev python3-dev file tmux libudev-dev pkg-config locales pipx btop ncdu ranger
 elif [ "$OS" == "Arch Linux" ]; then
-	sudo pacman --noconfirm -Suyy hyperland gnome-keyring pipewire git base-devel cmake gawk wget gettext unzip curl python python-pip python-pipx python-pipenv python-pynvim tmux btop ncdu ranger
-	if [ ! pacman -Qs yay ] >/dev/null; then
+	sudo pacman -Suyy --noconfirm
+	if pacman -Qs yay >/dev/null; then
+		yay --noconfirm --aur
+	else
+		sudo pacman -S --needed --noconfirm git base-devel
 		if [ -d ~/yay-bin ]; then rm -rf ~/yay-bin; fi
 		cd ~
 		git clone https://aur.archlinux.org/yay-bin.git
@@ -48,7 +51,11 @@ elif [ "$OS" == "Arch Linux" ]; then
 		cd ~
 		if [ -d ~/yay-bin ]; then rm -rf ~/yay-bin; fi
 	fi
-	yay --noconfirm -S archlinux-tweak-tool-git
+	sudo pacman --noconfirm --needed -S hyprland gnome-keyring pipewire git base-devel cmake gawk wget gettext unzip curl python python-pip python-pipx python-pipenv python-pynvim tmux btop ncdu ranger qt5ct qt6ct gnome-themes-extra
+
+	yay --noconfirm -S --needed --aur archlinux-tweak-tool-git
+	yay --noconfirm -S --needed --aur adwaita-qt5-git
+	yay --noconfirm -S --needed --aur adwaita-qt6-git
 fi
 # Setup locals
 printf -- '\033[33m Setup locals\n\033[37m'
@@ -106,7 +113,7 @@ if [ "$OS" == "Ubuntu" ]; then
 	cd build && cpack -G DEB && sudo dpkg -i nvim-linux64.deb
 	if [ -d ~/neovim ]; then rm -rf ~/neovim; fi
 elif [ "$OS" == "Arch Linux" ]; then
-	sudo pacman --noconfirm -S neovim
+	sudo pacman --noconfirm --needed -S neovim
 fi
 
 # Install fd
@@ -114,7 +121,7 @@ printf -- '\033[33m Installing fd\n\033[37m'
 if [ "$OS" == "Ubuntu" ]; then
 	sudo apt install -y fd-find
 elif [ "$OS" == "Arch Linux" ]; then
-	sudo pacman --noconfirm -S fd
+	sudo pacman --noconfirm --needed -S fd
 fi
 
 # Install lazygit
@@ -135,7 +142,7 @@ if [ "$OS" == "Ubuntu" ]; then
 	sudo apt update
 	sudo apt install -y gdu
 elif [ "$OS" == "Arch Linux" ]; then
-	sudo pacman --noconfirm -S gdu
+	sudo pacman --noconfirm --needed -S gdu
 fi
 
 # Install ruby
@@ -144,7 +151,7 @@ if [ "$OS" == "Ubuntu" ]; then
 	sudo apt install -y ruby ruby-dev
 	sudo gem install neovim
 elif [ "$OS" == "Arch Linux" ]; then
-	sudo pacman --noconfirm -S ruby
+	sudo pacman --noconfirm --needed -S ruby
 fi
 
 # Install bottom
@@ -155,7 +162,7 @@ if [ "$OS" == "Ubuntu" ]; then
 	sudo dpkg -i bottom_0.9.1_amd64.deb
 	rm ~/bottom_0.9.1_amd64.deb
 elif [ "$OS" == "Arch Linux" ]; then
-	sudo pacman --noconfirm -S bottom
+	sudo pacman --noconfirm --needed -S bottom
 fi
 
 # Install go
@@ -163,7 +170,7 @@ printf -- '\033[33m Installing go\n\033[37m'
 if [ "$OS" == "Ubuntu" ]; then
 	sudo apt install -y golang
 elif [ "$OS" == "Arch Linux" ]; then
-	sudo pacman --noconfirm -S go
+	sudo pacman --noconfirm --needed -S go
 fi
 
 # Install php
@@ -171,7 +178,7 @@ printf -- '\033[33m Installing php\n\033[37m'
 if [ "$OS" == "Ubuntu" ]; then
 	sudo apt install -y php php-curl php-xml php-mbstring
 elif [ "$OS" == "Arch Linux" ]; then
-	sudo pacman --noconfirm -S php
+	sudo pacman --noconfirm --needed -S php
 fi
 
 # Install luarocks
@@ -179,7 +186,7 @@ printf -- '\033[33m Installing luarocks\n\033[37m'
 if [ "$OS" == "Ubuntu" ]; then
 	sudo apt install -y luarocks
 elif [ "$OS" == "Arch Linux" ]; then
-	sudo pacman --noconfirm -S luarocks
+	sudo pacman --noconfirm --needed -S luarocks
 fi
 
 # Install composer
@@ -187,7 +194,7 @@ printf -- '\033[33m Installing composer\n\033[37m'
 if [ "$OS" == "Ubuntu" ]; then
 	sudo apt install -y composer
 elif [ "$OS" == "Arch Linux" ]; then
-	sudo pacman --noconfirm -S composer
+	sudo pacman --noconfirm --needed -S composer
 fi
 
 # Install java
@@ -195,7 +202,7 @@ printf -- '\033[33m Installing java\n\033[37m'
 if [ "$OS" == "Ubuntu" ]; then
 	sudo apt install -y default-jdk
 elif [ "$OS" == "Arch Linux" ]; then
-	sudo pacman --noconfirm -S jdk-openjdk
+	sudo pacman --noconfirm --needed -S jdk-openjdk
 fi
 
 # Install julia
@@ -215,7 +222,7 @@ if [ "$OS" == "Ubuntu" ]; then
 	sudo apt install -y nodejs
 	npm config set prefix "${HOME}/.npm"
 elif [ "$OS" == "Arch Linux" ]; then
-	sudo pacman --noconfirm -S nodejs npm
+	sudo pacman --noconfirm --needed -S nodejs npm
 fi
 
 # Install ble.sh
@@ -223,7 +230,7 @@ printf -- '\033[33m Installing ble.sh\n\033[37m'
 if [ "$OS" == "Ubuntu" ]; then
 	sudo apt install gawk
 elif [ "$OS" == "Arch Linux" ]; then
-	sudo pacman --noconfirm -S gawk
+	sudo pacman --noconfirm --needed -S gawk
 fi
 if [ -d ~/ble.sh ]; then rm -rf ~/ble.sh; fi
 cd ~
@@ -241,7 +248,7 @@ if [ "$OS" == "Ubuntu" ]; then
 		pip3 install platformio
 	fi
 elif [ "$OS" == "Arch Linux" ]; then
-	sudo pacman --noconfirm -S platformio-core
+	sudo pacman --noconfirm --needed -S platformio-core
 fi
 
 # Install pynvim
@@ -266,7 +273,7 @@ if [ "$DESKTOP" == "yes" ] || [ "$OS" == "Arch Linux" ]; then
 		sudo apt update
 		sudo apt install -y flatpak
 	elif [ "$OS" == "Arch Linux" ]; then
-		sudo pacman --noconfirm -S flatpak
+		sudo pacman --noconfirm --needed -S flatpak
 	fi
 	flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 
@@ -289,14 +296,14 @@ if [ "$DESKTOP" == "yes" ] || [ "$OS" == "Arch Linux" ]; then
 	flatpak install -y flathub com.jgraph.drawio.desktop
 
 	# Install VSCode
-	printf -- '\033[33m Installing VSCode\n\033[37m'
 	if [ "$OS" == "Ubuntu" ]; then
+		printf -- '\033[33m Installing VSCode\n\033[37m'
 		sudo snap install --classic code
 	fi
 
 	# Install gnome-shell-extension-manager
-	printf -- '\033[33m Installing gnome-shell-extension-manager\n\033[37m'
 	if [ "$OS" == "Ubuntu" ]; then
+		printf -- '\033[33m Installing gnome-shell-extension-manager\n\033[37m'
 		sudo apt install -y gnome-shell-extension-manager
 	fi
 
@@ -305,12 +312,12 @@ if [ "$DESKTOP" == "yes" ] || [ "$OS" == "Arch Linux" ]; then
 	if [ "$OS" == "Ubuntu" ]; then
 		sudo apt install -y remmina
 	elif [ "$OS" == "Arch Linux" ]; then
-		sudo pacman --noconfirm -S remmina
+		sudo pacman --noconfirm --needed -S remmina
 	fi
 
 	# Install gnome tweaks
-	printf -- '\033[33m Installing gnome tweaks\n\033[37m'
 	if [ "$OS" == "Ubuntu" ]; then
+		printf -- '\033[33m Installing gnome tweaks\n\033[37m'
 		sudo apt install -y gnome-tweaks
 	fi
 
@@ -319,7 +326,7 @@ if [ "$DESKTOP" == "yes" ] || [ "$OS" == "Arch Linux" ]; then
 	if [ "$OS" == "Ubuntu" ]; then
 		sudo apt install -y feh
 	elif [ "$OS" == "Arch Linux" ]; then
-		sudo pacman --noconfirm -S feh
+		sudo pacman --noconfirm --needed -S feh
 	fi
 
 	# Install NerdFonts
@@ -334,14 +341,17 @@ if [ "$DESKTOP" == "yes" ] || [ "$OS" == "Arch Linux" ]; then
 	rm NerdFontsSymbolsOnly.zip
 	fc-cache -fv
 
-	# # Install Wezterm
-	# printf -- '\033[33m Installing wezterm\n\033[37m'
-	# if [ "$OS" == "Ubuntu" ]; then
-	# 	curl -fsSL https://apt.fury.io/wez/gpg.key | sudo gpg --yes --dearmor -o /usr/share/keyrings/wezterm-fury.gpg
-	# 	echo 'deb [signed-by=/usr/share/keyrings/wezterm-fury.gpg] https://apt.fury.io/wez/ * *' | sudo tee /etc/apt/sources.list.d/wezterm.list
-	# 	sudo apt update
-	# 	sudo apt install -y wezterm
-	# fi
+	# Install Wezterm
+	if [ "$OS" == "Ubuntu" ]; then
+		printf -- '\033[33m Installing wezterm\n\033[37m'
+		curl -fsSL https://apt.fury.io/wez/gpg.key | sudo gpg --yes --dearmor -o /usr/share/keyrings/wezterm-fury.gpg
+		echo 'deb [signed-by=/usr/share/keyrings/wezterm-fury.gpg] https://apt.fury.io/wez/ * *' | sudo tee /etc/apt/sources.list.d/wezterm.list
+		sudo apt update
+		sudo apt install -y wezterm
+		# Symlink wezterm config
+		printf -- '\033[33m Symlinking wezterm config\n\033[37m'
+		ln -sf ~/code_server/wezterm.lua ~/.wezterm.lua
+	fi
 
 	# Install Brave Browser
 	printf -- '\033[33m Installing Brave Browser\n\033[37m'
@@ -351,17 +361,10 @@ if [ "$DESKTOP" == "yes" ] || [ "$OS" == "Arch Linux" ]; then
 		sudo apt update
 		sudo apt install -y brave-browser
 	elif [ "$OS" == "Arch Linux" ]; then
-		yay --noconfirm -S brave-bin
+		yay --noconfirm -S --needed --aur brave-bin
 	fi
 
-	# # Symlink wezterm config
-	# printf -- '\033[33m Symlinking wezterm config\n\033[37m'
-	# if [ "$OS" == "Ubuntu" ]; then
-	# 	ln -sf ~/code_server/wezterm.lua ~/.wezterm.lua
-	# fi
-
 	# Install Virtualbox
-	# if [ "$(dpkg -l | awk '/virtualbox/ {print }'|wc -l)" -eq 0 ]; then
 	printf -- '\033[33m Installing Virtualbox\n\033[37m'
 	if [ "$OS" == "Ubuntu" ]; then
 		curl https://www.virtualbox.org/download/oracle_vbox_2016.asc | gpg --dearmor >oracle_vbox_2016.gpg
@@ -375,7 +378,8 @@ if [ "$DESKTOP" == "yes" ] || [ "$OS" == "Arch Linux" ]; then
 		wget https://download.virtualbox.org/virtualbox/7.1.4/Oracle_VirtualBox_Extension_Pack-7.1.4.vbox-extpack
 		sudo VBoxManage extpack install --replace Oracle_VirtualBox_Extension_Pack-7.1.4.vbox-extpack --accept-license=eb31505e56e9b4d0fbca139104da41ac6f6b98f8e78968bdf01b1f3da3c4f9ae
 	elif [ "$OS" == "Arch Linux" ]; then
-		sudo pacman --noconfirm -S virtualbox
+		sudo pacman --noconfirm --needed -S virtualbox virtualbox-guest-iso
+		yay --noconfirm -S --needed --aur virtualbox-ext-oracle
 	fi
 	sudo usermod -a -G vboxusers "$USER"
 
@@ -395,11 +399,16 @@ fi
 
 # Install rust
 printf -- '\033[33m Installing Rust\n\033[37m'
-cd ~
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path -y
-source "$HOME/.cargo/env"
-rustup self update
+if [ "$OS" == "Ubuntu" ]; then
+	cd ~
+	curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path -y
+	source "$HOME/.cargo/env"
+	rustup self update
+elif [ "$OS" == "Arch Linux" ]; then
+	sudo pacman --noconfirm --needed -S rustup
+fi
 rustup update stable
+rustup default stable
 
 # Install rust embedded stuff
 printf -- '\033[33m Installing Rust embedded stuff\n\033[37m'