diff --git a/home-manager/users/nathan/packages/scripts/default.nix b/home-manager/users/nathan/packages/scripts/default.nix index dff9a06..096f6ac 100644 --- a/home-manager/users/nathan/packages/scripts/default.nix +++ b/home-manager/users/nathan/packages/scripts/default.nix @@ -29,7 +29,7 @@ mkdir /tmp/nathan fi - img=''$(realpath ''${''$1:-${config.home.homeDirectory}/Pictures/Wallpaper/''$(${pkgs.eza}/bin/eza ${config.home.homeDirectory}/Pictures/Wallpaper -X | rofi -dmenu)}) + img=''$(realpath ''$1) ext="''${''$(basename ''$img)''\#''\#*.}" if [[ ''$ext == "gif" || ''$ext == "mp4" ]]; then @@ -39,7 +39,7 @@ hyprctl dispatch exec "${pkgs.mpvpaper}/bin/mpvpaper ALL ''$img -o loop" else - hyprctl dispatch exec ${pkgs.swww}/bin/swww img ''$img -t wipe + hyprctl dispatch exec "${pkgs.swww}/bin/swww img ''$img -t wipe" fi ${pkgs.hyprpanel}/bin/hyprpanel sw ''$img @@ -65,13 +65,13 @@ fi fi - if [[ -f "${config.home.homeDirectory}/.config/wal/colorschemes/''${''$(basename ''$img)}-''$alpha" ]]; then - ${pkgs.pywal16}/bin/wal -f "${config.home.homeDirectory}/.config/wal/colorschemes/''${''$(basename ''$img)}-''$alpha" + if [[ -f "''${${config.home.homeDirectory}/.config/wal/colorschemes/dark/''$(basename ''$img)-''$alpha}" ]]; then + ${pkgs.pywal16}/bin/wal -f "''${${config.home.homeDirectory}/.config/wal/colorschemes/dark/''$(basename ''$img)-''$alpha}" else - ${pkgs.pywal16}/bin/wal -i ''$img -a ''$alpha --cols16 -n -p "''${''$(basename ''$img)}-''$alpha" + ${pkgs.pywal16}/bin/wal -i ''$img -a ''$alpha --cols16 -n -p "''${''$(basename ''$img)}-''$alpha}" fi - cp "${config.home.homeDirectory}/.config/wal/colorschemes/''${''$(basename ''$img)}-''$alpha" /tmp/nathan/colorscheme + cp "''${${config.home.homeDirectory}/.config/wal/colorschemes/dark/''$(basename ''$img)-''$alpha}" /tmp/nathan/colorscheme colorPrefix '')