gnome fix

7 files changed, 62 insertions, 2 deletions

diff --git a/raveos-gnome-theme/00-raveos b/raveos-gnome-theme/00-raveos
index 239d3fa..730172a 100644
--- a/raveos-gnome-theme/00-raveos
+++ b/raveos-gnome-theme/00-raveos
@@ -229,7 +229,7 @@ icon-border-radius=16
 icon-spacing=11
 
 [org/gnome/shell/extensions/user-theme]
-name='Yaru-olive-dark'
+name='CustomQuickSettings'
 
 [org/gnome/shell/extensions/vitals]
 hot-sensors=['_processor_usage_', '_memory_allocated_', '__network-rx_max__', '__network-tx_max__']
diff --git a/raveos-gnome-theme/PKGBUILD b/raveos-gnome-theme/PKGBUILD
index 777b10f..6f16c5d 100644
--- a/raveos-gnome-theme/PKGBUILD
+++ b/raveos-gnome-theme/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=raveos-gnome-theme
 pkgver=1.0.0
-pkgrel=11
+pkgrel=12
 pkgdesc="RaveOS GNOME theme payload and installer"
 arch=('any')
 url="https://raveos.local"
@@ -31,6 +31,8 @@ package() {
     install -dm755 "${pkgdir}/usr/share/themes"
     cp -r --no-preserve=ownership "${startdir}/theme-data/user-themes/Yaru-olive-dark" \
         "${pkgdir}/usr/share/themes/"
+    cp -r --no-preserve=ownership "${startdir}/theme-data/user-themes/CustomQuickSettings" \
+        "${pkgdir}/usr/share/themes/"
 
     install -dm755 "${pkgdir}/usr/share/icons"
     cp -r --no-preserve=ownership "${startdir}/theme-data/user-icons/Adwaitaru-olive" \
diff --git a/raveos-gnome-theme/raveos-gnome-apply.sh b/raveos-gnome-theme/raveos-gnome-apply.sh
index 1b9d2a3..31d6994 100755
--- a/raveos-gnome-theme/raveos-gnome-apply.sh
+++ b/raveos-gnome-theme/raveos-gnome-apply.sh
@@ -75,6 +75,14 @@ done
     install -Dm644 "${PAYLOAD}/burn-my-windows/burn-my-windows.conf" \
         /etc/skel/.config/burn-my-windows/profiles/burn-my-windows.conf
 
+for f in gtk-3.0/gtk.css gtk-4.0/gtk.css; do
+    [[ -f "${PAYLOAD}/${f}" ]] && install -Dm644 "${PAYLOAD}/${f}" "/etc/skel/.config/${f}"
+done
+
+[[ -f "${PAYLOAD}/skel/.local/share/flatpak/overrides/global" ]] && \
+    install -Dm644 "${PAYLOAD}/skel/.local/share/flatpak/overrides/global" \
+        /etc/skel/.local/share/flatpak/overrides/global
+
 write_mimeapps_defaults /etc/skel/.config/mimeapps.list
 ensure_bashrc_hook /etc/skel/.bashrc
 echo "1" > /etc/skel/.config/raveos/gnome-migrated
@@ -105,6 +113,19 @@ while IFS=: read -r user _ uid gid _ home shell; do
             "${home}/.config/burn-my-windows/profiles/burn-my-windows.conf"
     fi
 
+    for f in gtk-3.0/gtk.css gtk-4.0/gtk.css; do
+        if [[ ! -f "${home}/.config/${f}" && -f "${PAYLOAD}/${f}" ]]; then
+            install -Dm644 "${PAYLOAD}/${f}" "${home}/.config/${f}"
+        fi
+    done
+
+    if command -v flatpak >/dev/null 2>&1; then
+        runuser -u "$user" -- env HOME="$home" flatpak override --user --filesystem=xdg-config/gtk-4.0:ro 2>/dev/null || true
+    elif [[ ! -f "${home}/.local/share/flatpak/overrides/global" && -f "${PAYLOAD}/skel/.local/share/flatpak/overrides/global" ]]; then
+        install -Dm644 "${PAYLOAD}/skel/.local/share/flatpak/overrides/global" \
+            "${home}/.local/share/flatpak/overrides/global"
+    fi
+
     if [[ ! -f "${home}/.config/mimeapps.list" ]]; then
         write_mimeapps_defaults "${home}/.config/mimeapps.list"
     fi
@@ -118,6 +139,8 @@ while IFS=: read -r user _ uid gid _ home shell; do
         .config/kitty \
         .config/fastfetch \
         .config/burn-my-windows \
+        .config/gtk-3.0 \
+        .config/gtk-4.0 \
         .config/raveos; do
         [[ -e "${home}/${d}" ]] && chown -R "${uid}:${gid}" "${home}/${d}" 2>/dev/null || true
     done
diff --git a/raveos-gnome-theme/theme-data/gtk-3.0/gtk.css b/raveos-gnome-theme/theme-data/gtk-3.0/gtk.css
new file mode 100644
index 0000000..9146bac
--- /dev/null
+++ b/raveos-gnome-theme/theme-data/gtk-3.0/gtk.css
@@ -0,0 +1,3 @@
+@define-color accent_bg_color #3d7839;
+@define-color accent_fg_color #ffffff;
+@define-color accent_color #3d7839;
diff --git a/raveos-gnome-theme/theme-data/gtk-4.0/gtk.css b/raveos-gnome-theme/theme-data/gtk-4.0/gtk.css
new file mode 100644
index 0000000..cfeb241
--- /dev/null
+++ b/raveos-gnome-theme/theme-data/gtk-4.0/gtk.css
@@ -0,0 +1,11 @@
+/* --- Modern Libadwaita (GNOME 47+) --- */                                             
+    :root {                                                                                 
+        --accent-bg-color: #3d7839; /* Accent fill (active buttons, switches, selections) */
+        --accent-fg-color: #ffffff; /* Foreground text/icon color on top of accent fill */  
+        --accent-color: #3d7839;    /* Standalone accent color (text, links, icons) */      
+    }                                                                                       
+                                                                                            
+    /* --- Legacy Libadwaita / GTK4 fallback --- */                                         
+    @define-color accent_bg_color #3d7839;                                                  
+    @define-color accent_fg_color #ffffff;                                                  
+    @define-color accent_color #3d7839;
diff --git a/raveos-gnome-theme/theme-data/skel/.local/share/flatpak/overrides/global b/raveos-gnome-theme/theme-data/skel/.local/share/flatpak/overrides/global
new file mode 100644
index 0000000..c6b726f
--- /dev/null
+++ b/raveos-gnome-theme/theme-data/skel/.local/share/flatpak/overrides/global
@@ -0,0 +1,2 @@
+[Context]
+filesystems=xdg-config/gtk-4.0:ro;
diff --git a/raveos-gnome-theme/theme-data/user-themes/CustomQuickSettings/gnome-shell/gnome-shell.css b/raveos-gnome-theme/theme-data/user-themes/CustomQuickSettings/gnome-shell/gnome-shell.css
new file mode 100644
index 0000000..b303442
--- /dev/null
+++ b/raveos-gnome-theme/theme-data/user-themes/CustomQuickSettings/gnome-shell/gnome-shell.css
@@ -0,0 +1,19 @@
+/* Load the default GNOME Shell stylesheet */                                           
+    @import url("resource:///org/gnome/shell/theme/gnome-shell.css");                       
+                                                                                            
+    /* Active Quick Settings toggle buttons (Wi-Fi, Bluetooth, Dark Mode, etc.) */          
+    .quick-toggle:checked,                                                                  
+    .quick-menu-toggle:checked {                                                            
+        background-color: #3d7839 !important;                                               
+        color: #ffffff !important;                                                          
+    }                                                                                       
+                                                                                            
+    /* Dropdown arrow on split toggle buttons */                                            
+    .quick-menu-toggle:checked .quick-toggle-arrow {                                        
+        background-color: #3d7839 !important;                                               
+    }                                                                                       
+                                                                                            
+    /* Volume and brightness slider active fills */                                         
+    .slider {                                                                               
+        -barlevel-active-background-color: #3d7839 !important;                              
+    }