fix: correct installation of Yaru accent themes and font configuration

bin/omakub-sub/font-size.sh

@@ -4,6 +4,13 @@ choice=$(gum choose {7..14} "<< Back" --height 11 --header "Choose your terminal
 
 if [[ $choice =~ ^[0-9]+$ ]]; then
 	sed -i "s/^size = .*$/size = $choice/g" ~/.config/alacritty/font-size.toml
+
+	OMAKUB_CURRENT_FONT=$(gsettings get org.gnome.desktop.interface font-name | tr -d "'")
+	OMAKUB_FONT_NAME="${OMAKUB_CURRENT_FONT% [0-9]*}"
+	gsettings set org.gnome.desktop.interface font-name "'$OMAKUB_FONT_NAME $choice'"
+	gsettings set org.gnome.desktop.interface monospace-font-name "'$OMAKUB_FONT_NAME Mono $choice'"
+	source "$OMAKUB_PATH/themes/set-qt6-theme.sh"
+
 	source $OMAKUB_PATH/bin/omakub-sub/font-size.sh
 else
 	source $OMAKUB_PATH/bin/omakub-sub/font.sh

bin/omakub-sub/font.sh

@@ -18,7 +18,11 @@ set_font() {
 		source $OMAKUB_PATH/ascii.sh
 	fi
 
-	gsettings set org.gnome.desktop.interface monospace-font-name "$font_name 10"
+	OMAKUB_CURRENT_FONT_SIZE=$(gsettings get org.gnome.desktop.interface font-name | tr -d "'" | awk '{print $NF}')
+	gsettings set org.gnome.desktop.interface font-name "$font_name $OMAKUB_CURRENT_FONT_SIZE"
+	gsettings set org.gnome.desktop.interface monospace-font-name "$font_name Mono $OMAKUB_CURRENT_FONT_SIZE"
+	source "$OMAKUB_PATH/themes/set-qt6-theme.sh"
+
 	cp "$OMAKUB_PATH/configs/alacritty/fonts/$file_name.toml" ~/.config/alacritty/font.toml
 	sed -i "s/\"editor.fontFamily\": \".*\"/\"editor.fontFamily\": \"$font_name\"/g" ~/.config/Code/User/settings.json
 }

bin/omakub-sub/theme.sh

@@ -19,7 +19,6 @@ if [ -n "$THEME" ] && [ "$THEME" != "<<-back" ]; then
   fi
 
   source $OMAKUB_PATH/themes/$THEME/gnome.sh
-  source $OMAKUB_PATH/themes/$THEME/tophat.sh
   source $OMAKUB_PATH/themes/$THEME/vscode.sh
 
   # Forgo setting the Chrome theme until we might find a less disruptive way of doing it.

defaults/bash/shell

@@ -4,6 +4,8 @@ HISTCONTROL=ignoreboth
 HISTSIZE=32768
 HISTFILESIZE="${HISTSIZE}"
 
+export QT_QPA_PLATFORMTHEME="qt6ct"
+
 # Autocompletion
 source /usr/share/bash-completion/bash_completion
 

install/desktop/set-gnome-theme.sh

@@ -1,4 +1,26 @@
 #!/bin/bash
 
+# Adding support for QT themes in the style of the main theme
+sudo apt-get install -y qt6ct adwaita-qt
+
+cd /tmp
+rm -f gtk.deb icons.deb
+
+wget -O gtk.deb http://ftp.debian.org/debian/pool/main/y/yaru-theme/yaru-theme-gtk_24.04.3-1_all.deb
+dpkg-deb -x gtk.deb ./yaru-theme/
+
+wget -O icons.deb http://ftp.debian.org/debian/pool/main/y/yaru-theme/yaru-theme-icon_24.04.3-1_all.deb
+dpkg-deb -x icons.deb ./yaru-icons/
+
+mkdir -p ~/.local/share/{themes,icons}
+
+for theme in bark viridian; do
+	cp -R ./yaru-theme/usr/share/themes/Yaru-$theme{,-dark} ~/.local/share/themes/ 2>/dev/null || true
+	cp -R ./yaru-icons/usr/share/icons/Yaru-$theme{,-dark} ~/.local/share/icons/ 2>/dev/null || true
+done
+
+rm -f gtk.deb icons.deb
+rm -rf yaru-theme yaru-icons
+cd -
+
 source ~/.local/share/omakub/themes/tokyo-night/gnome.sh
-source ~/.local/share/omakub/themes/tokyo-night/tophat.sh

themes/catppuccin/gnome.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
-OMAKUB_THEME_COLOR="magenta"
+OMAKUB_THEME_PEFER="dark"
+OMAKUB_THEME_STYLE="magenta"
+OMAKUB_THEME_ACCENT=("magenta" "pink")
 OMAKUB_THEME_BACKGROUND="catppuccin/background.png"
-source $OMAKUB_PATH/themes/set-gnome-theme.sh
+source "$OMAKUB_PATH/themes/set-gnome-theme.sh"

themes/everforest/gnome.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
-OMAKUB_THEME_COLOR="bark"
+OMAKUB_THEME_PEFER="dark"
+OMAKUB_THEME_STYLE="bark"
+OMAKUB_THEME_ACCENT=("bark" "slate")
 OMAKUB_THEME_BACKGROUND="everforest/background.jpg"
-source $OMAKUB_PATH/themes/set-gnome-theme.sh
+source "$OMAKUB_PATH/themes/set-gnome-theme.sh"

themes/gruvbox/gnome.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
-OMAKUB_THEME_COLOR="sage"
+OMAKUB_THEME_PEFER="dark"
+OMAKUB_THEME_STYLE="sage"
+OMAKUB_THEME_ACCENT=("sage" "yellow")
 OMAKUB_THEME_BACKGROUND="gruvbox/background.jpg"
-source $OMAKUB_PATH/themes/set-gnome-theme.sh
+source "$OMAKUB_PATH/themes/set-gnome-theme.sh"

themes/kanagawa/gnome.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
-OMAKUB_THEME_COLOR="purple"
+OMAKUB_THEME_PEFER="dark"
+OMAKUB_THEME_STYLE=""
+OMAKUB_THEME_ACCENT=("bark" "yellow")
 OMAKUB_THEME_BACKGROUND="kanagawa/background.jpg"
-source $OMAKUB_PATH/themes/set-gnome-theme.sh
+source "$OMAKUB_PATH/themes/set-gnome-theme.sh"

themes/matte-black/gnome.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
-OMAKUB_THEME_COLOR="orange"
+OMAKUB_THEME_PEFER="dark"
+OMAKUB_THEME_STYLE=""
+OMAKUB_THEME_ACCENT=("orange" "yellow")
 OMAKUB_THEME_BACKGROUND="matte-black/background.jpg"
-source $OMAKUB_PATH/themes/set-gnome-theme.sh
+source "$OMAKUB_PATH/themes/set-gnome-theme.sh"

themes/nord/gnome.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
-OMAKUB_THEME_COLOR="blue"
+OMAKUB_THEME_PEFER="dark"
+OMAKUB_THEME_STYLE="blue"
+OMAKUB_THEME_ACCENT=("slate" "blue")
 OMAKUB_THEME_BACKGROUND="nord/background.png"
-source $OMAKUB_PATH/themes/set-gnome-theme.sh
+source "$OMAKUB_PATH/themes/set-gnome-theme.sh"

themes/osaka-jade/gnome.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
-OMAKUB_THEME_COLOR="green"
+OMAKUB_THEME_PEFER="dark"
+OMAKUB_THEME_STYLE="viridian"
+OMAKUB_THEME_ACCENT=("viridian" "green")
 OMAKUB_THEME_BACKGROUND="osaka-jade/background.jpg"
-source $OMAKUB_PATH/themes/set-gnome-theme.sh
+source "$OMAKUB_PATH/themes/set-gnome-theme.sh"

themes/ristretto/gnome.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
-OMAKUB_THEME_COLOR="grey"
+OMAKUB_THEME_PEFER="dark"
+OMAKUB_THEME_STYLE=""
+OMAKUB_THEME_ACCENT=("orange" "yellow")
 OMAKUB_THEME_BACKGROUND="ristretto/background.jpg"
-source $OMAKUB_PATH/themes/set-gnome-theme.sh
+source "$OMAKUB_PATH/themes/set-gnome-theme.sh"

themes/rose-pine/gnome.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-OMAKUB_THEME_COLOR="red"
+OMAKUB_THEME_PEFER="light"
+OMAKUB_THEME_STYLE="red"
+OMAKUB_THEME_ACCENT=("red")
 OMAKUB_THEME_BACKGROUND="rose-pine/background.jpg"
-source $OMAKUB_PATH/themes/set-gnome-theme.sh
-gsettings set org.gnome.desktop.interface color-scheme 'prefer-light'
+source "$OMAKUB_PATH/themes/set-gnome-theme.sh"

themes/set-gnome-theme.sh

@@ -1,18 +1,63 @@
 #!/bin/bash
 
-gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-gsettings set org.gnome.desktop.interface cursor-theme 'Yaru'
-gsettings set org.gnome.desktop.interface gtk-theme "Yaru-$OMAKUB_THEME_COLOR-dark"
-gsettings set org.gnome.desktop.interface icon-theme "Yaru-$OMAKUB_THEME_COLOR"
-gsettings set org.gnome.desktop.interface accent-color "$OMAKUB_THEME_COLOR" 2>/dev/null || true
+omaku_get_accent() {
+    local -a PREFERRED_COLORS=("$@")
+    get_system_accent_colors() {
+        local range_output
+        range_output=$(gsettings range org.gnome.desktop.interface accent-color 2>/dev/null)
+
+        if [[ -z "$range_output" || "$range_output" == *"type is not an enumeration"* ]]; then
+            echo ""
+            return
+        fi
+        echo "$range_output" | tr -d "[]'" | tr ',' '\n' | awk 'NF'
+    }
+
+    local -a SYSTEM_COLORS
+    readarray -t SYSTEM_COLORS < <(get_system_accent_colors)
+
+    declare -A SYSTEM_SET
+    for c in "${SYSTEM_COLORS[@]}"; do
+        SYSTEM_SET["$c"]=1
+    done
+
+    local SELECTED="default"
+    for color in "${PREFERRED_COLORS[@]}"; do
+        if [[ -n "${SYSTEM_SET[$color]}" ]]; then
+            SELECTED="$color"
+            break
+        fi
+    done
+
+    echo "$SELECTED"
+}
+
+OMAKUB_THEME_SUFFIX=""
+if [[ "$OMAKUB_THEME_PEFER" == "dark" ]]; then
+    OMAKUB_THEME_SUFFIX="-dark"
+fi
+if [ "$OMAKUB_THEME_STYLE" ]; then
+    OMAKUB_THEME_STYLE="-${OMAKUB_THEME_STYLE}"
+fi
+
+gsettings set org.gnome.desktop.interface color-scheme "prefer-${OMAKUB_THEME_PEFER}"
+gsettings set org.gnome.desktop.interface cursor-theme "Yaru"
+gsettings set org.gnome.desktop.interface gtk-theme "Yaru${OMAKUB_THEME_STYLE}${OMAKUB_THEME_SUFFIX}"
+gsettings set org.gnome.desktop.interface icon-theme "Yaru${OMAKUB_THEME_STYLE}${OMAKUB_THEME_SUFFIX}"
+
+GNOME_CURRENT_ACCENTS=$(omaku_get_accent "${OMAKUB_THEME_ACCENT[@]}")
+gsettings set org.gnome.desktop.interface accent-color "$GNOME_CURRENT_ACCENTS" 2>/dev/null || true
+
 
 BACKGROUND_ORG_PATH="$HOME/.local/share/omakub/themes/$OMAKUB_THEME_BACKGROUND"
 BACKGROUND_DEST_DIR="$HOME/.local/share/backgrounds"
-BACKGROUND_DEST_PATH="$BACKGROUND_DEST_DIR/$(echo $OMAKUB_THEME_BACKGROUND | tr '/' '-')"
+BACKGROUND_DEST_PATH="$BACKGROUND_DEST_DIR/$(echo "$OMAKUB_THEME_BACKGROUND" | tr '/' '-')"
 
 if [ ! -d "$BACKGROUND_DEST_DIR" ]; then mkdir -p "$BACKGROUND_DEST_DIR"; fi
 
-[ ! -f $BACKGROUND_DEST_PATH ] && cp $BACKGROUND_ORG_PATH $BACKGROUND_DEST_PATH
-gsettings set org.gnome.desktop.background picture-uri $BACKGROUND_DEST_PATH
-gsettings set org.gnome.desktop.background picture-uri-dark $BACKGROUND_DEST_PATH
+[ ! -f "$BACKGROUND_DEST_PATH" ] && install "$BACKGROUND_ORG_PATH" "$BACKGROUND_DEST_PATH"
+gsettings set org.gnome.desktop.background picture-uri "$BACKGROUND_DEST_PATH"
+gsettings set org.gnome.desktop.background picture-uri-dark "$BACKGROUND_DEST_PATH"
 gsettings set org.gnome.desktop.background picture-options 'zoom'
+
+source "$OMAKUB_PATH/themes/set-qt6-theme.sh"

themes/set-qt6-theme.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+mkdir -p ~/.config/qt6ct
+OMAKUB_THEME_PEFER=$(gsettings get org.gnome.desktop.interface color-scheme | tr -d "'")
+if [[ "$OMAKUB_THEME_PEFER" == "prefer-dark" ]]; then
+    OMAKUB_THEME_SUFFIX="-Dark"
+fi
+
+OMAKUB_THEME_FONTANDSIZE='"'$(gsettings get org.gnome.desktop.interface font-name | tr -d "'" | awk '{
+    size = $NF;
+    name = "";
+    for (i = 1; i < NF; i++) {
+        if (i > 1) name = name " ";
+        name = name $i;
+    }
+    print name "," size;
+}')'"'
+OMAKUB_THEME_FONTANDSIZE_MONO='"'$(gsettings get org.gnome.desktop.interface monospace-font-name | tr -d "'" | awk '{
+    size = $NF;
+    name = "";
+    for (i = 1; i < NF; i++) {
+        if (i > 1) name = name " ";
+        name = name $i;
+    }
+    print name "," size;
+}')'"'
+
+printf "%s\n" \
+    "[Appearance]" \
+    "custom_palette=false" \
+    "icon_theme=$(gsettings get org.gnome.desktop.interface gtk-theme | tr -d "'")" \
+    "standard_dialogs=gtk3" \
+    "style=Adwaita${OMAKUB_THEME_SUFFIX}" \
+    "" \
+    "[Fonts]" \
+    "general=$OMAKUB_THEME_FONTANDSIZE" \
+    "fixed=$OMAKUB_THEME_FONTANDSIZE_MONO" \
+    "" |
+    tee ~/.config/qt6ct/qt6ct.conf >/dev/null

themes/tokyo-night/gnome.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
-OMAKUB_THEME_COLOR="purple"
+OMAKUB_THEME_PEFER="dark"
+OMAKUB_THEME_STYLE="purple"
+OMAKUB_THEME_ACCENT=("purple")
 OMAKUB_THEME_BACKGROUND="tokyo-night/background.jpg"
-source $OMAKUB_PATH/themes/set-gnome-theme.sh
+source "$OMAKUB_PATH/themes/set-gnome-theme.sh"