From 6edd1c0439b10c6259455dfd1f0187fefc422e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Mon, 6 Feb 2023 21:23:33 +0100 Subject: [PATCH] feat: reenable flameshot-once --- configs/default.nix | 2 +- configs/flameshot-once.nix | 57 +++++++++++++++++++++----------------- flake.lock | 8 +++--- 3 files changed, 37 insertions(+), 30 deletions(-) diff --git a/configs/default.nix b/configs/default.nix index 5498c89..479f9a5 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -226,7 +226,7 @@ in { ./neomutt.nix ./nix.nix ./newsboat.nix - # ./flameshot-once.nix + ./flameshot-once.nix ./packages.nix ./stardict.nix ./polkit.nix diff --git a/configs/flameshot-once.nix b/configs/flameshot-once.nix index 271f1b8..0cb7d48 100644 --- a/configs/flameshot-once.nix +++ b/configs/flameshot-once.nix @@ -4,11 +4,11 @@ ... }: let inherit (import ) defaultApplications; - flameshot-once = - pkgs.callPackage {}; + flameshot-once = pkgs.callPackage {}; in { environment.systemPackages = [ (flameshot-once.override { + name = "flameshot-once-kmein"; config = { imgur = { enable = true; @@ -16,29 +16,36 @@ in { deleteUrl = "http://p.r/image/delete/%1"; xdg-open.browser = (defaultApplications pkgs).browser; }; - timeout = 1000; - drawColor = "#ff0000"; - drawThickness = 2; - showDesktopNotification = true; - buttons = [ - "ARROW" - "BLUR" - "CIRCLE" - "CIRCLECOUNT" - "COPY" - "DRAWER" - "EXIT" - "IMAGEUPLOADER" - "MARKER" - "MOVESELECTION" - "PENCIL" - "RECTANGLE" - "SAVE" - "SELECTION" - "SELECTIONINDICATOR" - "TEXT" - "UNDO" - ]; + settings.General = { + autoCloseIdleDaemon = true; + drawColor = "#ff0000"; + drawThickness = 2; + checkForUpdates = false; + showDesktopNotification = true; + disabledTrayIcon = true; + showHelp = false; + squareMagnifier = true; + uploadWithoutConfirmation = true; + buttons = [ + "TYPE_ARROW" + "TYPE_CIRCLE" + "TYPE_CIRCLECOUNT" + "TYPE_COPY" + "TYPE_DRAWER" + "TYPE_EXIT" + "TYPE_IMAGEUPLOADER" + "TYPE_MARKER" + "TYPE_MOVESELECTION" + "TYPE_PENCIL" + "TYPE_PIXELATE" + "TYPE_RECTANGLE" + "TYPE_SAVE" + "TYPE_SELECTION" + # "TYPE_SELECTIONINDICATOR" + "TYPE_TEXT" + "TYPE_UNDO" + ]; + }; }; }) ]; diff --git a/flake.lock b/flake.lock index dabf708..4749e75 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ "stockholm": { "flake": false, "locked": { - "lastModified": 1675426523, - "narHash": "sha256-o41PgJx/f5CHSBarM0DPilFTNnpglaIZ+E8e7+yy1xY=", + "lastModified": 1675564669, + "narHash": "sha256-Fd4wBl9b5Aqt4ctH2vJu/oPvgTOHD+ME8MUEu3oR2tE=", "ref": "refs/heads/master", - "rev": "af9e845e861b51d691102c1bc177dfe5e26fe63f", - "revCount": 11342, + "rev": "e44fe862f0bedc658aabd1daafb16376f188857e", + "revCount": 11353, "type": "git", "url": "https://cgit.krebsco.de/stockholm" },