From ca4c453a96ddb102b5b693a54f38f4fd616dc866 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Mon, 24 Jun 2024 21:12:49 -0400 Subject: [PATCH] hyprland: rewrote wallpaper script in ruby --- .../desktop/hyprland/default.nix | 50 +++++++++++-------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/homeManagerModules/desktop/hyprland/default.nix b/homeManagerModules/desktop/hyprland/default.nix index 74e8b4ef..8d1f9f2e 100644 --- a/homeManagerModules/desktop/hyprland/default.nix +++ b/homeManagerModules/desktop/hyprland/default.nix @@ -30,33 +30,41 @@ wallpaperd = if config.alyraffauf.desktop.hyprland.randomWallpaper then - pkgs.writeShellScript "hyprland-randomWallpaper" '' - OLD_PIDS=() - directory=${config.home.homeDirectory}/.local/share/backgrounds + pkgs.writers.writeRuby "hyprland-randomWallpaper" {} '' + require 'fileutils' + + directory = "${config.xdg.dataHome}/backgrounds" + hyprctl = "${lib.getExe' config.wayland.windowManager.hyprland.package "hyprctl"}" + old_pids = [] sleep 1 - if [ -d "$directory" ]; then - while true; do - NEW_PIDS=() - monitor=`${config.wayland.windowManager.hyprland.package}/bin/hyprctl monitors | grep Monitor | awk '{print $2}'` - for m in ''${monitor[@]}; do - random_background=$(ls $directory/*.{png,jpg} | shuf -n 1) - ${lib.getExe pkgs.swaybg} -o $m -i $random_background -m fill & - NEW_PIDS+=($!) - done + if Dir.exist?(directory) + loop do + new_pids = [] - if [[ ''${OLD_PIDS[@]} -gt 0 ]]; then - sleep 5 - for pid in ''${OLD_PIDS[@]}; do - kill $pid - done - fi + outputs = IO.popen([hyprctl, 'monitors']).read + monitors = outputs.each_line.map { |line| line.split[1] if line.include?('Monitor') }.compact - OLD_PIDS=$NEW_PIDS + monitors.each do |monitor| + random_background = Dir.glob(File.join(directory, '*.{png,jpg}')).sample + pid = spawn("${lib.getExe pkgs.swaybg}", '-o', monitor, '-i', random_background, '-m', 'fill') + new_pids << pid + end + + if old_pids.empty? + sleep 900 + else + sleep 5 + old_pids.each do |pid| + Process.kill('TERM', pid) + end sleep 895 - done - fi + end + + old_pids = new_pids + end + end '' else "${lib.getExe pkgs.swaybg} -i ${config.alyraffauf.theme.wallpaper}";