From c25a1c26f5109fbc1bb8ea7ecd81a65630ee9612 Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 10 Apr 2026 16:19:17 -0500 Subject: [PATCH] test --- .../home-manager/packages/scripts/default.nix | 77 +++++-------------- .../home-manager/programs/aurora/default.nix | 4 +- 2 files changed, 23 insertions(+), 58 deletions(-) diff --git a/homes/nathan/home-manager/packages/scripts/default.nix b/homes/nathan/home-manager/packages/scripts/default.nix index b65fb9b..5d88a93 100644 --- a/homes/nathan/home-manager/packages/scripts/default.nix +++ b/homes/nathan/home-manager/packages/scripts/default.nix @@ -18,59 +18,12 @@ (pkgs.writeShellScriptBin "randWallpaper" '' file=''$(ls ${config.home.homeDirectory}/Pictures/Wallpaper/ | shuf -n 1) - setWallpaper ${config.home.homeDirectory}/Pictures/Wallpaper/''$file + aurora-set-wallpaper ${config.home.homeDirectory}/Pictures/Wallpaper/''$file '') - (pkgs.writeShellScriptBin "setWallpaper" '' - - if [[ ! -d /tmp/aurora ]]; then - mkdir /tmp/aurora - fi - - img=''$(realpath "''${1:-$(find ~/Pictures/Wallpaper/* | rofi -dmenu)}") - n=''$(basename "''$img") - ext="''${n''\#''\#*.}" - out=''${3:-/dev/null} - - if [[ ''$ext == "gif" || ''$ext == "mp4" ]]; then - yes | ${pkgs.ffmpeg}/bin/ffmpeg -i "''$img" -vframes 1 /tmp/aurora/tmp.jpg >> ''$out - pidof mpvpaper >> $out && pkill mpvpaper - ${pkgs.swww}/bin/swww img /tmp/aurora/tmp.jpg -t wipe >> ''$out - sleep 0.6 - hyprctl dispatch exec "${pkgs.mpvpaper}/bin/mpvpaper ALL ''$img -o loop" - else - yes | ${pkgs.ffmpeg}/bin/ffmpeg -i "''$img" /tmp/aurora/tmp.jpg >> ''$out - pidof mpvpaper >> $out && pkill mpvpaper - hyprctl dispatch exec "${pkgs.swww}/bin/swww img ''$img -t wipe" >> ''$out - fi - - changeColors "''$img" "''$2" >> ''$out - '') - - (pkgs.writeShellScriptBin "changeColors" '' - - img=''$(realpath "''$1") - alpha=''${2:-70} - - if [[ ''$alpha -lt 0 ]]; then - alpha=0 - elif [[ ''$alpha -gt 100 ]]; then - alpha=100 - fi - - if [[ -f ~/.config/wal/colorschemes/dark/''$(basename "''$img")-''$alpha.json ]]; then - ${pkgs.pywal16}/bin/wal -n -f "''$(basename "''$img")-''$alpha" - else - ${pkgs.pywal16}/bin/wal -n -i "''$img" -a "''$alpha" --cols16 -p "''$(basename "''$img")-''$alpha" - fi - - colorPrefix - '') - (pkgs.writeShellScriptBin "colorPrefix" '' pidof firefox > /dev/null && ${pkgs.pywalfox-native}/bin/pywalfox update & pidof kitty > /dev/null && pkill -USR1 kitty - kitten @ send-text --match cmdline:zsh \\r pidof cava > /dev/null && pkill -USR1 cava for i in ''$(ls /run/user/1000 | grep nvim); do ${pkgs.neovim-remote}/bin/nvr -s --servername /run/user/1000/''$i --remote-send 'colorscheme pywal'; @@ -81,22 +34,32 @@ (pkgs.writeShellScriptBin "onSystemStart" '' - if [[ ! -d /tmp/aurora ]]; then - mkdir /tmp/aurora + + if [[ -f /tmp/aurora/tmp.jpg ]]; then + hyprctl --batch "\ + dispatch exec ${pkgs.swww}/bin/swww-daemon ;\ + dispatch exec aurora-set-wallpaper ;\ + dispatch exec ${pkgs.pyprland}/bin/pypr ;\ + dispatch exec ${pkgs.netbird-ui}/bin/netbird-ui ;\ + dispatch exec ${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent ;\ + setcursor Bibata-Modern-Classic 16" + else + hyprctl --batch "\ + dispatch exec ${pkgs.swww}/bin/swww-daemon ;\ + dispatch exec aurora-set-wallpaper ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg ;\ + dispatch exec ${pkgs.pyprland}/bin/pypr ;\ + dispatch exec ${pkgs.netbird-ui}/bin/netbird-ui ;\ + dispatch exec ${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent ;\ + setcursor Bibata-Modern-Classic 16" fi if [[ -f ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid ]]; then rm ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid fi - hyprctl --batch "\ - dispatch exec ${pkgs.swww}/bin/swww-daemon ;\ - dispatch exec setWallpaper ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg ;\ - dispatch exec ${pkgs.pyprland}/bin/pypr ;\ - dispatch exec ${pkgs.netbird-ui}/bin/netbird-ui ;\ - dispatch exec ${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent ;\ - setcursor Bibata-Modern-Classic 16" sleep 3 + + aurora ipc call shell reload hyprctl reload '') diff --git a/homes/nathan/home-manager/programs/aurora/default.nix b/homes/nathan/home-manager/programs/aurora/default.nix index aa03d2b..a9d197b 100644 --- a/homes/nathan/home-manager/programs/aurora/default.nix +++ b/homes/nathan/home-manager/programs/aurora/default.nix @@ -23,7 +23,9 @@ settings = { wallpaperDir = "${config.home.homeDirectory}/Pictures/Wallpaper"; - colorsDir = "${config.home.homeDirectory}/.cache/wal/colors.json"; + colorsPath = "${config.home.homeDirectory}/.cache/wal/colors.json"; + + changeColorsCmd = "colorPrefix"; }; }; };