raveos update

4 files changed, 58 insertions, 36 deletions

diff --git a/raveos-hyprland-theme/PKGBUILD b/raveos-hyprland-theme/PKGBUILD
index 8e5a792..a9599cb 100644
--- a/raveos-hyprland-theme/PKGBUILD
+++ b/raveos-hyprland-theme/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=raveos-hyprland-theme
 pkgver=0.0.0
-pkgrel=13
+pkgrel=14
 pkgdesc="RaveOS Hyprland theme payload and installer (includes DankMaterialShell)"
 arch=('any')
 url="https://raveos.local"
diff --git a/raveos-hyprland-theme/raveos-hyprland-apply.sh b/raveos-hyprland-theme/raveos-hyprland-apply.sh
index 93a0266..b83e90a 100644
--- a/raveos-hyprland-theme/raveos-hyprland-apply.sh
+++ b/raveos-hyprland-theme/raveos-hyprland-apply.sh
@@ -13,39 +13,41 @@ if [[ ${EUID} -ne 0 ]]; then
   exit 1
 fi
 
+# --- /etc/skel ---
+
 mkdir -p /etc/skel/.config/hypr
 if [[ -d "${payload_dir}/hypr" ]]; then
   cp -rf "${payload_dir}/hypr/." /etc/skel/.config/hypr/
 fi
+
 mkdir -p /etc/skel/.config/dms
-mkdir -p /etc/skel/.config/matugen
-mkdir -p /etc/skel/.config/kitty
-mkdir -p /etc/skel/.config/fastfetch
 mkdir -p /etc/skel/.config/quickshell/pockets/DMS
-
 if [[ -d "${payload_dir}/DankMaterialShell/quickshell" ]]; then
   cp -r "${payload_dir}/DankMaterialShell/quickshell/." /etc/skel/.config/quickshell/pockets/DMS/
   cp -r "${payload_dir}/DankMaterialShell/quickshell/." /etc/skel/.config/dms/
   if [[ -d "${payload_dir}/DankMaterialShell/quickshell/matugen/configs" ]]; then
+    mkdir -p /etc/skel/.config/matugen
     cp -r "${payload_dir}/DankMaterialShell/quickshell/matugen/configs/." /etc/skel/.config/matugen/
   fi
 fi
-
-if [[ -f "${payload_dir}/fastfetch/config.jsonc" ]]; then
-  install -Dm644 "${payload_dir}/fastfetch/config.jsonc" /etc/skel/.config/fastfetch/config.jsonc
+if [[ -f "${payload_dir}/DankMaterialShell/settings.json" ]]; then
+  install -Dm644 "${payload_dir}/DankMaterialShell/settings.json" /etc/skel/.config/dms/settings.json
 fi
-
-if [[ -f "${payload_dir}/fastfetch/config-kitty.jsonc" ]]; then
-  install -Dm644 "${payload_dir}/fastfetch/config-kitty.jsonc" /etc/skel/.config/fastfetch/config-kitty.jsonc
+if [[ -f "${payload_dir}/DankMaterialShell/.firstlaunch" ]]; then
+  install -Dm644 "${payload_dir}/DankMaterialShell/.firstlaunch" /etc/skel/.config/dms/.firstlaunch
 fi
 
-if [[ -f "${payload_dir}/fastfetch/raveos-logo.png" ]]; then
-  install -Dm644 "${payload_dir}/fastfetch/raveos-logo.png" /etc/skel/.config/fastfetch/raveos-logo.png
+mkdir -p /etc/skel/.config/kitty
+if [[ -f "${payload_dir}/kitty/kitty.conf" ]]; then
+  install -Dm644 "${payload_dir}/kitty/kitty.conf" /etc/skel/.config/kitty/kitty.conf
 fi
 
