fix: replace flameshot-once by regular flameshot

.versions/home-manager.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/nix-community/home-manager.git",
-  "rev": "ab64dc32493996c24607eab2cae6663466ddfb8a",
-  "date": "2021-05-29T20:22:40+02:00",
-  "path": "/nix/store/y4fsirhpgf73ngglbskkbfk26hjjssw8-home-manager",
-  "sha256": "1w7qxjibrjlqi7l293pnxxww1wxsq46wf3xbcpibys6g165s05f4",
+  "rev": "fd5fbb0a241f644908cdf01ccd1821d0606fb4fd",
+  "date": "2021-06-04T08:48:46+02:00",
+  "path": "/nix/store/gpdv43bglgz4mllyasj2lc703lnn84i9-home-manager",
+  "sha256": "0qkjwnfcqmwgk7sy5xzzf4z0dnxszwgx0303ngjmz1qjw3md43hc",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false

.versions/nixpkgs-mozilla.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/mozilla/nixpkgs-mozilla",
-  "rev": "ad227c55c34124cde17b30c9bb28be6cd3c70815",
-  "date": "2021-06-01T15:52:18+02:00",
-  "path": "/nix/store/3ylxhj1n5jzl7c6ifxbgcx48pp2xg9f0-nixpkgs-mozilla",
-  "sha256": "1g33k5da71b11bkia7gjfv70d3bpd0vafidgf9qjrgvld0s2n9r9",
+  "rev": "3f3fba4e2066f28a1ad7ac60e86a688a92eb5b5f",
+  "date": "2021-06-03T15:29:39+02:00",
+  "path": "/nix/store/aklhz1c8gppv2wrf64haa92qdl77f0jg-nixpkgs-mozilla",
+  "sha256": "1mrj89gzrzhci4lssvzmmk31l715cddp7l39favnfs1qaijly814",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false

.versions/nixpkgs-unstable.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs.git",
-  "rev": "1508c220f98d3166c8b4fda94a409e1c3a11cf79",
-  "date": "2021-06-01T12:42:21-04:00",
-  "path": "/nix/store/3jkhbpszr4jcapqmhprdaxv11dcvix0n-nixpkgs",
-  "sha256": "1gl1gdsw0i24dpkddgwqjg0almrv9ynqwy26jdy5wbzz00gld4a1",
+  "rev": "a95f4166abb329f5a5117bb47bec2b9678962336",
+  "date": "2021-06-05T17:40:05+02:00",
+  "path": "/nix/store/gqqc537gbmcrlj59qdl4f9db5zv9dvxx-nixpkgs",
+  "sha256": "0h4mhl5r1d4846j9habbwabq30pr2435v1hga45d6ayzdx3n5pxp",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false

.versions/nixpkgs.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs.git",
-  "rev": "d25ea6a0d2a847fb52131da546f2a866656fbafa",
-  "date": "2021-05-31T10:23:40+02:00",
-  "path": "/nix/store/36s35zrv4c51mzlizlnbfhlpw8n4qs0g-nixpkgs",
-  "sha256": "0y2h71pvzrhc2svib4lwjl04hrzy8901ravvlyxlqdbal8hy3838",
+  "rev": "aa576357673d609e618d87db43210e49d4bb1789",
+  "date": "2021-06-04T17:36:38+02:00",
+  "path": "/nix/store/qqz5xq0dg8zm8blba5cg7704kbrhqhki-nixpkgs",
+  "sha256": "1868s3mp0lwg1jpxsgmgijzddr90bjkncf6k6zhdjqihf0i1n2np",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false

.versions/nur.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/nix-community/NUR",
-  "rev": "57e32d3d8923ade143426ccf1bfbcf4f52f34975",
-  "date": "2021-06-02T04:12:55+00:00",
-  "path": "/nix/store/aqzka9m16d5zkxk8jqa31b40gfmq6a8d-NUR",
-  "sha256": "0y8y28w7g091h4h85prbzvrggdag3nan27563wi00805zyr9wslj",
+  "rev": "cb7038a463e03dcafbc67910d5a6df21c47e6cb1",
+  "date": "2021-06-05T15:08:44+00:00",
+  "path": "/nix/store/7nj0qdjq0srsg0507wqcl8zdikmn96vr-NUR",
+  "sha256": "0lvp37ypvjvynky544hk9wxdfybywp1idgdvn0kqhlw1sl1plqz3",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false

.versions/retiolum.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/krebs/retiolum",
-  "rev": "f848fb90690ec87afec8abd486b9db3c1bf258ae",
-  "date": "2021-05-29T21:32:15+02:00",
-  "path": "/nix/store/vps80nndw7nkm2vcxb4i9br1jl7xwmkr-retiolum",
-  "sha256": "1xwpbkb68vfg8h45w7rysfz0wayzz4467n89xj17g3jxqhbncz9j",
+  "rev": "3652bf20b4afcf781d102197518543a6d7ef6236",
+  "date": "2021-06-01T19:32:16+02:00",
+  "path": "/nix/store/b6xw7b7m87g9w92ah3iq7i5627758fp6-retiolum",
+  "sha256": "0nbi2wf9clbfpr8333xncsa7g2bfdwc0ypxs7d3kn9xjkf2xd048",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false

.versions/stockholm.json

@@ -1,9 +1,9 @@
 {
-  "url": "https://github.com/kmein/stockholm",
-  "rev": "f0325bef7954cb946674050847c6d52112cb658f",
-  "date": "2020-11-11T07:45:58+01:00",
-  "path": "/nix/store/lka6fhjfbwdx9bc7lk1bz4gizdv7nrbm-stockholm",
-  "sha256": "0gbw6n5yq36ysc30afa5d2dbsl2d46f73ms6f0rprdbr4nhdw8l2",
+  "url": "https://cgit.krebsco.de/stockholm",
+  "rev": "a461078f13d01693c0da08eb9fd53612b68170eb",
+  "date": "2021-06-05T11:49:57+02:00",
+  "path": "/nix/store/sc22zck9cz08vjhdi5z129ggmwabs5zj-stockholm",
+  "sha256": "0khm0hk8badrrj0s68sg568q1g74y66i1930x1xwyakhc2qb5xca",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false

configs/default.nix

@@ -223,7 +223,7 @@ in {
     ./neovim.nix
     ./nix.nix
     ./newsboat.nix
-    # ./flameshot-once.nix
+    ./flameshot-once.nix
     ./packages
     ./power-action.nix
     ./printing.nix

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";
+    };
+  };
 }

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";

configs/mail/client.nix

@@ -13,7 +13,7 @@ let
           (import <stockholm/krebs/5pkgs/haskell>)
         ];
       };
-      much-pkg = nixpkgs-much.haskellPackages.callCabal2nix "much" <niveum/submodules/much> {};
+      much-pkg = pkgs.haskellPackages.callCabal2nix "much" <niveum/submodules/much> {};
     in nixpkgs-much.haskell.lib.dontHaddock much-pkg;
 in {
   environment.variables.NOTMUCH_CONFIG = config.home-manager.users.me.home.sessionVariables.NOTMUCH_CONFIG;

shell.nix

@@ -27,7 +27,7 @@ let
     };
     stockholm = {
       ref = "refs/heads/master";
-      url = "https://github.com/kmein/stockholm";
+      url = "https://cgit.krebsco.de/stockholm";
       path = toString .versions/stockholm.json;
     };
     retiolum = {