diff --git a/config/hypr/hyprland_CMBOX.conf b/config/hypr/hyprland_CMBOX.conf index fd22f9b..ba68b4f 100644 --- a/config/hypr/hyprland_CMBOX.conf +++ b/config/hypr/hyprland_CMBOX.conf @@ -21,7 +21,6 @@ exec-once = /home/cm/linuxbox/set-xr18-2ch.sh exec-once = udiskie exec-once = waybar exec-once = systemctl --user start sunshine -exec-once = org.remmina.Remmina -i exec-once = [workspace 1] $terminal exec-once = [workspace 2] $browser @@ -301,13 +300,6 @@ windowrulev2 = size 80% 80%, initialTitle:^(Moonlight)$ windowrulev2 = center, initialTitle:^(Moonlight)$ windowrulev2 = dimaround, initialTitle:^(Moonlight)$ -# Remmina -windowrulev2 = workspace emptyn, initialTitle:^(Remmina)$ -windowrulev2 = float, initialTitle:^(Remmina Remote Desktop Client)$ -windowrulev2 = size 80% 80%, initialTitle:^(Remmina Remote Desktop Client)$ -windowrulev2 = center, initialTitle:^(Remmina Remote Desktop Client)$ -windowrulev2 = dimaround, initialTitle:^(Remmina Remote Desktop Client)$ - # KiCad windowrulev2 = workspace emptyn, initialTitle:^(.*KiCad.*)$ windowrulev2 = workspace emptyn, initialTitle:^(.*PCB Editor.*)$ diff --git a/config/hypr/hyprland_LABBOX.conf b/config/hypr/hyprland_LABBOX.conf index 2659cba..7ad91bf 100644 --- a/config/hypr/hyprland_LABBOX.conf +++ b/config/hypr/hyprland_LABBOX.conf @@ -20,7 +20,6 @@ exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec-once = udiskie exec-once = waybar exec-once = systemctl --user start sunshine -exec-once = org.remmina.Remmina -i exec-once = [workspace 1] $terminal exec-once = [workspace 2] $browser @@ -300,13 +299,6 @@ windowrulev2 = size 80% 80%, initialTitle:^(Moonlight)$ windowrulev2 = center, initialTitle:^(Moonlight)$ windowrulev2 = dimaround, initialTitle:^(Moonlight)$ -# Remmina -windowrulev2 = workspace emptyn, initialTitle:^(Remmina)$ -windowrulev2 = float, initialTitle:^(Remmina Remote Desktop Client)$ -windowrulev2 = size 80% 80%, initialTitle:^(Remmina Remote Desktop Client)$ -windowrulev2 = center, initialTitle:^(Remmina Remote Desktop Client)$ -windowrulev2 = dimaround, initialTitle:^(Remmina Remote Desktop Client)$ - # KiCad windowrulev2 = workspace emptyn, initialTitle:^(.*KiCad.*)$ windowrulev2 = workspace emptyn, initialTitle:^(.*PCB Editor.*)$ diff --git a/config/hypr/hyprland_SIMONBOX.conf b/config/hypr/hyprland_SIMONBOX.conf index bbaf62d..31b906c 100644 --- a/config/hypr/hyprland_SIMONBOX.conf +++ b/config/hypr/hyprland_SIMONBOX.conf @@ -297,13 +297,6 @@ windowrulev2 = float, onworkspace:special:mixer windowrulev2 = size 80% 80%, onworkspace:special:mixer workspace = special:mixer, on-created-empty:pavucontrol -# Remmina -windowrulev2 = workspace emptyn, initialTitle:^(Remmina)$ -windowrulev2 = float, initialTitle:^(Remmina Remote Desktop Client)$ -windowrulev2 = size 80% 80%, initialTitle:^(Remmina Remote Desktop Client)$ -windowrulev2 = center, initialTitle:^(Remmina Remote Desktop Client)$ -windowrulev2 = dimaround, initialTitle:^(Remmina Remote Desktop Client)$ - # Ignore maximize requests from apps. You'll probably like this. windowrulev2 = suppressevent maximize, class:.* diff --git a/config/hypr/hyprland_STEAMBOX.conf b/config/hypr/hyprland_STEAMBOX.conf index 6431b5d..ada3f25 100644 --- a/config/hypr/hyprland_STEAMBOX.conf +++ b/config/hypr/hyprland_STEAMBOX.conf @@ -272,7 +272,7 @@ windowrulev2 = float, onworkspace:special:ranger windowrulev2 = size 80% 80%, onworkspace:special:ranger workspace = special:ranger, on-created-empty:kitty ranger -# Wivrn +# Envision windowrulev2 = float, onworkspace:special:envision windowrulev2 = size 80% 80%, onworkspace:special:envision workspace = special:envision, on-created-empty:envision @@ -306,13 +306,6 @@ windowrulev2 = size 80% 80%, initialTitle:^(Moonlight)$ windowrulev2 = center, initialTitle:^(Moonlight)$ windowrulev2 = dimaround, initialTitle:^(Moonlight)$ -# Remmina -windowrulev2 = workspace emptyn, initialTitle:^(Remmina)$ -windowrulev2 = float, initialTitle:^(Remmina Remote Desktop Client)$ -windowrulev2 = size 80% 80%, initialTitle:^(Remmina Remote Desktop Client)$ -windowrulev2 = center, initialTitle:^(Remmina Remote Desktop Client)$ -windowrulev2 = dimaround, initialTitle:^(Remmina Remote Desktop Client)$ - # KiCad windowrulev2 = workspace emptyn, initialTitle:^(.*KiCad.*)$ windowrulev2 = workspace emptyn, initialTitle:^(.*PCB Editor.*)$ diff --git a/update_arch.sh b/update_arch.sh index 6e0193f..60a6ab3 100755 --- a/update_arch.sh +++ b/update_arch.sh @@ -5,51 +5,47 @@ sudo -v if ! pacman -Qs inetutils >/dev/null; then sudo pacman -Syy --noconfirm inetutils fi -if ! pacman -Qs awk >/dev/null; then - sudo pacman -Syy --noconfirm awk -fi -HOSTNAME=$(hostname | awk '{ print toupper($0) }') +HOSTNAME=$(hostname | tr '[:lower:]' '[:upper:]') -GAME="no" -VR="no" -DESKTOP_BASE="no" -DESKTOP_WORK="no" -CODE="no" -NVIDIA_GPU="no" -NVIDIA_1080_GPU="no" -TERMINAL="no" -HYPERLAND="no" +# Declare associative array for roles +declare -A ROLES +for role in GAME VR DESKTOP_BASE DESKTOP_WORK CODE NVIDIA_GPU NVIDIA_1080_GPU TERMINAL HYPERLAND; do + ROLES["$role"]="no" +done -if [ "$HOSTNAME" == "CMBOX" ]; then - DESKTOP_BASE="yes" - DESKTOP_WORK="yes" - CODE="yes" - TERMINAL="yes" - HYPERLAND="yes" -fi -if [ "$HOSTNAME" == "STEAMBOX" ]; then - GAME="yes" - VR="yes" - DESKTOP_BASE="yes" - NVIDIA_GPU="yes" - TERMINAL="yes" - HYPERLAND="yes" -fi -if [ "$HOSTNAME" == "LABBOX" ]; then - DESKTOP_BASE="yes" - CODE="yes" - TERMINAL="yes" - HYPERLAND="yes" -fi -if [ "$HOSTNAME" == "SIMONBOX" ]; then - GAME="yes" - VR="yes" - DESKTOP_BASE="yes" - NVIDIA_1080_GPU="yes" - TERMINAL="yes" - HYPERLAND="yes" -fi +# Assign roles per hostname +case "$HOSTNAME" in +CMBOX) + ROLES[DESKTOP_BASE]="yes" + ROLES[DESKTOP_WORK]="yes" + ROLES[CODE]="yes" + ROLES[TERMINAL]="yes" + ROLES[HYPERLAND]="yes" + ;; +STEAMBOX) + ROLES[GAME]="yes" + ROLES[VR]="yes" + ROLES[DESKTOP_BASE]="yes" + ROLES[NVIDIA_GPU]="yes" + ROLES[TERMINAL]="yes" + ROLES[HYPERLAND]="yes" + ;; +LABBOX) + ROLES[DESKTOP_BASE]="yes" + ROLES[CODE]="yes" + ROLES[TERMINAL]="yes" + ROLES[HYPERLAND]="yes" + ;; +SIMONBOX) + ROLES[GAME]="yes" + ROLES[VR]="yes" + ROLES[DESKTOP_BASE]="yes" + ROLES[NVIDIA_1080_GPU]="yes" + ROLES[TERMINAL]="yes" + ROLES[HYPERLAND]="yes" + ;; +esac echo -e ' \e[H\e[2J \e[0;34m. @@ -64,34 +60,13 @@ echo -e ' \e[H\e[2J \e[1;32mCMtec '$HOSTNAME' install/Update script.\e[0;37m ' +# Print enabled roles printf -- ' \033[37m' -if [ "$GAME" == "yes" ]; then - printf -- 'GAME, ' -fi -if [ "$VR" == "yes" ]; then - printf -- 'VR, ' -fi -if [ "$DESKTOP_BASE" == "yes" ]; then - printf -- 'DESKTOP_BASE, ' -fi -if [ "$DESKTOP_WORK" == "yes" ]; then - printf -- 'DESKTOP_WORK, ' -fi -if [ "$CODE" == "yes" ]; then - printf -- 'CODE, ' -fi -if [ "$TERMINAL" == "yes" ]; then - printf -- 'TERMINAL, ' -fi -if [ "$HYPERLAND" == "yes" ]; then - printf -- 'HYPERLAND, ' -fi -if [ "$NVIDIA_GPU" == "yes" ]; then - printf -- 'NVIDIA_GPU, ' -fi -if [ "$NVIDIA_1080_GPU" == "yes" ]; then - printf -- 'NVIDIA_1080_GPU, ' -fi +for role in "${!ROLES[@]}"; do + if [ "${ROLES[$role]}" == "yes" ]; then + printf '%s, ' "$role" + fi +done printf -- '\n\n\033[37m' sleep 1 @@ -109,7 +84,7 @@ if pacman -Qs timeshift >/dev/null; then fi # Enable multilib (if applicable) -if [ "$GAME" == "yes" ]; then +if [ "${ROLES[GAME]}" == "yes" ]; then if ! grep -q "^\[multilib\]" /etc/pacman.conf; then printf -- '\033[33m Enabling multilib\n\033[37m' sudo tee -a /etc/pacman.conf >/dev/null <