From 60078f2d9181d29c67cb48ceb7686238f733dbe7 Mon Sep 17 00:00:00 2001
From: Nippy <nippy@Beller-Mac-mini.lan>
Date: Mon, 7 Sep 2026 20:11:31 +0200
Subject: rework theme

---
 raveos-cosmic-theme/raveos-cosmic-first-login.sh | 84 ++++++++++++------------
 1 file changed, 42 insertions(+), 42 deletions(-)
 mode change 100644 => 100755 raveos-cosmic-theme/raveos-cosmic-first-login.sh

(limited to 'raveos-cosmic-theme/raveos-cosmic-first-login.sh')

diff --git a/raveos-cosmic-theme/raveos-cosmic-first-login.sh b/raveos-cosmic-theme/raveos-cosmic-first-login.sh
old mode 100644
new mode 100755
index 7ad8982..4964028
--- a/raveos-cosmic-theme/raveos-cosmic-first-login.sh
+++ b/raveos-cosmic-theme/raveos-cosmic-first-login.sh
@@ -4,61 +4,64 @@ set -euo pipefail
 marker_dir="${HOME}/.config/raveos-cosmic-theme"
 marker_file="${marker_dir}/.first-login-done"
 wallpaper="/usr/share/backgrounds/raveos/raveos-main-bg.jpeg"
+theme_ron="/usr/share/raveos/cosmic-theme/theme-data/cosmic/raveos.ron"
+cosmic_payload="/usr/share/raveos/cosmic-theme/theme-data/cosmic"
 
 mkdir -p "${marker_dir}"
 [[ -e "${marker_file}" ]] && exit 0
 [[ "${XDG_CURRENT_DESKTOP:-}" == *COSMIC* ]] || exit 0
 
-sleep 5
+sleep 2
 
-mkdir -p "${HOME}/.config/cosmic/com.system76.CosmicTheme/v1"
-mkdir -p "${HOME}/.config/cosmic/com.system76.CosmicTheme.Appearance/v1"
-
-echo '(accent: (r: 75, g: 133, b: 1, a: 255))' > "${HOME}/.config/cosmic/com.system76.CosmicTheme/v1/active_theme"
-echo 'accent_color: Some("#4B8501")' > "${HOME}/.config/cosmic/com.system76.CosmicTheme.Appearance/v1/custom"
+# Hivatalos RaveOS tema importalasa ha elerheto
+if command -v cosmic-settings >/dev/null 2>&1 && [[ -f "${theme_ron}" ]]; then
+    cosmic-settings appearance import "${theme_ron}" >/dev/null 2>&1 || true
+fi
 
-cat > "${HOME}/.config/cosmic/com.system76.CosmicTheme.ron" <<EOF
-(
-    active_theme: (
-        accent: (r: 75, g: 133, b: 1, a: 255),
-    ),
-)
-EOF
+# Alapertelmezett konfig masolasa ha meg nem letezne
+if [[ -d "${cosmic_payload}" ]]; then
+    mkdir -p "${HOME}/.config/cosmic"
+    cp -rn "${cosmic_payload}/." "${HOME}/.config/cosmic/" 2>/dev/null || true
+fi
 
+# Hatterkep beallitasa
 if [[ -f "${wallpaper}" ]]; then
-  mkdir -p "${HOME}/.config/cosmic/com.system76.CosmicBackground/v1"
-  cat > "${HOME}/.config/cosmic/com.system76.CosmicBackground/v1/all" <<EOF
+    mkdir -p "${HOME}/.config/cosmic/com.system76.CosmicBackground/v1"
+    if [[ ! -f "${HOME}/.config/cosmic/com.system76.CosmicBackground/v1/all" ]]; then
+        cat > "${HOME}/.config/cosmic/com.system76.CosmicBackground/v1/all" <<BG_EOF
 (
     output: "all",
     source: Path("${wallpaper}"),
-    filter_by_theme: true,
-    rotation_frequency: 300,
+    filter_by_theme: false,
+    rotation_frequency: 3600,
     filter_method: Lanczos,
     scaling_mode: Zoom,
     sampling_method: Alphanumeric,
 )
