updated mode chores & nemo utility for comp.

chores/mode/gtk_theme.sh

@@ -9,27 +9,8 @@
 # desc  changes the GTK theme and color-scheme according to desktop_mode
 # vars  gtk_dark_theme, gtk_light_theme
 
-reve_folder="$HOME/.config/reve"
+# shellcheck source=../../_reve.sh
-reve_desktop_mode="$reve_folder/desktop_mode"
+source "$(reve where)/_reve"
-gtk_dark_theme="$reve_folder/chore/gtk_dark_theme"
-gtk_light_theme="$reve_folder/chore/gtk_light_theme"
 
-util_readf () {
+gsettings set org.gnome.desktop.interface gtk-theme "$(util_read_config chore.gtk_"$RV_CURRENT_MODE"_theme)"
-    local filename=$1
+gsettings set org.gnome.desktop.interface color-scheme prefer-"$RV_CURRENT_MODE"
-
-    if [[ -f "$filename" ]]; then
-        cat "$filename"
-    else
-        echo "util_readf: File not found: $filename" >&2
-        return 1
-    fi
-}
-
-current_mode=$( util_readf "$reve_desktop_mode" )
-if [[ "$current_mode" == "dark" ]]; then
-    gsettings set org.gnome.desktop.interface gtk-theme $( util_readf "$gtk_dark_theme" )
-    gsettings set org.gnome.desktop.interface color-scheme prefer-dark
-else
-    gsettings set org.gnome.desktop.interface gtk-theme $( util_readf "$gtk_light_theme" )
-    gsettings set org.gnome.desktop.interface color-scheme prefer-light
-fi

chores/mode/kitty_theme.sh

@@ -7,32 +7,14 @@
 # type  mode
 # name  kitty_theme.sh
 # desc  changes kitty's theme depending on desktop_mode
-# vars  kitty_dark_theme, kitty_light_theme
+# vars  kitty/dark, kitty/light
+
+# shellcheck source=../../_reve.sh
+source "$(reve where)/_reve"
 
 if ! command -v kitty &>/dev/null; then
   echo "kitty is not installed. Please install it and try again."
   exit 1
 fi
 
-reve_folder="$HOME/.config/reve"
+kitten themes --reload-in=all "$(util_read_config chore.kitty."$RV_CURRENT_THEME")"
-reve_desktop_mode="$reve_folder/desktop_mode"
-kitty_dark_theme="$reve_folder/chore/kitty/dark"
-kitty_light_theme="$reve_folder/chore/kitty/light"
-
-util_readf () {
-    local filename=$1
-
-    if [[ -f "$filename" ]]; then
-        cat "$filename"
-    else
-        echo "util_readf: File not found: $filename" >&2
-        return 1
-    fi
-}
-
-current_mode=$( util_readf "$reve_desktop_mode" )
-if [[ $current_mode == "dark" ]]; then
-    kitten themes --reload-in=all "$( util_readf "$kitty_dark_theme" )"
-else
-    kitten themes --reload-in=all "$( util_readf "$kitty_light_theme" )"
-fi

chores/mode/spicetify.sh

@@ -7,20 +7,10 @@
 # type  mode
 # name  spicetify.sh
 # desc  changes spicetify theme depending on desktop_mode
-# vars  spicetify_dark_theme, spicetify_light_theme
+# vars  spicetify/dark, spicetify/light
 
-reve_folder="$HOME/.config/reve"
+# shellcheck source=../../_reve.sh
-reve_desktop_mode="$reve_folder/desktop_mode"
+source "$(reve where)/_reve"
 
-source "$( reve -w )/_reve"
+spicetify -q config color_scheme "$(util_read_config chore.spicetify."$RV_CURRENT_MODE")"
-
-current_mode=$( util_readf "$reve_desktop_mode" )
-spicetify_dark_theme=$( util_readf "$reve_folder/chore/spicetify/dark")
-spicetify_light_theme=$( util_readf "$reve_folder/chore/spicetify/light")
-
-if [[ "$current_mode" == "dark" ]]; then
-    spicetify -q config color_scheme "$spicetify_dark_theme"
-else
-    spicetify -q config color_scheme "$spicetify_light_theme"
-fi
 spicetify -q apply

chores/mode/swww_single.sh

@@ -15,9 +15,7 @@ if ! command -v swww &>/dev/null; then
   exit 1
 fi
 
-bg_dark="$REVE_FOLDER/chore/bg_dark"
+# shellcheck source=../../_reve.sh
-bg_light="$REVE_FOLDER/chore/bg_light"
-
 source "$(reve where)/_reve"
 
 types=("left" "right" "top" "bottom" "wipe" "wave" "grow" "outer")
@@ -25,12 +23,7 @@ ltypes=${#types[@]}
 rindex=$((RANDOM % ltypes))
 rtype=${types[rindex]}
 
-if [[ $RV_CURRENT_MODE == "dark" ]]; then
+bg="$(util_where_config chore."bg_$RV_CURRENT_MODE")"
-  swww img --transition-type "$rtype" --transition-pos 1,1 --transition-step 90 "$bg_dark"
+swww img --transition-type "$rtype" --transition-pos 1,1 --transition-step 90 "$bg"
-  notify-send --urgency=low --expire-time=1450 --icon="$bg_dark" --app-name="reve: swww_single" "Wallpaper changed" "Wallpaper changed and saved on dark mode."
+notify-send --urgency=low --expire-time=1450 --icon="$bg" --app-name="reve: swww_single" "Wallpaper changed" "Wallpaper changed and saved on light mode."
-else
-  swww img --transition-type "$rtype" --transition-pos 1,1 --transition-step 90 "$bg_light"
-  notify-send --urgency=low --expire-time=1450 --icon="$bg_light" --app-name="reve: swww_single" "Wallpaper changed" "Wallpaper changed and saved on light mode."
-fi
-
 reload misc/asus_kbd_light.sh

utility/nemo/set_wallpaper.sh

@@ -3,20 +3,27 @@
 # reve                              desktop environment framework
 # Yigid BALABAN <fyb@fybx.dev>                               2024
 
-# ln -s utility/nemo/set_wallpaper.sh ~/.local/share/nemo/scripts
+# cp utility/nemo/set_wallpaper.sh ~/.local/share/nemo/scripts
+# chmod +x ~/.local/share/nemo/scripts/set_wallpaper.sh
 
+source "$(reve where)/_reve"
 reve_folder="$HOME/.config/reve"
 reve_desktop_mode="$reve_folder/desktop_mode"
 
-mode=$(cat "$reve_folder/desktop_mode")
+mode=$(util_readf "$reve_desktop_mode")
-first=$(echo "$NEMO_SCRIPT_SELECTED_FILE_PATHS" | head -n 1)
+bgl="$reve_folder/chore/bg_light"
-bgl="$reve_folder/chores/bg_light"
+bgd="$reve_folder/chore/bg_dark"
-bgd="$reve_folder/chores/bg_dark"
 
-if [ "$mode" = "light" ]; then
+if [ "$NEMO_SCRIPT_SELECTED_FILE_PATHS" = "" ]; then
-  cp "$first" "$bgl"
+  first=$1
 else
-  cp "$first" "$bgd"
+  first=$(echo "$NEMO_SCRIPT_SELECTED_FILE_PATHS" | head -n 1)
 fi
 
-bash "$HOME/scripts/utility/deskenv.sh" nobright "$mode"
+if [ "$mode" = "dark" ]; then
+  cp -T "$first" "$bgd"
+else
+  cp -T "$first" "$bgl"
+fi
+
+reload mode/swww_single