-if [[ -f "${payload_dir}/fastfetch/raveos-logo.txt" ]]; then
-  install -Dm644 "${payload_dir}/fastfetch/raveos-logo.txt" /etc/skel/.config/fastfetch/raveos-logo.txt
-fi
+mkdir -p /etc/skel/.config/fastfetch
+for f in config.jsonc config-kitty.jsonc raveos-logo.png raveos-logo.txt; do
+  if [[ -f "${payload_dir}/fastfetch/${f}" ]]; then
+    install -Dm644 "${payload_dir}/fastfetch/${f}" "/etc/skel/.config/fastfetch/${f}"
+  fi
+done
 
 if [[ -f "${payload_dir}/profile.d/raveos-fastfetch.sh" ]]; then
   install -Dm755 "${payload_dir}/profile.d/raveos-fastfetch.sh" /etc/profile.d/raveos-fastfetch.sh
@@ -61,10 +63,6 @@ if [[ -f "${payload_dir}/background" ]]; then
   install -Dm644 "${payload_dir}/background" /etc/skel/.config/background
 fi
 
-if [[ -f "${payload_dir}/kitty/kitty.conf" ]]; then
-  install -Dm644 "${payload_dir}/kitty/kitty.conf" /etc/skel/.config/kitty/kitty.conf
-fi
-
 for d in gtk-3.0 gtk-4.0 nwg-look Thunar xfce4 xsettingsd; do
   if [[ -d "${payload_dir}/${d}" ]]; then
     mkdir -p "/etc/skel/.config/${d}"
@@ -93,14 +91,27 @@ for candidate in \
   fi
 done
 
+# --- meglévő userek ---
+
 while IFS=: read -r user _ uid gid _ home shell; do
   [[ "$uid" -ge 1000 ]] || continue
   [[ -d "$home" ]] || continue
   [[ "$shell" != "/usr/bin/nologin" && "$shell" != "/bin/false" ]] || continue
-  mkdir -p "${home}/.config/hypr" "${home}/.config/quickshell/pockets/DMS" "${home}/.config/dms" "${home}/.config/matugen" "${home}/.config/kitty" "${home}/.config/fastfetch"
+
+  mkdir -p "${home}/.config/hypr" \
+           "${home}/.config/quickshell/pockets/DMS" \
+           "${home}/.config/dms" \
+           "${home}/.config/matugen" \
+           "${home}/.config/kitty" \
+           "${home}/.config/fastfetch"
+
   if [[ -d "${payload_dir}/hypr" ]]; then
     cp -rf "${payload_dir}/hypr/." "${home}/.config/hypr/"
   fi
+  # hyprpaper.conf: abszolút home path kell, ~ nem mindig expandál
+  printf 'preload = %s/.config/background\nwallpaper = ,%s/.config/background\nsplash = false\n' \
+    "$home" "$home" > "${home}/.config/hypr/hyprpaper.conf"
+
   if [[ -d "${payload_dir}/DankMaterialShell/quickshell" ]]; then
     cp -r "${payload_dir}/DankMaterialShell/quickshell/." "${home}/.config/quickshell/pockets/DMS/"
     cp -r "${payload_dir}/DankMaterialShell/quickshell/." "${home}/.config/dms/"
@@ -108,37 +119,42 @@ while IFS=: read -r user _ uid gid _ home shell; do
       cp -r "${payload_dir}/DankMaterialShell/quickshell/matugen/configs/." "${home}/.config/matugen/"
     fi
   fi
+  if [[ -f "${payload_dir}/DankMaterialShell/settings.json" ]]; then
+    install -Dm644 "${payload_dir}/DankMaterialShell/settings.json" "${home}/.config/dms/settings.json"
+  fi
+  if [[ -f "${payload_dir}/DankMaterialShell/.firstlaunch" ]]; then
+    install -Dm644 "${payload_dir}/DankMaterialShell/.firstlaunch" "${home}/.config/dms/.firstlaunch"
+  fi
 
   if [[ -d "${payload_dir}/skel" ]]; then
     cp -r --no-preserve=ownership "${payload_dir}/skel/." "$home/"
   fi
+
   if [[ -f "${payload_dir}/background" ]]; then
     install -Dm644 "${payload_dir}/background" "${home}/.config/background"
   fi
+
   if [[ -f "${payload_dir}/kitty/kitty.conf" ]]; then
     install -Dm644 "${payload_dir}/kitty/kitty.conf" "${home}/.config/kitty/kitty.conf"
   fi
