From 9c56e6dde4b984f274530a9b13153e07194dba67 Mon Sep 17 00:00:00 2001 From: Cu3PO42 Date: Wed, 3 Apr 2024 21:55:42 +0200 Subject: [PATCH] feat: use XDG base directories --- .config/ags/modules/.miscutils/system.js | 2 +- .config/ags/modules/bar/normal/music.js | 2 +- .config/ags/modules/indicators/colorscheme.js | 7 +- .../ags/modules/indicators/musiccontrols.js | 2 +- .config/ags/modules/sideright/quicktoggles.js | 2 +- .../scripts/color_generation/applycolor.sh | 69 ++++++++++--------- .../ags/scripts/color_generation/colorgen.sh | 48 +++++++------ .../scripts/color_generation/switchcolor.sh | 9 ++- .../scripts/color_generation/switchwall.sh | 5 +- 9 files changed, 83 insertions(+), 63 deletions(-) diff --git a/.config/ags/modules/.miscutils/system.js b/.config/ags/modules/.miscutils/system.js index ef7d15c36..210dd3f73 100644 --- a/.config/ags/modules/.miscutils/system.js +++ b/.config/ags/modules/.miscutils/system.js @@ -9,7 +9,7 @@ export const isArchDistro = (distroID == 'arch' || distroID == 'endeavouros' || export const hasFlatpak = !!exec(`bash -c 'command -v flatpak'`); const LIGHTDARK_FILE_LOCATION = `${GLib.get_user_cache_dir()}/ags/user/colormode.txt`; -const colorMode = Utils.exec('bash -c "sed -n \'1p\' $HOME/.cache/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/bar/normal/music.js b/.config/ags/modules/bar/normal/music.js index 4bc547ba9..9dbf5c55e 100644 --- a/.config/ags/modules/bar/normal/music.js +++ b/.config/ags/modules/bar/normal/music.js @@ -157,7 +157,7 @@ export default () => { ] }) const SystemResourcesOrCustomModule = () => { - // Check if ~/.cache/ags/user/scripts/custom-module-poll.sh exists + // Check if $XDG_CACHE_HOME/ags/user/scripts/custom-module-poll.sh exists if (GLib.file_test(CUSTOM_MODULE_CONTENT_SCRIPT, GLib.FileTest.EXISTS)) { const interval = Number(Utils.readFile(CUSTOM_MODULE_CONTENT_INTERVAL_FILE)) || 5000; return BarGroup({ diff --git a/.config/ags/modules/indicators/colorscheme.js b/.config/ags/modules/indicators/colorscheme.js index 3d205dd03..d679aff78 100644 --- a/.config/ags/modules/indicators/colorscheme.js +++ b/.config/ags/modules/indicators/colorscheme.js @@ -96,11 +96,12 @@ const schemeOptionsArr = [ //] ]; -const initColorMode = Utils.exec('bash -c "sed -n \'1p\' $HOME/.cache/ags/user/colormode.txt"'); +const LIGHTDARK_FILE_LOCATION = `${GLib.get_user_cache_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\' $HOME/.cache/ags/user/colormode.txt"'); +const initTransparency = Utils.exec(`bash -c "sed -n \'2p\' ${LIGHTDARK_FILE_LOCATION}"`); const initTransparencyVal = (initTransparency == "transparent") ? 1 : 0; -const initScheme = Utils.exec('bash -c "sed -n \'3p\' $HOME/.cache/ags/user/colormode.txt"'); +const initScheme = Utils.exec(`bash -c "sed -n \'3p\' ${LIGHTDARK_FILE_LOCATION}"`); const initSchemeIndex = calculateSchemeInitIndex(schemeOptionsArr, initScheme); const ColorSchemeSettings = () => Widget.Box({ diff --git a/.config/ags/modules/indicators/musiccontrols.js b/.config/ags/modules/indicators/musiccontrols.js index d39b49b4c..1e2db3bc7 100644 --- a/.config/ags/modules/indicators/musiccontrols.js +++ b/.config/ags/modules/indicators/musiccontrols.js @@ -13,7 +13,7 @@ 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 colorMode = Utils.exec('bash -c "sed -n \'1p\' $HOME/.cache/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'; var lastCoverPath = ''; diff --git a/.config/ags/modules/sideright/quicktoggles.js b/.config/ags/modules/sideright/quicktoggles.js index 227ca1689..fb0d1d317 100644 --- a/.config/ags/modules/sideright/quicktoggles.js +++ b/.config/ags/modules/sideright/quicktoggles.js @@ -157,7 +157,7 @@ export const ModuleInvertColors = async (props = {}) => { button.toggleClassName('sidebar-button-active', false); } else { - Hyprland.messageAsync(`j/keyword decoration:screen_shader ${GLib.get_home_dir()}/.config/hypr/shaders/invert.frag`) + Hyprland.messageAsync(`j/keyword decoration:screen_shader ${GLib.get_user_config_dir()}/hypr/shaders/invert.frag`) .catch(print); button.toggleClassName('sidebar-button-active', true); } diff --git a/.config/ags/scripts/color_generation/applycolor.sh b/.config/ags/scripts/color_generation/applycolor.sh index e41d7c610..0e612ca5d 100755 --- a/.config/ags/scripts/color_generation/applycolor.sh +++ b/.config/ags/scripts/color_generation/applycolor.sh @@ -1,11 +1,16 @@ #!/usr/bin/env bash +XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" +CONFIG_DIR="$XDG_CONFIG_HOME/ags" +CACHE_DIR="$XDG_CACHE_HOME/ags" + term_alpha=100 #Set this to < 100 make all your terminals transparent # sleep 0 # idk i wanted some delay or colors dont get applied properly -if [ ! -d "$HOME"/.cache/ags/user/generated ]; then - mkdir -p "$HOME"/.cache/ags/user/generated +if [ ! -d "$CACHE_DIR"/user/generated ]; then + mkdir -p "$CACHE_DIR"/user/generated fi -cd "$HOME/.config/ags" || exit +cd "$CONFIG_DIR" || exit colornames='' colorstrings='' @@ -13,7 +18,7 @@ colorlist=() colorvalues=() # wallpath=$(swww query | head -1 | awk -F 'image: ' '{print $2}') -# wallpath_png="$HOME"'/.cache/ags/user/generated/hypr/lockscreen.png' +# wallpath_png="$CACHE_DIR/user/generated/hypr/lockscreen.png" # convert "$wallpath" "$wallpath_png" # wallpath_png=$(echo "$wallpath_png" | sed 's/\//\\\//g') # wallpath_png=$(sed 's/\//\\\\\//g' <<< "$wallpath_png") @@ -32,10 +37,10 @@ transparentize() { get_light_dark() { lightdark="" - if [ ! -f "$HOME"/.cache/ags/user/colormode.txt ]; then - echo "" > "$HOME"/.cache/ags/user/colormode.txt + if [ ! -f "$CACHE_DIR"/user/colormode.txt ]; then + echo "" > "$CACHE_DIR"/user/colormode.txt else - lightdark=$(sed -n '1p' "$HOME/.cache/ags/user/colormode.txt") + lightdark=$(sed -n '1p' "$CACHE_DIR/user/colormode.txt") fi echo "$lightdark" } @@ -47,14 +52,14 @@ apply_fuzzel() { return fi # Copy template - mkdir -p "$HOME"/.cache/ags/user/generated/fuzzel - cp "scripts/templates/fuzzel/fuzzel.ini" "$HOME"/.cache/ags/user/generated/fuzzel/fuzzel.ini + mkdir -p "$CACHE_DIR"/user/generated/fuzzel + cp "scripts/templates/fuzzel/fuzzel.ini" "$CACHE_DIR"/user/generated/fuzzel/fuzzel.ini # Apply colors for i in "${!colorlist[@]}"; do - sed -i "s/{{ ${colorlist[$i]} }}/${colorvalues[$i]#\#}/g" "$HOME"/.cache/ags/user/generated/fuzzel/fuzzel.ini + sed -i "s/{{ ${colorlist[$i]} }}/${colorvalues[$i]#\#}/g" "$CACHE_DIR"/user/generated/fuzzel/fuzzel.ini done - cp "$HOME"/.cache/ags/user/generated/fuzzel/fuzzel.ini "$HOME"/.config/fuzzel/fuzzel.ini + cp "$CACHE_DIR"/user/generated/fuzzel/fuzzel.ini "$XDG_CONFIG_HOME"/fuzzel/fuzzel.ini } apply_term() { @@ -64,18 +69,18 @@ apply_term() { return fi # Copy template - mkdir -p "$HOME"/.cache/ags/user/generated/terminal - cp "scripts/templates/terminal/sequences.txt" "$HOME"/.cache/ags/user/generated/terminal/sequences.txt + mkdir -p "$CACHE_DIR"/user/generated/terminal + cp "scripts/templates/terminal/sequences.txt" "$CACHE_DIR"/user/generated/terminal/sequences.txt # Apply colors for i in "${!colorlist[@]}"; do - sed -i "s/${colorlist[$i]} #/${colorvalues[$i]#\#}/g" "$HOME"/.cache/ags/user/generated/terminal/sequences.txt + sed -i "s/${colorlist[$i]} #/${colorvalues[$i]#\#}/g" "$CACHE_DIR"/user/generated/terminal/sequences.txt done - sed -i "s/\$alpha/$term_alpha/g" "$HOME/.cache/ags/user/generated/terminal/sequences.txt" + sed -i "s/\$alpha/$term_alpha/g" "$CACHE_DIR/user/generated/terminal/sequences.txt" for file in /dev/pts/*; do if [[ $file =~ ^/dev/pts/[0-9]+$ ]]; then - cat "$HOME"/.cache/ags/user/generated/terminal/sequences.txt > "$file" + cat "$CACHE_DIR"/user/generated/terminal/sequences.txt > "$file" fi done } @@ -87,14 +92,14 @@ apply_hyprland() { return fi # Copy template - mkdir -p "$HOME"/.cache/ags/user/generated/hypr/hyprland - cp "scripts/templates/hypr/hyprland/colors.conf" "$HOME"/.cache/ags/user/generated/hypr/hyprland/colors.conf + mkdir -p "$CACHE_DIR"/user/generated/hypr/hyprland + cp "scripts/templates/hypr/hyprland/colors.conf" "$CACHE_DIR"/user/generated/hypr/hyprland/colors.conf # Apply colors for i in "${!colorlist[@]}"; do - sed -i "s/{{ ${colorlist[$i]} }}/${colorvalues[$i]#\#}/g" "$HOME"/.cache/ags/user/generated/hypr/hyprland/colors.conf + sed -i "s/{{ ${colorlist[$i]} }}/${colorvalues[$i]#\#}/g" "$CACHE_DIR"/user/generated/hypr/hyprland/colors.conf done - cp "$HOME"/.cache/ags/user/generated/hypr/hyprland/colors.conf "$HOME"/.config/hypr/hyprland/colors.conf + cp "$CACHE_DIR"/user/generated/hypr/hyprland/colors.conf "$XDG_CONFIG_HOME"/hypr/hyprland/colors.conf } apply_hyprlock() { @@ -104,31 +109,31 @@ apply_hyprlock() { return fi # Copy template - mkdir -p "$HOME"/.cache/ags/user/generated/hypr/ - cp "scripts/templates/hypr/hyprlock.conf" "$HOME"/.cache/ags/user/generated/hypr/hyprlock.conf + mkdir -p "$CACHE_DIR"/user/generated/hypr/ + cp "scripts/templates/hypr/hyprlock.conf" "$CACHE_DIR"/user/generated/hypr/hyprlock.conf # Apply colors - # sed -i "s/{{ SWWW_WALL }}/${wallpath_png}/g" "$HOME"/.cache/ags/user/generated/hypr/hyprlock.conf + # sed -i "s/{{ SWWW_WALL }}/${wallpath_png}/g" "$CACHE_DIR"/user/generated/hypr/hyprlock.conf for i in "${!colorlist[@]}"; do - sed -i "s/{{ ${colorlist[$i]} }}/${colorvalues[$i]#\#}/g" "$HOME"/.cache/ags/user/generated/hypr/hyprlock.conf + sed -i "s/{{ ${colorlist[$i]} }}/${colorvalues[$i]#\#}/g" "$CACHE_DIR"/user/generated/hypr/hyprlock.conf done - cp "$HOME"/.cache/ags/user/generated/hypr/hyprlock.conf "$HOME"/.config/hypr/hyprlock.conf + cp "$CACHE_DIR"/user/generated/hypr/hyprlock.conf "$XDG_CONFIG_HOME"/hypr/hyprlock.conf } apply_gtk() { # Using gradience-cli lightdark=$(get_light_dark) # Copy template - mkdir -p "$HOME"/.cache/ags/user/generated/gradience - cp "scripts/templates/gradience/preset.json" "$HOME"/.cache/ags/user/generated/gradience/preset.json + mkdir -p "$CACHE_DIR"/user/generated/gradience + cp "scripts/templates/gradience/preset.json" "$CACHE_DIR"/user/generated/gradience/preset.json # Apply colors for i in "${!colorlist[@]}"; do - sed -i "s/{{ ${colorlist[$i]} }}/${colorvalues[$i]}/g" "$HOME"/.cache/ags/user/generated/gradience/preset.json + sed -i "s/{{ ${colorlist[$i]} }}/${colorvalues[$i]}/g" "$CACHE_DIR"/user/generated/gradience/preset.json done - mkdir -p "$HOME/.config/presets" # create gradience presets folder - gradience-cli apply -p "$HOME"/.cache/ags/user/generated/gradience/preset.json --gtk both + mkdir -p "$XDG_CONFIG_HOME/presets" # create gradience presets folder + gradience-cli apply -p "$CACHE_DIR"/user/generated/gradience/preset.json --gtk both # Set light/dark preference # And set GTK theme manually as Gradience defaults to light adw-gtk3 @@ -143,9 +148,9 @@ apply_gtk() { # Using gradience-cli } apply_ags() { - sass "$HOME"/.config/ags/scss/main.scss "$HOME"/.cache/ags/user/generated/style.css + sass "$CONFIG_DIR"/scss/main.scss "$CACHE_DIR"/user/generated/style.css ags run-js 'openColorScheme.value = true; Utils.timeout(2000, () => openColorScheme.value = false);' - ags run-js "App.resetCss(); App.applyCss('${HOME}/.cache/ags/user/generated/style.css');" + ags run-js "App.resetCss(); App.applyCss('${CACHE_DIR}/user/generated/style.css');" } if [[ "$1" = "--bad-apple" ]]; then diff --git a/.config/ags/scripts/color_generation/colorgen.sh b/.config/ags/scripts/color_generation/colorgen.sh index 0010496ac..0fff322f9 100755 --- a/.config/ags/scripts/color_generation/colorgen.sh +++ b/.config/ags/scripts/color_generation/colorgen.sh @@ -1,16 +1,22 @@ #!/usr/bin/env bash +XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" +CONFIG_DIR="$XDG_CONFIG_HOME/ags" +CACHE_DIR="$XDG_CACHE_HOME/ags" + # check if no arguments if [ $# -eq 0 ]; then echo "Usage: colorgen.sh /path/to/image (--apply)" exit 1 fi -colormodefile="$HOME/.cache/ags/user/colormode.txt" +# 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" lightdark="dark" transparency="opaque" materialscheme="vibrant" -terminalscheme="$HOME/.config/ags/scripts/templates/terminal/scheme-base.json" +terminalscheme="$XDG_CONFIG_HOME/ags/scripts/templates/terminal/scheme-base.json" if [ ! -f $colormodefile ]; then echo "dark" > $colormodefile @@ -25,24 +31,24 @@ else transparency=$(sed -n '2p' $colormodefile) materialscheme=$(sed -n '3p' $colormodefile) if [ "$materialscheme" = "monochrome" ]; then - terminalscheme="$HOME/.config/ags/scripts/templates/terminal/scheme-monochrome.json" + terminalscheme="$XDG_CONFIG_HOME/ags/scripts/templates/terminal/scheme-monochrome.json" fi fi backend="material" # color generator backend -if [ ! -f "$HOME/.cache/ags/user/colorbackend.txt" ]; then - echo "material" > "$HOME/.cache/ags/user/colorbackend.txt" +if [ ! -f "$CACHE_DIR/user/colorbackend.txt" ]; then + echo "material" > "$CACHE_DIR/user/colorbackend.txt" else - backend=$(cat "$HOME/.cache/ags/user/colorbackend.txt") # either "" or "-l" + backend=$(cat "$CACHE_DIR/user/colorbackend.txt") # either "" or "-l" fi -cd "$HOME/.config/ags/scripts/" || exit +cd "$CONFIG_DIR/scripts/" || exit if [[ "$1" = "#"* ]]; then # this is a color color_generation/generate_colors_material.py --color "$1" \ --mode "$lightdark" --scheme "$materialscheme" --transparency "$transparency" \ --termscheme $terminalscheme --blend_bg_fg \ - > "$HOME"/.cache/ags/user/generated/material_colors.scss + > "$CACHE_DIR"/user/generated/material_colors.scss if [ "$2" = "--apply" ]; then - cp "$HOME"/.cache/ags/user/generated/material_colors.scss "$HOME/.config/ags/scss/_material.scss" + cp "$CACHE_DIR"/user/generated/material_colors.scss "$CONFIG_DIR/scss/_material.scss" color_generation/applycolor.sh fi elif [ "$backend" = "material" ]; then @@ -53,10 +59,10 @@ elif [ "$backend" = "material" ]; then color_generation/generate_colors_material.py --path "$1" \ --mode "$lightdark" --scheme "$materialscheme" --transparency "$transparency" \ --termscheme $terminalscheme --blend_bg_fg \ - --cache "$HOME/.cache/ags/user/color.txt" $smartflag \ - > "$HOME"/.cache/ags/user/generated/material_colors.scss + --cache "$CACHE_DIR/user/color.txt" $smartflag \ + > "$CACHE_DIR"/user/generated/material_colors.scss if [ "$2" = "--apply" ]; then - cp "$HOME"/.cache/ags/user/generated/material_colors.scss "$HOME/.config/ags/scss/_material.scss" + cp "$CACHE_DIR"/user/generated/material_colors.scss "$CONFIG_DIR/scss/_material.scss" color_generation/applycolor.sh fi elif [ "$backend" = "pywal" ]; then @@ -64,21 +70,21 @@ elif [ "$backend" = "pywal" ]; then wal -c wal -i "$1" -n $lightdark -q # copy scss - cp "$HOME/.cache/wal/colors.scss" "$HOME"/.cache/ags/user/generated/material_colors.scss + cp "$XDG_CACHE_HOME/wal/colors.scss" "$CACHE_DIR"/user/generated/material_colors.scss - cat color_generation/pywal_to_material.scss >> "$HOME"/.cache/ags/user/generated/material_colors.scss + cat color_generation/pywal_to_material.scss >> "$CACHE_DIR"/user/generated/material_colors.scss if [ "$2" = "--apply" ]; then - sass "$HOME"/.cache/ags/user/generated/material_colors.scss "$HOME"/.cache/ags/user/generated/colors_classes.scss --style compact - sed -i "s/ { color//g" "$HOME"/.cache/ags/user/generated/colors_classes.scss - sed -i "s/\./$/g" "$HOME"/.cache/ags/user/generated/colors_classes.scss - sed -i "s/}//g" "$HOME"/.cache/ags/user/generated/colors_classes.scss + sass "$CACHE_DIR"/user/generated/material_colors.scss "$CACHE_DIR"/user/generated/colors_classes.scss --style compact + sed -i "s/ { color//g" "$CACHE_DIR"/user/generated/colors_classes.scss + sed -i "s/\./$/g" "$CACHE_DIR"/user/generated/colors_classes.scss + sed -i "s/}//g" "$CACHE_DIR"/user/generated/colors_classes.scss if [ "$lightdark" = "-l" ]; then - printf "\n""\$darkmode: false;""\n" >> "$HOME"/.cache/ags/user/generated/colors_classes.scss + printf "\n""\$darkmode: false;""\n" >> "$CACHE_DIR"/user/generated/colors_classes.scss else - printf "\n""\$darkmode: true;""\n" >> "$HOME"/.cache/ags/user/generated/colors_classes.scss + printf "\n""\$darkmode: true;""\n" >> "$CACHE_DIR"/user/generated/colors_classes.scss fi - cp "$HOME"/.cache/ags/user/generated/colors_classes.scss "$HOME/.config/ags/scss/_material.scss" + cp "$CACHE_DIR"/user/generated/colors_classes.scss "$CONFIG_DIR/scss/_material.scss" color_generation/applycolor.sh fi diff --git a/.config/ags/scripts/color_generation/switchcolor.sh b/.config/ags/scripts/color_generation/switchcolor.sh index 628d91158..11d69a309 100755 --- a/.config/ags/scripts/color_generation/switchcolor.sh +++ b/.config/ags/scripts/color_generation/switchcolor.sh @@ -1,10 +1,15 @@ #!/usr/bin/env bash +XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" +CONFIG_DIR="$XDG_CONFIG_HOME/ags" +CACHE_DIR="$XDG_CACHE_HOME/ags" + if [ "$1" == "--pick" ]; then color=$(hyprpicker --no-fancy) else - color=$(cut -f1 "${HOME}/.cache/ags/user/color.txt") + color=$(cut -f1 "${CACHE_DIR}/user/color.txt") fi # Generate colors for ags n stuff -"$HOME"/.config/ags/scripts/color_generation/colorgen.sh "${color}" --apply +"$CONFIG_DIR"/scripts/color_generation/colorgen.sh "${color}" --apply diff --git a/.config/ags/scripts/color_generation/switchwall.sh b/.config/ags/scripts/color_generation/switchwall.sh index 6ed03eb92..a08f7cc68 100755 --- a/.config/ags/scripts/color_generation/switchwall.sh +++ b/.config/ags/scripts/color_generation/switchwall.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash +XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +CONFIG_DIR="$XDG_CONFIG_HOME/ags" + if [ "$1" == "--noswitch" ]; then imgpath=$(swww query | head -1 | awk -F 'image: ' '{print $2}') # imgpath=$(ags run-js 'wallpaper.get(0)') @@ -28,4 +31,4 @@ else fi # Generate colors for ags n stuff -"$HOME"/.config/ags/scripts/color_generation/colorgen.sh "${imgpath}" --apply --smart +"$CONFIG_DIR"/scripts/color_generation/colorgen.sh "${imgpath}" --apply --smart