diff --git a/home/modules/default.nix b/home/modules/default.nix index 119debe..4c366dc 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -207,7 +207,6 @@ toplevel@{ moduleWithSystem, ... }: { "F8" = "exec doas ${pkgs.light}/bin/light -U 10"; "Alt+Shift+l" = "exec ${pkgs.swaylock}/bin/swaylock"; "${modifier}+p" = "exec ${menu}"; - "${modifier}+Shift+a" = "exec ${pkgs.screenshot}/bin/screenshot area"; "${modifier}+Shift+s" = "exec ${pkgs.screenshot}/bin/screenshot"; "${modifier}+c" = "exec ${pkgs.sal}/bin/sal"; "End" = "exec rofi -show calc"; diff --git a/packages/default.nix b/packages/default.nix index 4f928eb..ad7ea28 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -11,36 +11,27 @@ top@{ inputs, ... }: { bingwp = pkgs.writers.writeNuBin "bingwp" '' http get "https://pic.idimitrov.dev/latest.png" | save -f ([(xdg-user-dir PICTURES), "bg.png"] | str join "/") ''; - screenshot = pkgs.writers.writeNuBin "screenshot" '' - let tmp_img = "/tmp/screen.png" | path join - let ss_dir = ((xdg-user-dir PICTURES | str trim) | path join "ss") - let pic_dir = ($ss_dir | path join (([(date now | format date "%Y-%m-%d_%H-%M-%S"), ".png"] | str join))) + screenshot = pkgs.writeShellApplication { + name = "screenshot"; + runtimeInputs = with pkgs; [ wl-clipboard xdg-utils ]; + text = '' + ss_dir="$(xdg-user-dir PICTURES)/ss" + pic_dir="$ss_dir/$(date "+%Y-%m-%d_%H-%M-%S").png" - mkdir $ss_dir + mkdir -p "$ss_dir" - def copy_image [] { - open $pic_dir | wl-copy - } + copy_image () { + wl-copy < "$pic_dir" + } - def prepare_screen [] { - let grim_id = pueue add -i -p grim $tmp_img - let imv_id = pueue add -a $grim_id -p imv -f $tmp_img - grim -g $"(slurp -b '#FFFFFF00' -c '#FF0000FF')" $pic_dir - pueue kill $imv_id $grim_id - pueue wait - pueue remove $imv_id $grim_id - } + main () { + grim "$pic_dir" + copy_image + } - def "main area" [] { - prepare_screen - copy_image - } - - def main [] { - grim $pic_dir - copy_image - } - ''; + main + ''; + }; cursors = pkgs.catppuccin-cursors.overrideAttrs (prev: rec { version = "0.3.1"; nativeBuildInputs = prev.nativeBuildInputs ++ [ pkgs.xcur2png ];