-  if [[ -f "${payload_dir}/fastfetch/config.jsonc" ]]; then
-    install -Dm644 "${payload_dir}/fastfetch/config.jsonc" "${home}/.config/fastfetch/config.jsonc"
-  fi
-  if [[ -f "${payload_dir}/fastfetch/config-kitty.jsonc" ]]; then
-    install -Dm644 "${payload_dir}/fastfetch/config-kitty.jsonc" "${home}/.config/fastfetch/config-kitty.jsonc"
-  fi
-  if [[ -f "${payload_dir}/fastfetch/raveos-logo.png" ]]; then
-    install -Dm644 "${payload_dir}/fastfetch/raveos-logo.png" "${home}/.config/fastfetch/raveos-logo.png"
-  fi
-  if [[ -f "${payload_dir}/fastfetch/raveos-logo.txt" ]]; then
-    install -Dm644 "${payload_dir}/fastfetch/raveos-logo.txt" "${home}/.config/fastfetch/raveos-logo.txt"
-  fi
+
+  for f in config.jsonc config-kitty.jsonc raveos-logo.png raveos-logo.txt; do
+    if [[ -f "${payload_dir}/fastfetch/${f}" ]]; then
+      install -Dm644 "${payload_dir}/fastfetch/${f}" "${home}/.config/fastfetch/${f}"
+    fi
+  done
+
   if [[ -f "${payload_dir}/hypr/scripts/raveos-monitor-setup.sh" ]]; then
     bash "${payload_dir}/hypr/scripts/raveos-monitor-setup.sh" --hypr-dir "${home}/.config/hypr"
   fi
+
   for d in gtk-3.0 gtk-4.0 nwg-look Thunar xfce4 xsettingsd; do
     if [[ -d "${payload_dir}/${d}" ]]; then
       mkdir -p "${home}/.config/${d}"
       cp -rf "${payload_dir}/${d}/." "${home}/.config/${d}/"
     fi
   done
+
   chown -R "${uid}:${gid}" "$home"
 done < /etc/passwd
 
diff --git a/raveos-hyprland-theme/theme-data/hypr/hyprland.conf b/raveos-hyprland-theme/theme-data/hypr/hyprland.conf
index 5898d1e..5ee1c2c 100644
--- a/raveos-hyprland-theme/theme-data/hypr/hyprland.conf
+++ b/raveos-hyprland-theme/theme-data/hypr/hyprland.conf
@@ -25,7 +25,7 @@
 ################
 
 # See https://wiki.hypr.land/Configuring/Monitors/
-monitor=HDMI-A-2, 2560x1440@60, 0x0, 1
+source = ./monitors.conf
 
 ###################
 ### MY PROGRAMS ###
@@ -53,7 +53,8 @@ exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once = hyprswitch init --show-title --size-factor 6 --workspaces-per-row 5 &
 exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
 exec-once = bash -c "wl-paste --watch cliphist store &"
-exec-once = dms run
+exec-once = hyprpaper
+exec-once = dms run --config ~/.config/dms
 #exec-once = hyprshell run
 
 
@@ -67,7 +68,7 @@ env = XCURSOR_SIZE,24
 env = HYPRCURSOR_SIZE,24
 
 # Default env vars.
-env = HOME, /home/$USER/
+env = HOME, /home/$USER
 env = XDG_CONFIG_HOME, /home/$USER/.config
 env = XDG_CURRENT_DESKTOP,Hyprland
 env = XDG_SESSION_TYPE,wayland
@@ -436,4 +437,6 @@ windowrule {
     float = yes
 }
 
+source = ./workspaces.conf
+source = ./dms/colors.conf
 source = ./dms/cursor.conf
diff --git a/raveos-hyprland-theme/theme-data/hypr/hyprpaper.conf b/raveos-hyprland-theme/theme-data/hypr/hyprpaper.conf
new file mode 100644
index 0000000..c4178ff
--- /dev/null
+++ b/raveos-hyprland-theme/theme-data/hypr/hyprpaper.conf
@@ -0,0 +1,3 @@
+preload = ~/.config/background
+wallpaper = ,~/.config/background
+splash = false