-EOF
-  echo "true" > "${HOME}/.config/cosmic/com.system76.CosmicBackground/v1/same-on-all"
+BG_EOF
+        echo "true" > "${HOME}/.config/cosmic/com.system76.CosmicBackground/v1/same-on-all"
+    fi
 fi
 
-# Billentyuzet-kiosztas: a Calamares (systemd-localed) altal beallitott
-# layout/variant atvetele az X11 konfigbol; ez az, amit a cosmic-comp is olvas.
-kb_layout="hu"
-kb_variant=""
-xorg_kb="/etc/X11/xorg.conf.d/00-keyboard.conf"
-if [[ -f "${xorg_kb}" ]]; then
-  kb_tmp="$(awk '/XkbLayout/ {print $3}' "${xorg_kb}" 2>/dev/null | tr -d '"' | head -1)"
-  [[ -n "$kb_tmp" ]] && kb_layout="${kb_tmp%%,*}"
-  kb_tmp="$(awk '/XkbVariant/ {print $3}' "${xorg_kb}" 2>/dev/null | tr -d '"' | head -1)"
-  [[ -n "$kb_tmp" ]] && kb_variant="${kb_tmp%%,*}"
-elif [[ -f /etc/default/keyboard ]]; then
-  kb_tmp="$(awk -F'"' '/^XKBLAYOUT=/{print $2; exit}' /etc/default/keyboard 2>/dev/null)"
-  [[ -n "$kb_tmp" ]] && kb_layout="${kb_tmp%%,*}"
-  kb_tmp="$(awk -F'"' '/^XKBVARIANT=/{print $2; exit}' /etc/default/keyboard 2>/dev/null)"
-  [[ -n "$kb_tmp" ]] && kb_variant="${kb_tmp%%,*}"
-fi
-mkdir -p "${HOME}/.config/cosmic/com.system76.CosmicComp/v1"
-cat > "${HOME}/.config/cosmic/com.system76.CosmicComp/v1/xkb_config" <<EOF
+# Billentyuzet-kiosztas beallitasa
+if [[ ! -f "${HOME}/.config/cosmic/com.system76.CosmicComp/v1/xkb_config" ]]; then
+    kb_layout="hu"
+    kb_variant=""
+    xorg_kb="/etc/X11/xorg.conf.d/00-keyboard.conf"
+    if [[ -f "${xorg_kb}" ]]; then
+        kb_tmp="$(awk '/XkbLayout/ {print $3}' "${xorg_kb}" 2>/dev/null | tr -d '"' | head -1)"
+        [[ -n "$kb_tmp" ]] && kb_layout="${kb_tmp%%,*}"
+        kb_tmp="$(awk '/XkbVariant/ {print $3}' "${xorg_kb}" 2>/dev/null | tr -d '"' | head -1)"
+        [[ -n "$kb_tmp" ]] && kb_variant="${kb_tmp%%,*}"
+    elif [[ -f /etc/default/keyboard ]]; then
+        kb_tmp="$(awk -F'"' '/^XKBLAYOUT=/{print $2; exit}' /etc/default/keyboard 2>/dev/null)"
+        [[ -n "$kb_tmp" ]] && kb_layout="${kb_tmp%%,*}"
+        kb_tmp="$(awk -F'"' '/^XKBVARIANT=/{print $2; exit}' /etc/default/keyboard 2>/dev/null)"
+        [[ -n "$kb_tmp" ]] && kb_variant="${kb_tmp%%,*}"
+    fi
+
+    mkdir -p "${HOME}/.config/cosmic/com.system76.CosmicComp/v1"
+    cat > "${HOME}/.config/cosmic/com.system76.CosmicComp/v1/xkb_config" <<XKB_EOF
 (
     rules: "",
     model: "",
@@ -68,10 +71,7 @@ cat > "${HOME}/.config/cosmic/com.system76.CosmicComp/v1/xkb_config" <<EOF
     repeat_delay: 600,
     repeat_rate: 25,
 )
-EOF
-
-pkill cosmic-bg || true
-pkill cosmic-settings-daemon || true
-pkill cosmic-panel || true
+XKB_EOF
+fi
 
 touch "${marker_file}"
-- 
cgit v1.3