fix(plasma-theme): enforce breeze-dark color scheme and desktop themeHEADmain

5 files changed, 180 insertions, 2 deletions

diff --git a/raveos-plasma-theme/PKGBUILD b/raveos-plasma-theme/PKGBUILD
index 1e3a8f9..bdaad3a 100644
--- a/raveos-plasma-theme/PKGBUILD
+++ b/raveos-plasma-theme/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=raveos-plasma-theme
 pkgver=1.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc="RaveOS Plasma theme payload and installer"
 arch=('any')
 url="https://raveos.local"
@@ -46,6 +46,7 @@ package() {
 
     install -dm755 "${pkgdir}/etc/xdg"
     install -Dm644 "${startdir}/kdeglobals" "${pkgdir}/etc/xdg/kdeglobals"
+    install -Dm644 "${startdir}/plasmarc" "${pkgdir}/etc/xdg/plasmarc"
     install -Dm644 "${startdir}/kwalletrc" "${pkgdir}/etc/xdg/kwalletrc"
     install -Dm644 "${startdir}/ksplashrc" "${pkgdir}/etc/xdg/ksplashrc"
     install -Dm644 "${startdir}/kscreenlockerrc" "${pkgdir}/etc/xdg/kscreenlockerrc"
diff --git a/raveos-plasma-theme/kdeglobals b/raveos-plasma-theme/kdeglobals
index 5bdede9..a55b0f6 100644
--- a/raveos-plasma-theme/kdeglobals
+++ b/raveos-plasma-theme/kdeglobals
@@ -1,8 +1,151 @@
+[ColorEffects:Disabled]
+Color=56,56,56
+ColorAmount=0
+ColorEffect=0
+ContrastAmount=0.65
+ContrastEffect=1
+IntensityAmount=0.1
+IntensityEffect=2
+
+[ColorEffects:Inactive]
+ChangeSelectionColor=true
+Color=112,111,110
+ColorAmount=0.025
+ColorEffect=2
+ContrastAmount=0.1
+ContrastEffect=2
+Enable=false
+IntensityAmount=0
+IntensityEffect=0
+
+[Colors:Button]
+BackgroundAlternate=30,87,116
+BackgroundNormal=41,44,48
+DecorationFocus=61,174,233
+DecorationHover=61,174,233
+ForegroundActive=61,174,233
+ForegroundInactive=161,169,177
+ForegroundLink=29,153,243
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
+ForegroundNormal=252,252,252
+ForegroundPositive=39,174,96
+ForegroundVisited=155,89,182
+
+[Colors:Complementary]
+BackgroundAlternate=30,87,116
+BackgroundNormal=32,35,38
+DecorationFocus=61,174,233
+DecorationHover=61,174,233
+ForegroundActive=61,174,233
+ForegroundInactive=161,169,177
+ForegroundLink=29,153,243
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
+ForegroundNormal=252,252,252
+ForegroundPositive=39,174,96
+ForegroundVisited=155,89,182
+
+[Colors:Header]
+BackgroundAlternate=32,35,38
+BackgroundNormal=41,44,48
+DecorationFocus=61,174,233
+DecorationHover=61,174,233
+ForegroundActive=61,174,233
+ForegroundInactive=161,169,177
+ForegroundLink=29,153,243
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
+ForegroundNormal=252,252,252
+ForegroundPositive=39,174,96
+ForegroundVisited=155,89,182
+
+[Colors:Header][Inactive]
+BackgroundAlternate=41,44,48
+BackgroundNormal=32,35,38
+DecorationFocus=61,174,233
+DecorationHover=61,174,233
+ForegroundActive=61,174,233
+ForegroundInactive=161,169,177
+ForegroundLink=29,153,243
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
+ForegroundNormal=252,252,252
+ForegroundPositive=39,174,96
+ForegroundVisited=155,89,182
+
+[Colors:Selection]
+BackgroundAlternate=30,87,116
+BackgroundNormal=61,174,233
+DecorationFocus=61,174,233
+DecorationHover=61,174,233
+ForegroundActive=252,252,252
+ForegroundInactive=161,169,177
+ForegroundLink=253,188,75
+ForegroundNegative=176,55,69
+ForegroundNeutral=198,92,0
+ForegroundNormal=252,252,252
+ForegroundPositive=23,104,57
+ForegroundVisited=155,89,182
+
+[Colors:Tooltip]
+BackgroundAlternate=32,35,38
+BackgroundNormal=41,44,48
+DecorationFocus=61,174,233
+DecorationHover=61,174,233
+ForegroundActive=61,174,233
+ForegroundInactive=161,169,177
+ForegroundLink=29,153,243
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
+ForegroundNormal=252,252,252
+ForegroundPositive=39,174,96
+ForegroundVisited=155,89,182
+
+[Colors:View]
+BackgroundAlternate=29,31,34
+BackgroundNormal=20,22,24
+DecorationFocus=61,174,233
+DecorationHover=61,174,233
+ForegroundActive=61,174,233
+ForegroundInactive=161,169,177
+ForegroundLink=29,153,243
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
+ForegroundNormal=252,252,252
+ForegroundPositive=39,174,96
+ForegroundVisited=155,89,182
+
+[Colors:Window]
+BackgroundAlternate=41,44,48
+BackgroundNormal=32,35,38
+DecorationFocus=61,174,233
+DecorationHover=61,174,233
+ForegroundActive=61,174,233
+ForegroundInactive=161,169,177
+ForegroundLink=29,153,243
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
+ForegroundNormal=252,252,252
+ForegroundPositive=39,174,96
+ForegroundVisited=155,89,182
+
 [General]
 ColorScheme=BreezeDark
+Name=Breeze Dark
+shadeSortColumn=true
 
 [Icons]
 Theme=breeze-dark
 
 [KDE]
 widgetStyle=Breeze
+contrast=4
+
+[WM]
+activeBackground=39,44,49
+activeBlend=252,252,252
+activeForeground=252,252,252
+inactiveBackground=32,36,40
+inactiveBlend=161,169,177
+inactiveForeground=161,169,177
diff --git a/raveos-plasma-theme/plasmarc b/raveos-plasma-theme/plasmarc
new file mode 100644
index 0000000..f89bcd9
--- /dev/null
+++ b/raveos-plasma-theme/plasmarc
@@ -0,0 +1,2 @@
+[Theme]
+name=breeze-dark
diff --git a/raveos-plasma-theme/raveos-plasma-apply.sh b/raveos-plasma-theme/raveos-plasma-apply.sh
index 07ccbcd..20e104a 100755
--- a/raveos-plasma-theme/raveos-plasma-apply.sh
+++ b/raveos-plasma-theme/raveos-plasma-apply.sh
@@ -67,19 +67,34 @@ Theme=org.kde.raveos.desktop
 SPLEOF
 }
 
