Merge remote-tracking branch 'tv/master'

3 files changed, 39 insertions, 1 deletions

diff --git a/tv/2configs/imgur.nix b/tv/2configs/imgur.nix
new file mode 100644
index 0000000..ba84fd2
--- /dev/null
+++ b/tv/2configs/imgur.nix
@@ -0,0 +1,25 @@
+with import <stockholm/lib>;
+{ config, pkgs, ... }: {
+
+  services.nginx.virtualHosts."ni.r" = {
+    locations."/image" = {
+      extraConfig = /* nginx */ ''
+        client_max_body_size 20M;
+
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        proxy_pass http://127.0.0.1:${toString config.krebs.htgen.imgur.port};
+        proxy_pass_header Server;
+      '';
+    };
+  };
+
+  krebs.htgen.imgur = {
+    port = 7771;
+    script = /* sh */ ''
+      (. ${pkgs.htgen-imgur}/bin/htgen-imgur)
+    '';
+  };
+}
diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix
index 378b5d1..619b044 100644
--- a/tv/2configs/urlwatch.nix
+++ b/tv/2configs/urlwatch.nix
@@ -24,7 +24,13 @@ in {
       http://www.exim.org/
 
       # ref src/nixpkgs/pkgs/tools/networking/urlwatch/default.nix
-      https://thp.io/2008/urlwatch/
+      {
+        url = https://thp.io/2008/urlwatch/;
+        # workaround: ('Received response with content-encoding: gzip, but
+        # failed to decode it.', error('Error -3 while decompressing data:
+        # incorrect header check',))
+        ignore_cached = true;
+      }
 
       # 2015-02-18
       # ref ~/src/nixpkgs/pkgs/tools/text/qprint/default.nix
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 3577445..4e9e307 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -108,6 +108,13 @@ in {
     };
     path = [
       config.tv.slock.package
+      (pkgs.flameshot-once.override {
+        config.imgur.enable = true;
+        config.imgur.createUrl = "http://ni.r/image";
+        config.imgur.deleteUrl = "http://ni.r/image/delete/%1";
+        config.imgur.xdg-open.browser = "/etc/profiles/per-user/tv/bin/cr";
+        config.timeout = 200;
+      })
       pkgs.fzmenu
       pkgs.pulseaudioLight.out
       pkgs.rxvt_unicode