diff --git a/config/hypr/hyprland_CMBOX.conf b/config/hypr/hyprland_CMBOX.conf index 7296bd6..2272d81 100644 --- a/config/hypr/hyprland_CMBOX.conf +++ b/config/hypr/hyprland_CMBOX.conf @@ -18,11 +18,9 @@ exec = gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark" # fo exec = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" # for GTK4 apps exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 +exec-once = udiskie exec-once = waybar -# exec-once = hypridle -# exec-once = /usr/local/bin/pypr --debug /tmp/pypr.log exec-once = systemctl --user start sunshine -# exec-once = input-remapper-control --command autoload exec-once = org.remmina.Remmina -i exec-once = [workspace 1] $terminal diff --git a/config/hypr/hyprland_STEAMBOX.conf b/config/hypr/hyprland_STEAMBOX.conf index a85de38..6999aa7 100644 --- a/config/hypr/hyprland_STEAMBOX.conf +++ b/config/hypr/hyprland_STEAMBOX.conf @@ -17,6 +17,8 @@ exec = gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark" # fo exec = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" # for GTK4 apps exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 +exec-once = sudo udisksctl mount -b /dev/sda1 +exec-once = udiskie exec-once = waybar exec-once = systemctl --user start sunshine @@ -29,7 +31,8 @@ env = XCURSOR_SIZE,24 env = HYPRCURSOR_SIZE,24 env = QT_QPA_PLATFORM,wayland env = QT_QPA_PLATFORMTHEME,qt5ct # for Qt apps - +env = GBM_BACKEND, nvidia-drm +env = __GLX_VENDOR_LIBRARY_NAME, nvidia ##################### ### LOOK AND FEEL ### ##################### diff --git a/update_arch.sh b/update_arch.sh index 45233c9..c80c019 100755 --- a/update_arch.sh +++ b/update_arch.sh @@ -1,5 +1,7 @@ #!/bin/bash set -e +sudo -v + if ! pacman -Qs inetutils >/dev/null; then sudo pacman -Syy --noconfirm inetutils fi @@ -22,6 +24,7 @@ echo -e ' \e[H\e[2J \e[1;32mCMtec '$HOSTNAME' install/Update script\e[0;37m ' +sleep 3 # Create backup/snapshot if pacman -Qs timeshift >/dev/null; then @@ -47,10 +50,6 @@ EOT fi fi -# Symlink bashrc -printf -- '\033[33m Symlinking bashrc config\n\033[37m' -ln -sf ~/linuxbox/bashrc ~/.bashrc - # Update all pacman packages printf -- '\033[33m Updating pacman packages\n\033[37m' sudo pacman -Suyy --noconfirm @@ -59,11 +58,23 @@ sudo pacman -Suyy --noconfirm if [ "$HOSTNAME" == "STEAMBOX" ]; then # Install nvidia drivers printf -- '\033[33m Installing NVIDIA drivers\n\033[37m' + if ! pacman -Qs nvidia-open-dkms >/dev/null; then + NEW_KERNEL="yes" + else + NEW_KERNEL="no" + fi sudo pacman --noconfirm --needed -S base-devel linux-headers git - sudo pacman --noconfirm --needed -S nvidia-open-dkms nvidia-utils lib32-nvidia-utils nvidia-settings opencl-nvidia - + sudo pacman --noconfirm --needed -S nvidia-open-dkms nvidia-utils lib32-nvidia-utils nvidia-settings opencl-nvidia cuda + if [ "$NEW_KERNEL" == "yes" ]; then + printf -- '\033[32m \n\n***** Please reboot and run update once more! *****\n\n\033[37m' + exit + fi fi +# Symlink bashrc +printf -- '\033[33m Symlinking bashrc config\n\033[37m' +ln -sf ~/linuxbox/bashrc ~/.bashrc + # Update all AUR packages printf -- '\033[33m Updating AUR packages\n\033[37m' if pacman -Qs yay >/dev/null; then @@ -107,7 +118,6 @@ sudo pacman --noconfirm --needed -S usbutils plymouth dracut dunst hypridle hypr yay --noconfirm -S --needed --aur adwaita-qt5-git yay --noconfirm -S --needed --aur adwaita-qt6-git -yay --noconfirm -S --needed --aur wlogout yay --noconfirm -S --needed --aur hyprshot mkdir -p ~/.local/bin @@ -159,10 +169,12 @@ sudo touch /etc/security/autologin.conf # Install udisk printf -- '\033[33m Installing udisk\n\033[37m' -sudo pacman --noconfirm --needed -S udisks2 +sudo pacman --noconfirm --needed -S udisks2 udiskie echo 'ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{UDISKS_FILESYSTEM_SHARED}="1"' | sudo tee /etc/udev/rules.d/99-udisks2.rules echo 'D /media 0755 root root 0 -' | sudo tee /etc/tmpfiles.d/media.conf - +if [ "$HOSTNAME" == "STEAMBOX" ]; then + echo "$USER ALL=(ALL:ALL) NOPASSWD: /usr/sbin/udiskie mount -b /dev/sda1" | sudo tee /etc/sudoers.d/udiskie +fi # Install btop printf -- '\033[33m Installing btop\n\033[37m' sudo pacman --noconfirm --needed -S btop