drop redundant things in awww

This commit is contained in:
Reid 2026-04-21 00:59:16 -07:00
parent 8f51f933de
commit e572387f99
Signed by: reidlab
GPG key ID: DAF5EAF6665839FD

View file

@ -3,12 +3,6 @@
with lib; with lib;
let let
cfg = config.modules.desktop.awww; cfg = config.modules.desktop.awww;
# TODO: this whole thing is a little silly, but i cant find a better way to ref it in the scripts
# maybe we can reference the config in the scripts? in a let of course :)
wallpapersFolder = "${pkgs.my.wallpapers}/share/backgrounds";
lastWallpaper = "$XDG_DATA_HOME/awww-last-wallpaper";
lastWallpaperSym = "$XDG_DATA_HOME/awww-last-wallpaper-sym";
in { in {
options.modules.desktop.awww = { options.modules.desktop.awww = {
enable = mkEnableOption "Enable awww, an Answer to your Wayland Wallpaper Woes"; enable = mkEnableOption "Enable awww, an Answer to your Wayland Wallpaper Woes";
@ -19,17 +13,17 @@ in {
}; };
wallpapersFolder = mkOption { wallpapersFolder = mkOption {
type = types.str; type = types.str;
default = wallpapersFolder; default = "${pkgs.my.wallpapers}/share/backgrounds";
example = "$XDG_PICTURES_DIR/wallpapers"; example = "$XDG_PICTURES_DIR/wallpapers";
}; };
lastWallpaper = mkOption { lastWallpaper = mkOption {
type = types.str; type = types.str;
default = lastWallpaper; default = "$XDG_DATA_HOME/awww-last-wallpaper";
example = "$XDG_DATA_HOME/awww-last-wallpaper"; example = "$XDG_DATA_HOME/awww-last-wallpaper";
}; };
lastWallpaperSym = mkOption { lastWallpaperSym = mkOption {
type = types.str; type = types.str;
default = lastWallpaperSym; default = "$XDG_DATA_HOME/awww-last-wallpaper-sym";
example = "$XDG_DATA_HOME/awww-last-wallpaper-sym"; example = "$XDG_DATA_HOME/awww-last-wallpaper-sym";
}; };
setScript = mkOption { setScript = mkOption {
@ -37,12 +31,12 @@ in {
default = pkgs.writeShellScript "awww-set" '' default = pkgs.writeShellScript "awww-set" ''
set -euo pipefail set -euo pipefail
if [ ! -f "${lastWallpaper}" ]; then if [ ! -f "${cfg.lastWallpaper}" ]; then
echo "$(ls ${wallpapersFolder} | shuf -n 1)" > "${lastWallpaper}" echo "$(ls ${cfg.wallpapersFolder} | shuf -n 1)" > "${cfg.lastWallpaper}"
fi fi
ln -sf "${wallpapersFolder}/$(cat ${lastWallpaper})" "${lastWallpaperSym}" # in case the hash of the pkg changes ln -sf "${cfg.wallpapersFolder}/$(cat ${cfg.lastWallpaper})" "${cfg.lastWallpaperSym}" # in case the hash of the pkg changes
${lib.getExe cfg.package} img "${wallpapersFolder}/$(cat ${lastWallpaper})" --transition-type none ${lib.getExe cfg.package} img "${cfg.wallpapersFolder}/$(cat ${cfg.lastWallpaper})" --transition-type none
''; '';
}; };
swapScript = mkOption { swapScript = mkOption {
@ -50,15 +44,15 @@ in {
default = pkgs.writeShellScript "awww-swap" '' default = pkgs.writeShellScript "awww-swap" ''
set -euo pipefail set -euo pipefail
file=$(ls ${wallpapersFolder} | ${lib.getExe config.modules.desktop.rofi.package} -dmenu -sep '\n' -i -p "select a wallpaper") file=$(ls ${cfg.wallpapersFolder} | ${lib.getExe config.modules.desktop.rofi.package} -dmenu -sep '\n' -i -p "select a wallpaper")
wallpaper="${wallpapersFolder}/$file" wallpaper="${cfg.wallpapersFolder}/$file"
[ ! -f "$wallpaper" ] && exit 1 [ ! -f "$wallpaper" ] && exit 1
${lib.getExe cfg.package} img "$wallpaper" --transition-type grow --transition-fps 60 --transition-pos 1.0,1.0 --transition-duration 1.5 ${lib.getExe cfg.package} img "$wallpaper" --transition-type grow --transition-fps 60 --transition-pos 1.0,1.0 --transition-duration 1.5
ln -sf "$wallpaper" "${lastWallpaperSym}" ln -sf "$wallpaper" "${cfg.lastWallpaperSym}"
echo "$file" > "${lastWallpaper}" echo "$file" > "${cfg.lastWallpaper}"
''; '';
}; };
}; };