From 0602eb1bf74b7604cfbe82a24c9cf1ae049d13ca Mon Sep 17 00:00:00 2001 From: Yigid BALABAN Date: Tue, 22 Oct 2024 16:58:40 +0300 Subject: [PATCH] update background logic backgrounds saved for light/dark modes are now stored as the absolute path, so config keys chore.bg_dark and chore.bg_light now contain the string of absolute path to image files. in addition to this update, swww_single chore now copies the current background image to the location of chore.current_bg, which can be used to directly access the image of the current background. --- chores/mode/swww_single.sh | 7 ++++--- utility/nemo/set_wallpaper.sh | 16 ++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/chores/mode/swww_single.sh b/chores/mode/swww_single.sh index 0f32f6a..c40297c 100755 --- a/chores/mode/swww_single.sh +++ b/chores/mode/swww_single.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # reve desktop environment framework # Yigid BALABAN 2024 @@ -23,7 +23,8 @@ ltypes=${#types[@]} rindex=$((RANDOM % ltypes)) rtype=${types[rindex]} -bg="$(util_where_config chore."bg_$RV_CURRENT_MODE")" +bg="$(util_read_config chore."bg_$RV_CURRENT_MODE")" swww img --transition-type "$rtype" --transition-pos 1,1 --transition-step 90 "$bg" -notify-send --urgency=low --expire-time=1450 --icon="$bg" --app-name="reve: swww_single" "Wallpaper changed" "Wallpaper changed and saved on light mode." +notify-send --urgency=low --expire-time=1450 --icon="$bg" --app-name="reve: swww_single" "Wallpaper changed" "Wallpaper changed and saved on $RV_CURRENT_MODE mode." +cp "$bg" "$(util_where_config chore.current_bg)" reload misc/asus_kbd_light.sh diff --git a/utility/nemo/set_wallpaper.sh b/utility/nemo/set_wallpaper.sh index 87a1826..92820b6 100755 --- a/utility/nemo/set_wallpaper.sh +++ b/utility/nemo/set_wallpaper.sh @@ -6,13 +6,10 @@ # cp utility/nemo/set_wallpaper.sh ~/.local/share/nemo/scripts # chmod +x ~/.local/share/nemo/scripts/set_wallpaper.sh +# shellcheck source=../../_reve.sh source "$(reve where)/_reve" -reve_folder="$HOME/.config/reve" -reve_desktop_mode="$reve_folder/desktop_mode" -mode=$(util_readf "$reve_desktop_mode") -bgl="$reve_folder/chore/bg_light" -bgd="$reve_folder/chore/bg_dark" +mode=$(util_read_config base.desktop_mode) if [ "$NEMO_SCRIPT_SELECTED_FILE_PATHS" = "" ]; then first=$1 @@ -20,10 +17,5 @@ else first=$(echo "$NEMO_SCRIPT_SELECTED_FILE_PATHS" | head -n 1) fi -if [ "$mode" = "dark" ]; then - cp -T "$first" "$bgd" -else - cp -T "$first" "$bgl" -fi - -reload mode/swww_single $mode +util_write_config "chore.bg_$mode" "$first" +reload mode/swww_single "$mode"