From 2b2290841bbb9ca4466e44273b7e6691c823c6eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Sun, 6 Jun 2021 07:28:08 +0200
Subject: [PATCH] fix: replace flameshot-once by regular flameshot

---
 configs/flameshot-once.nix | 41 ++++++++++++++++++--------------------
 configs/i3.nix             |  2 +-
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/configs/flameshot-once.nix b/configs/flameshot-once.nix
index 910b184..a018a8f 100644
--- a/configs/flameshot-once.nix
+++ b/configs/flameshot-once.nix
@@ -1,25 +1,22 @@
-{ lib, pkgs, ... }:
-let
-  inherit (import <niveum/lib>) defaultApplications;
-  flameshot-once =
-    pkgs.callPackage <stockholm/krebs/5pkgs/simple/flameshot-once> {};
-in {
-  nixpkgs.overlays = [
-    (self: super: {
-      xwaitforwindow =
-        super.callPackage <stockholm/krebs/5pkgs/simple/xwaitforwindow.nix> { };
-    })
-  ];
+{ config, lib, pkgs, ... }:
+{
+  home-manager.users.me = {
+    services.flameshot.enable = true;
 
-  environment.systemPackages = [
-    (flameshot-once.override {
-      config.imgur = {
-        enable = true;
-        createUrl = "http://p.r/image";
-        deleteUrl = "http://p.r/image/delete/%1";
-        xdg-open.browser = (defaultApplications pkgs).browser;
+    home.file.".config/Dharkael/flameshot.ini".source = (pkgs.formats.ini {}).generate "flameshot.ini" {
+      General = {
+        disabledTrayIcon = true;
+        drawColor = ''@Variant(\0\0\0\x43\x1\xff\xff\0\0\0\0\xff\xff\0\0)'';
+        drawThickness = 0;
+        filenamePattern = "shot_%F_%T";
       };
-      config.timeout = 200;
-    })
-  ];
+    };
+
+    systemd.user.services.flameshot.Unit.Requires = lib.mkForce [];
+    systemd.user.services.flameshot.Environment = {
+      IMGUR_CREATE_URL = "https://p.krebsco.de/image";
+      IMGUR_DELETE_URL = "https://p.krebsco.de/image/delete/%1";
+      PATH = "${config.home-manager.users.me.home.profileDirectory}/bin";
+    };
+  };
 }
diff --git a/configs/i3.nix b/configs/i3.nix
index b06e13f..a42d7c9 100644
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -224,7 +224,7 @@ in {
         "${modifier}+F11" = "exec ${pkgs.xcalib}/bin/xcalib -invert -alter";
         "${modifier}+F12" = "exec ${klem}/bin/klem";
 
-        "Print" = "exec flameshot-once";
+        "Print" = "exec flameshot gui -p /tmp";
         "XF86AudioLowerVolume" =
           "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -d 5";
         "XF86AudioMute" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -t";