feat: get flameshot-once working

.versions/stockholm.json

@@ -1,7 +1,7 @@
 {
   "url": "https://cgit.krebsco.de/stockholm",
-  "rev": "ea5b591d065b721666fc3527ad45a7545a594a77",
+  "rev": "0ae752cefe8aa92e00ab704844309bc2de58adbf",
-  "date": "2019-10-23T21:00:14+02:00",
+  "date": "2020-05-29T12:40:51+02:00",
-  "sha256": "0fyxwmyb5b3nlmi6jni6ny2a63h8g4z0bsrb4gbbzvw31gf6mwhb",
+  "sha256": "0jmnhh6qr27dqm81naviw2inbga2qz7x50zj4vr40b96qpqkk3n0",
   "fetchSubmodules": false
 }

configs/default.nix

@@ -32,6 +32,7 @@ in
     ./nano.nix
     ./neovim.nix
     ./newsboat.nix
+    ./flameshot-once.nix
     ./nixpkgs-unstable.nix
     ./packages
     ./printing.nix

configs/flameshot-once.nix

@@ -0,0 +1,37 @@
+{ lib, pkgs, ... }:
+let
+  overrides = self: super: {
+      flameshot-once = self.callPackage <stockholm/krebs/5pkgs/haskell/flameshot-once.nix> {};
+      blessings = self.callPackage <stockholm/krebs/5pkgs/haskell/blessings.nix> {};
+  };
+  flameshot-once = pkgs.callPackage <stockholm/krebs/5pkgs/simple/flameshot-once> {};
+in
+{
+  nixpkgs.overlays = [
+    (import <stockholm/submodules/nix-writers/pkgs>)
+    (import <stockholm/krebs/5pkgs/override>)
+    (self: super: {
+      haskell = super.haskell // {
+        packages = lib.mapAttrs (name: value:
+          if lib.hasAttr "override" value
+            then value.override { inherit overrides; }
+            else value
+        ) super.haskell.packages;
+      };
+      haskellPackages = super.haskellPackages.override {
+        inherit overrides;
+      };
+      xwaitforwindow = super.callPackage <stockholm/krebs/5pkgs/simple/xwaitforwindow.nix> {};
+    })
+  ];
+
+  environment.systemPackages = [
+    (flameshot-once.override {
+      config.imgur.enable = true;
+      config.imgur.createUrl = "http://p.r/image";
+      config.imgur.deleteUrl = "http://p.r/image/delete/%1";
+      config.imgur.xdg-open.browser = "x-www-browser";
+      config.timeout = 200;
+    })
+  ];
+}

configs/packages/default.nix

@@ -1,9 +1,6 @@
 { pkgs, lib, ... }:
 let
   scripts = import <niveum/packages/scripts> { inherit pkgs lib; };
-  flameshot-once = pkgs.haskellPackages.callPackage <stockholm/krebs/5pkgs/haskell/flameshot-once.nix> {
-    blessings = pkgs.haskellPackages.callPackage <stockholm/krebs/5pkgs/haskell/blessings.nix> {};
-  };
 in
 {
   imports = [
@@ -60,7 +57,6 @@ in
     ffmpeg
     imagemagick
     scrot
-    flameshot-once
     # ARCHIVE TOOLS
     unzip
     unrar

niveum-update

@@ -30,7 +30,7 @@ krops() {
 }
 
 stockholm() {
-  fetch "ea5b591d065b721666fc3527ad45a7545a594a77" .versions/stockholm.json "https://cgit.krebsco.de/stockholm"
+  fetch "refs/heads/master" .versions/stockholm.json "https://cgit.krebsco.de/stockholm"
 }
 
 usage() {