From 5b131a5a30ac4f06cd359dee420cbd002f24855e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 28 Dec 2021 14:48:09 +0100
Subject: [PATCH] feat: flameshot -> flameshot-once

---
 .versions/nix-writers.json | 11 ++++++++++
 configs/default.nix        |  1 +
 configs/flameshot-once.nix | 44 ++++++++++++++++++--------------------
 configs/i3.nix             |  3 +--
 deploy.nix                 |  1 +
 shell.nix                  |  5 +++++
 6 files changed, 40 insertions(+), 25 deletions(-)
 create mode 100644 .versions/nix-writers.json

diff --git a/.versions/nix-writers.json b/.versions/nix-writers.json
new file mode 100644
index 0000000..81fdf94
--- /dev/null
+++ b/.versions/nix-writers.json
@@ -0,0 +1,11 @@
+{
+  "url": "https://cgit.krebsco.de/nix-writers",
+  "rev": "c528cf970e292790b414b4c1c8c8e9d7e73b2a71",
+  "date": "2019-04-02T20:05:33+02:00",
+  "path": "/nix/store/wm5zhsha1a2iy0d582nlfi7604ayd1vz-nix-writers",
+  "sha256": "0xdivaca1hgbxs79jw9sv4gk4f81vy8kcyaff56hh2dgq2awyvw4",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/configs/default.nix b/configs/default.nix
index 8864f15..c9da785 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -28,6 +28,7 @@ in {
           };
         };
         overlays = [
+          (import <nix-writers/pkgs>)
           (import <stockholm/krebs/5pkgs>)
           (self: super: {
             scripts = import <niveum/packages/scripts> { pkgs = super; lib = super.lib; };
diff --git a/configs/flameshot-once.nix b/configs/flameshot-once.nix
index 70ee53f..3da4278 100644
--- a/configs/flameshot-once.nix
+++ b/configs/flameshot-once.nix
@@ -1,26 +1,24 @@
-{ config, lib, pkgs, ... }:
-{
-  home-manager.users.me = {
-    services.flameshot.enable = true;
+{ lib, pkgs, ... }:
+let
+  inherit (import <niveum/lib>) defaultApplications;
+  flameshot-once = pkgs.callPackage <stockholm/krebs/5pkgs/simple/flameshot-once> {};
+in {
+  nixpkgs.overlays = [
+    (self: super: {
+      write =
+        super.callPackage <stockholm/krebs/5pkgs/simple/xwaitforwindow.nix> { };
+    })
+  ];
 
-    xdg.configFile."flameshot/flameshot.ini".source = (pkgs.formats.ini {}).generate "flameshot.ini" {
-      General = {
-        disabledTrayIcon = true;
-        checkForUpdates = false;
-        contrastOpacity = 188;
-        savePath = "/tmp";
-        savePathFixed = true;
-        drawThickness = 0;
-        showStartupLaunchMessage = false;
-        filenamePattern = "shot_%F_%T";
+  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;
       };
-    };
-
-    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";
-    };
-  };
+      config.timeout = 1000;
+    })
+  ];
 }
diff --git a/configs/i3.nix b/configs/i3.nix
index 5472215..a3b918e 100644
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -233,8 +233,7 @@ in {
         "${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
         "${modifier}+F11" = "exec ${pkgs.xcalib}/bin/xcalib -invert -alter";
         "${modifier}+F12" = "exec ${klem}/bin/klem";
-
-        "Print" = "exec flameshot gui -p /tmp";
+        "Print" = "exec flameshot-once";
         "XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -d 5";
         "XF86AudioMute" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -t";
         "XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -i 5";
diff --git a/deploy.nix b/deploy.nix
index 7ef9bca..e4dcbab 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -22,6 +22,7 @@ let
       nixpkgs-unstable.git = gitFromJson .versions/nixpkgs-unstable.json // { shallow = true; };
       home-manager.git = gitFromJson .versions/home-manager.json;
       stockholm.git = gitFromJson .versions/stockholm.json;
+      nix-writers.git = gitFromJson .versions/nix-writers.json;
       retiolum.git = gitFromJson .versions/retiolum.json;
       nixpkgs-mozilla.git = gitFromJson .versions/nixpkgs-mozilla.json;
       system-secrets.pass = {
diff --git a/shell.nix b/shell.nix
index 92a040b..b5ed1b0 100644
--- a/shell.nix
+++ b/shell.nix
@@ -15,6 +15,11 @@ let
       url = "https://github.com/NixOS/nixpkgs.git";
       path = toString .versions/nixpkgs-unstable.json;
     };
+    nix-writers = {
+      ref = "refs/heads/master";
+      url = "https://cgit.krebsco.de/nix-writers";
+      path = toString .versions/nix-writers.json;
+    };
     home-manager = {
       ref = "refs/heads/release-${release}";
       url = "https://github.com/nix-community/home-manager.git";