diff --git a/apps/keybinds.nix b/apps/keybinds.nix index f5d8bf8..cd28d17 100644 --- a/apps/keybinds.nix +++ b/apps/keybinds.nix @@ -10,20 +10,6 @@ let screenshotBin = if flake ? screenshot then "${flake.screenshot}/bin/screenshot" else "screenshot"; overviewBin = if flake ? overview then "${flake.overview}/bin/overview" else "overview"; - # resolved at runtime - wrappedScreenshot = pkgs.writeShellApplication { - name = "screenshot"; - runtimeInputs = [ pkgs.jq ]; - text = '' - UPLOAD_URL="$(jq -r .uploadUrl "/run/agenix/screenshot")" - export UPLOAD_URL - UPLOAD_PASSWORD="$(jq -r .uploadPassword "/run/agenix/screenshot")" - export UPLOAD_PASSWORD - - exec ${screenshotBin} "$@" - ''; - }; - swaylockArgs = concatStringsSep " " [ "--screenshots" "--clock" @@ -75,9 +61,7 @@ in rofi = "rofi -show drun"; rofimoji = "${getExe pkgs.rofimoji} -a copy -r emoji --use-icons"; overview = "${overviewBin}"; - screenshot = "${wrappedScreenshot}/bin/screenshot"; - screenshotUpload = "${wrappedScreenshot}/bin/screenshot upload"; - + screenshot = "${screenshotBin}/bin/screenshot"; volumeUp = "${getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 0.05+"; volumeDown = "${getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 0.05- -l 1.0"; mute = "${getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle"; diff --git a/flake.nix b/flake.nix index b4b81ea..a333b50 100644 --- a/flake.nix +++ b/flake.nix @@ -47,10 +47,12 @@ }; bun2nix = { url = "github:nix-community/bun2nix"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.treefmt-nix.follows = "treefmt-nix"; - inputs.systems.follows = "systems"; - inputs.flake-parts.follows = "flake-parts"; + inputs = { + nixpkgs.follows = "nixpkgs"; + treefmt-nix.follows = "treefmt-nix"; + systems.follows = "systems"; + flake-parts.follows = "flake-parts"; + }; }; flake-parts = { url = "github:hercules-ci/flake-parts"; @@ -75,9 +77,11 @@ }; nix-minecraft = { url = "github:Infinidoge/nix-minecraft"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.systems.follows = "systems"; - inputs.flake-compat.follows = "flake-compat"; + inputs = { + nixpkgs.follows = "nixpkgs"; + systems.follows = "systems"; + flake-compat.follows = "flake-compat"; + }; }; flake-compat.url = "github:edolstra/flake-compat"; nvf = { diff --git a/pkgs/screenshot/default.nix b/pkgs/screenshot/default.nix index 61f8fb6..378fd1a 100644 --- a/pkgs/screenshot/default.nix +++ b/pkgs/screenshot/default.nix @@ -4,9 +4,7 @@ grim, slurp, wl-clipboard, - curl, libnotify, - python3, }: writeShellApplication { @@ -17,9 +15,7 @@ writeShellApplication { grim slurp wl-clipboard - curl libnotify - python3 ]; text = builtins.readFile ./screenshot; diff --git a/pkgs/screenshot/screenshot b/pkgs/screenshot/screenshot index 987fb4d..99b52fc 100644 --- a/pkgs/screenshot/screenshot +++ b/pkgs/screenshot/screenshot @@ -1,42 +1,16 @@ #!/usr/bin/env bash -UPLOAD_URL="${UPLOAD_URL:-}" -UPLOAD_PASSWORD="${UPLOAD_PASSWORD:-}" CROP_OUTPUT_PATH="/tmp/qs-screenshot-crop.png" rm -f "$CROP_OUTPUT_PATH" -MODE="${1:-clipboard}" - if ! grim -g "$(slurp)" "$CROP_OUTPUT_PATH"; then notify-send -a "screenshot.sh" -i "dialog-error" "Screenshot" "Capture cancelled or failed." -t 10000 exit 1 fi -if [ "$MODE" = "upload" ]; then - if [ -z "$UPLOAD_URL" ]; then - notify-send -a "screenshot.sh" -i "dialog-error" "Screenshot" "Upload URL not configured." -t 10000 - rm -f "$CROP_OUTPUT_PATH" - exit 1 - fi - - TS=$(date +'%Y-%m-%d-%H-%M-%S') - TARGET_URL="${UPLOAD_URL}${TS}.png?pw=$(python3 -c "import urllib.parse; print(urllib.parse.quote('''$UPLOAD_PASSWORD'''))" 2>/dev/null || echo "$UPLOAD_PASSWORD")" - - UPLOADED_URL=$(curl -s -T "$CROP_OUTPUT_PATH" "$TARGET_URL" | tail -n 1 | tr -d '[:space:]') - - if [ -n "$UPLOADED_URL" ]; then - echo "$UPLOADED_URL" | wl-copy - notify-send -a "screenshot.sh" -i "$CROP_OUTPUT_PATH" "Screenshot" "Uploaded: $UPLOADED_URL" -t 10000 - else - notify-send -a "screenshot.sh" -i "dialog-error" "Screenshot" "Upload failed." -t 10000 - fi - - rm -f "$CROP_OUTPUT_PATH" +if wl-copy --type image/png < "$CROP_OUTPUT_PATH"; then + notify-send -a "screenshot.sh" -i "$CROP_OUTPUT_PATH" "Screenshot" "Copied to clipboard!" -t 10000 else - if wl-copy --type image/png < "$CROP_OUTPUT_PATH"; then - notify-send -a "screenshot.sh" -i "$CROP_OUTPUT_PATH" "Screenshot" "Copied to clipboard!" -t 10000 - else - notify-send -a "screenshot.sh" -i "dialog-error" "Screenshot" "Failed to copy to clipboard." -t 10000 - fi + notify-send -a "screenshot.sh" -i "dialog-error" "Screenshot" "Failed to copy to clipboard." -t 10000 fi diff --git a/wrappers/labwc.nix b/wrappers/labwc.nix index ab4d0dd..ce83c27 100644 --- a/wrappers/labwc.nix +++ b/wrappers/labwc.nix @@ -83,7 +83,6 @@ let (keybind "W-S-e" "Execute" kb.rofimoji) (keybind "W-S-b" "Execute" kb.overview) (keybind "W-S-s" "Execute" kb.screenshot) - (keybind "W-A-s" "Execute" kb.screenshotUpload) (keybind "W-S-l" "Execute" kb.lock) (keybind "W-A-Escape" "Exit" null) (keybind "W-q" "Close" null) diff --git a/wrappers/niri.nix b/wrappers/niri.nix index af60e6d..f2a3323 100644 --- a/wrappers/niri.nix +++ b/wrappers/niri.nix @@ -299,7 +299,6 @@ let Mod+Shift+B { spawn "${kb.overview}"; } Mod+Shift+S { screenshot; } - Mod+Alt+S { spawn-sh "${kb.screenshotUpload}"; } Mod+Shift+L { spawn-sh "${kb.lock}"; } Mod+Shift+P { power-off-monitors; }