From 97999cd4e4ddc3168be91dda6ed378d79e567c9d Mon Sep 17 00:00:00 2001 From: Cu3PO42 Date: Wed, 3 Apr 2024 21:56:05 +0200 Subject: [PATCH] chore: move more files to XDG_STATE_HOME --- .config/ags/modules/.miscutils/system.js | 2 +- .config/ags/modules/indicators/colorscheme.js | 8 ++++---- .config/ags/modules/indicators/musiccontrols.js | 2 +- .config/ags/modules/overview/miscfunctions.js | 10 +++++----- .../ags/modules/sideright/centermodules/configure.js | 4 ++-- .config/ags/scripts/color_generation/applycolor.sh | 6 +++--- .config/ags/scripts/color_generation/colorgen.sh | 12 ++++++------ .config/ags/scripts/color_generation/switchcolor.sh | 4 +++- .config/ags/services/todo.js | 2 +- .config/ags/services/wallpaper.js | 2 +- 10 files changed, 27 insertions(+), 25 deletions(-) diff --git a/.config/ags/modules/.miscutils/system.js b/.config/ags/modules/.miscutils/system.js index 210dd3f7..3f81458f 100644 --- a/.config/ags/modules/.miscutils/system.js +++ b/.config/ags/modules/.miscutils/system.js @@ -8,7 +8,7 @@ export const isDebianDistro = (distroID == 'linuxmint' || distroID == 'ubuntu' | export const isArchDistro = (distroID == 'arch' || distroID == 'endeavouros' || distroID == 'cachyos'); export const hasFlatpak = !!exec(`bash -c 'command -v flatpak'`); -const LIGHTDARK_FILE_LOCATION = `${GLib.get_user_cache_dir()}/ags/user/colormode.txt`; +const LIGHTDARK_FILE_LOCATION = `${GLib.get_user_state_dir()}/ags/user/colormode.txt`; const colorMode = Utils.exec(`bash -c "sed -n '1p' '${LIGHTDARK_FILE_LOCATION}'"`); export let darkMode = Variable(!(Utils.readFile(LIGHTDARK_FILE_LOCATION).split('\n')[0].trim() == 'light')); export const hasPlasmaIntegration = !!Utils.exec('bash -c "command -v plasma-browser-integration-host"'); diff --git a/.config/ags/modules/indicators/colorscheme.js b/.config/ags/modules/indicators/colorscheme.js index d679aff7..65906bd6 100644 --- a/.config/ags/modules/indicators/colorscheme.js +++ b/.config/ags/modules/indicators/colorscheme.js @@ -96,7 +96,7 @@ const schemeOptionsArr = [ //] ]; -const LIGHTDARK_FILE_LOCATION = `${GLib.get_user_cache_dir()}/ags/user/colormode.txt`; +const LIGHTDARK_FILE_LOCATION = `${GLib.get_user_state_dir()}/ags/user/colormode.txt`; const initColorMode = Utils.exec(`bash -c "sed -n \'1p\' ${LIGHTDARK_FILE_LOCATION}"`); const initColorVal = (initColorMode == "dark") ? 1 : 0; const initTransparency = Utils.exec(`bash -c "sed -n \'2p\' ${LIGHTDARK_FILE_LOCATION}"`); @@ -126,7 +126,7 @@ const ColorSchemeSettings = () => Widget.Box({ initValue: initColorVal, onChange: (self, newValue) => { let lightdark = newValue == 0 ? "light" : "dark"; - execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_cache_dir()}/ags/user && sed -i "1s/.*/${lightdark}/" ${GLib.get_user_cache_dir()}/ags/user/colormode.txt`]) + execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_state_dir()}/ags/user && sed -i "1s/.*/${lightdark}/" ${GLib.get_user_state_dir()}/ags/user/colormode.txt`]) .then(execAsync(['bash', '-c', `${App.configDir}/scripts/color_generation/switchcolor.sh`])) .catch(print); }, @@ -138,7 +138,7 @@ const ColorSchemeSettings = () => Widget.Box({ initValue: initTransparencyVal, onChange: (self, newValue) => { let transparency = newValue == 0 ? "opaque" : "transparent"; - execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_cache_dir()}/ags/user && sed -i "2s/.*/${transparency}/" ${GLib.get_user_cache_dir()}/ags/user/colormode.txt`]) + execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_state_dir()}/ags/user && sed -i "2s/.*/${transparency}/" ${GLib.get_user_state_dir()}/ags/user/colormode.txt`]) .then(execAsync(['bash', '-c', `${App.configDir}/scripts/color_generation/switchcolor.sh`])) .catch(print); }, @@ -162,7 +162,7 @@ const ColorSchemeSettings = () => Widget.Box({ optionsArr: schemeOptionsArr, initIndex: initSchemeIndex, onChange: (value, name) => { - execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_cache_dir()}/ags/user && sed -i "3s/.*/${value}/" ${GLib.get_user_cache_dir()}/ags/user/colormode.txt`]) + execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_state_dir()}/ags/user && sed -i "3s/.*/${value}/" ${GLib.get_user_state_dir()}/ags/user/colormode.txt`]) .then(execAsync(['bash', '-c', `${App.configDir}/scripts/color_generation/switchcolor.sh`])) .catch(print); }, diff --git a/.config/ags/modules/indicators/musiccontrols.js b/.config/ags/modules/indicators/musiccontrols.js index 88951fb0..a547c9c2 100644 --- a/.config/ags/modules/indicators/musiccontrols.js +++ b/.config/ags/modules/indicators/musiccontrols.js @@ -12,7 +12,7 @@ import { showMusicControls } from '../../variables.js'; import { darkMode, hasPlasmaIntegration } from '../.miscutils/system.js'; const COMPILED_STYLE_DIR = `${GLib.get_user_cache_dir()}/ags/user/generated` -const LIGHTDARK_FILE_LOCATION = `${GLib.get_user_cache_dir()}/ags/user/colormode.txt`; +const LIGHTDARK_FILE_LOCATION = `${GLib.get_user_state_dir()}/ags/user/colormode.txt`; const colorMode = Utils.exec(`bash -c "sed -n \'1p\' '${LIGHTDARK_FILE_LOCATION}'"`); const lightDark = (colorMode == "light") ? '-l' : ''; const COVER_COLORSCHEME_SUFFIX = '_colorscheme.css'; diff --git a/.config/ags/modules/overview/miscfunctions.js b/.config/ags/modules/overview/miscfunctions.js index 0e7505f7..199b25c3 100644 --- a/.config/ags/modules/overview/miscfunctions.js +++ b/.config/ags/modules/overview/miscfunctions.js @@ -33,28 +33,28 @@ export function launchCustomCommand(command) { } else if (args[0] == '>light') { // Light mode darkMode.value = false; - execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_cache_dir()}/ags/user && sed -i "1s/.*/light/" ${GLib.get_user_cache_dir()}/ags/user/colormode.txt`]) + execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_state_dir()}/ags/user && sed -i "1s/.*/light/" ${GLib.get_user_state_dir()}/ags/user/colormode.txt`]) .then(execAsync(['bash', '-c', `${App.configDir}/scripts/color_generation/switchcolor.sh`])) .catch(print); } else if (args[0] == '>dark') { // Dark mode darkMode.value = true; - execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_cache_dir()}/ags/user && sed -i "1s/.*/dark/" ${GLib.get_user_cache_dir()}/ags/user/colormode.txt`]) + execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_state_dir()}/ags/user && sed -i "1s/.*/dark/" ${GLib.get_user_state_dir()}/ags/user/colormode.txt`]) .then(execAsync(['bash', '-c', `${App.configDir}/scripts/color_generation/switchcolor.sh`])) .catch(print); } else if (args[0] == '>badapple') { // Black and white - execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_cache_dir()}/ags/user && sed -i "3s/.*/monochrome/" ${GLib.get_user_cache_dir()}/ags/user/colormode.txt`]) + execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_state_dir()}/ags/user && sed -i "3s/.*/monochrome/" ${GLib.get_user_state_dir()}/ags/user/colormode.txt`]) .then(execAsync(['bash', '-c', `${App.configDir}/scripts/color_generation/switchcolor.sh`])) .catch(print); } else if (args[0] == '>material') { // Use material colors - execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_cache_dir()}/ags/user && echo "material" > ${GLib.get_user_cache_dir()}/ags/user/colorbackend.txt`]).catch(print) + execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_state_dir()}/ags/user && echo "material" > ${GLib.get_user_state_dir()}/ags/user/colorbackend.txt`]).catch(print) .then(execAsync(['bash', '-c', `${App.configDir}/scripts/color_generation/switchwall.sh --noswitch`]).catch(print)) .catch(print); } else if (args[0] == '>pywal') { // Use Pywal (ik it looks shit but I'm not removing) - execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_cache_dir()}/ags/user && echo "pywal" > ${GLib.get_user_cache_dir()}/ags/user/colorbackend.txt`]).catch(print) + execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_state_dir()}/ags/user && echo "pywal" > ${GLib.get_user_state_dir()}/ags/user/colorbackend.txt`]).catch(print) .then(execAsync(['bash', '-c', `${App.configDir}/scripts/color_generation/switchwall.sh --noswitch`]).catch(print)) .catch(print); } diff --git a/.config/ags/modules/sideright/centermodules/configure.js b/.config/ags/modules/sideright/centermodules/configure.js index c5ba1795..ef3923bf 100644 --- a/.config/ags/modules/sideright/centermodules/configure.js +++ b/.config/ags/modules/sideright/centermodules/configure.js @@ -65,11 +65,11 @@ export default (props) => { icon: 'border_clear', name: 'Transparency', desc: 'Make shell elements transparent\nBlur is also recommended if you enable this', - initValue: exec('bash -c "sed -n \'2p\' $HOME/.cache/ags/user/colormode.txt"') == "transparent", + initValue: exec(`bash -c "sed -n \'2p\' ${GLib.get_user_state_dir()}/ags/user/colormode.txt"`) == "transparent", onChange: (self, newValue) => { const transparency = newValue == 0 ? "opaque" : "transparent"; console.log(transparency); - execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_cache_dir()}/ags/user && sed -i "2s/.*/${transparency}/" ${GLib.get_user_cache_dir()}/ags/user/colormode.txt`]) + execAsync([`bash`, `-c`, `mkdir -p ${GLib.get_user_state_dir()}/ags/user && sed -i "2s/.*/${transparency}/" ${GLib.get_user_state_dir()}/ags/user/colormode.txt`]) .then(execAsync(['bash', '-c', `${App.configDir}/scripts/color_generation/switchcolor.sh`])) .catch(print); }, diff --git a/.config/ags/scripts/color_generation/applycolor.sh b/.config/ags/scripts/color_generation/applycolor.sh index 98be96a9..8f67b936 100755 --- a/.config/ags/scripts/color_generation/applycolor.sh +++ b/.config/ags/scripts/color_generation/applycolor.sh @@ -39,10 +39,10 @@ transparentize() { get_light_dark() { lightdark="" - if [ ! -f "$CACHE_DIR"/user/colormode.txt ]; then - echo "" > "$CACHE_DIR"/user/colormode.txt + if [ ! -f "$STATE_DIR/user/colormode.txt" ]; then + echo "" > "$STATE_DIR/user/colormode.txt" else - lightdark=$(sed -n '1p' "$CACHE_DIR/user/colormode.txt") + lightdark=$(sed -n '1p' "$STATE_DIR/user/colormode.txt") fi echo "$lightdark" } diff --git a/.config/ags/scripts/color_generation/colorgen.sh b/.config/ags/scripts/color_generation/colorgen.sh index 8a1638c5..99ac2f6e 100755 --- a/.config/ags/scripts/color_generation/colorgen.sh +++ b/.config/ags/scripts/color_generation/colorgen.sh @@ -13,8 +13,8 @@ if [ $# -eq 0 ]; then exit 1 fi -# check if the file $CACHE_DIR/user/colormode.txt exists. if not, create it. else, read it to $lightdark -colormodefile="$CACHE_DIR/user/colormode.txt" +# check if the file $STATE_DIR/user/colormode.txt exists. if not, create it. else, read it to $lightdark +colormodefile="$STATE_DIR/user/colormode.txt" lightdark="dark" transparency="opaque" materialscheme="vibrant" @@ -37,10 +37,10 @@ else fi fi backend="material" # color generator backend -if [ ! -f "$CACHE_DIR/user/colorbackend.txt" ]; then - echo "material" > "$CACHE_DIR/user/colorbackend.txt" +if [ ! -f "$STATE_DIR/user/colorbackend.txt" ]; then + echo "material" > "$STATE_DIR/user/colorbackend.txt" else - backend=$(cat "$CACHE_DIR/user/colorbackend.txt") # either "" or "-l" + backend=$(cat "$STATE_DIR/user/colorbackend.txt") # either "" or "-l" fi cd "$CONFIG_DIR/scripts/" || exit @@ -61,7 +61,7 @@ elif [ "$backend" = "material" ]; then color_generation/generate_colors_material.py --path "$1" \ --mode "$lightdark" --scheme "$materialscheme" --transparency "$transparency" \ --termscheme $terminalscheme --blend_bg_fg \ - --cache "$CACHE_DIR/user/color.txt" $smartflag \ + --cache "$STATE_DIR/user/color.txt" $smartflag \ > "$CACHE_DIR"/user/generated/material_colors.scss if [ "$2" = "--apply" ]; then cp "$CACHE_DIR"/user/generated/material_colors.scss "$STATE_DIR/scss/_material.scss" diff --git a/.config/ags/scripts/color_generation/switchcolor.sh b/.config/ags/scripts/color_generation/switchcolor.sh index 11d69a30..0c083ba4 100755 --- a/.config/ags/scripts/color_generation/switchcolor.sh +++ b/.config/ags/scripts/color_generation/switchcolor.sh @@ -2,13 +2,15 @@ XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" +XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}" CONFIG_DIR="$XDG_CONFIG_HOME/ags" CACHE_DIR="$XDG_CACHE_HOME/ags" +STATE_DIR="$XDG_STATE_HOME/ags" if [ "$1" == "--pick" ]; then color=$(hyprpicker --no-fancy) else - color=$(cut -f1 "${CACHE_DIR}/user/color.txt") + color=$(cut -f1 "$STATE_DIR/user/color.txt") fi # Generate colors for ags n stuff diff --git a/.config/ags/services/todo.js b/.config/ags/services/todo.js index 9ceff5dd..d5384f3b 100644 --- a/.config/ags/services/todo.js +++ b/.config/ags/services/todo.js @@ -58,7 +58,7 @@ class TodoService extends Service { constructor() { super(); - this._todoPath = `${GLib.get_user_cache_dir()}/ags/user/todo.json`; + this._todoPath = `${GLib.get_user_state_dir()}/ags/user/todo.json`; try { const fileContents = Utils.readFile(this._todoPath); this._todoJson = JSON.parse(fileContents); diff --git a/.config/ags/services/wallpaper.js b/.config/ags/services/wallpaper.js index e1bcac5c..9fa2b83f 100644 --- a/.config/ags/services/wallpaper.js +++ b/.config/ags/services/wallpaper.js @@ -2,7 +2,7 @@ const { Gdk, GLib } = imports.gi; import Service from 'resource:///com/github/Aylur/ags/service.js'; import * as Utils from 'resource:///com/github/Aylur/ags/utils.js'; -const WALLPAPER_CONFIG_PATH = `${GLib.get_user_cache_dir()}/ags/user/wallpaper.json`; +const WALLPAPER_CONFIG_PATH = `${GLib.get_user_state_dir()}/ags/user/wallpaper.json`; class WallpaperService extends Service { static {