+write_plasmarc() {
+    local target_home="$1"
+    mkdir -p "${target_home}/.config"
+    cat > "${target_home}/.config/plasmarc" <<'PLMEOF'
+[Theme]
+name=breeze-dark
+PLMEOF
+}
+
 write_kdeglobals() {
     local target_home="$1"
     mkdir -p "${target_home}/.config"
-    cat > "${target_home}/.config/kdeglobals" <<'GLBEOF'
+    if [[ -f /etc/xdg/kdeglobals ]]; then
+        cp -f /etc/xdg/kdeglobals "${target_home}/.config/kdeglobals"
+    else
+        cat > "${target_home}/.config/kdeglobals" <<'GLBEOF'
 [General]
 ColorScheme=BreezeDark
+Name=Breeze Dark
 
 [Icons]
 Theme=breeze-dark
 
 [KDE]
 widgetStyle=Breeze
+contrast=4
 GLBEOF
+    fi
 }
 
 write_kwalletrc() {
@@ -124,6 +139,7 @@ write_konsolerc /etc/skel
 write_kscreenlockerrc /etc/skel
 write_ksplashrc /etc/skel
 write_kdeglobals /etc/skel
+write_plasmarc /etc/skel
 write_kwalletrc /etc/skel
 disable_kmix_autostart /etc/skel
 ensure_bashrc_hook /etc/skel/.bashrc
@@ -168,6 +184,14 @@ while IFS=: read -r user _ uid gid _ home shell; do
         write_kwalletrc "${home}"
     fi
 
+    if [[ ! -f "${home}/.config/kdeglobals" ]]; then
+        write_kdeglobals "${home}"
+    fi
+
+    if [[ ! -f "${home}/.config/plasmarc" ]]; then
+        write_plasmarc "${home}"
+    fi
+
     if [[ ! -f "${home}/.config/autostart/kmix_autostart.desktop" ]]; then
         disable_kmix_autostart "${home}"
     fi
diff --git a/raveos-plasma-theme/raveos-plasma-first-login.sh b/raveos-plasma-theme/raveos-plasma-first-login.sh
index 421ee84..abfe4c2 100755
--- a/raveos-plasma-theme/raveos-plasma-first-login.sh
+++ b/raveos-plasma-theme/raveos-plasma-first-login.sh
@@ -27,6 +27,14 @@ if [[ -f "${wallpaper}" ]] && command -v plasma-apply-wallpaperimage >/dev/null
     plasma-apply-wallpaperimage "${wallpaper}" >/dev/null 2>&1 || true
 fi
 
+if command -v plasma-apply-colorscheme >/dev/null 2>&1; then
+    plasma-apply-colorscheme BreezeDark >/dev/null 2>&1 || true
+fi
+
+if command -v plasma-apply-desktoptheme >/dev/null 2>&1; then
+    plasma-apply-desktoptheme breeze-dark >/dev/null 2>&1 || true
+fi
+
 if [[ -n "$QDBUS" ]]; then
     $QDBUS org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript "
         if ('${wallpaper}' !== '') {