From 39cc7e81edc35f34fa8e242277bd69f51d84566f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 22 May 2020 20:16:53 +0200
Subject: urlwatch module: use users.users.{name} istead of a list

---
 krebs/3modules/urlwatch.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/urlwatch.nix b/krebs/3modules/urlwatch.nix
index 43535b08f..0b7a71db5 100644
--- a/krebs/3modules/urlwatch.nix
+++ b/krebs/3modules/urlwatch.nix
@@ -189,8 +189,8 @@ let
         '';
       };
     };
-    users.extraUsers = singleton {
-      inherit (user) name uid;
+    users.users.${user.name} = {
+      inherit (user) uid;
       home = cfg.dataDir;
       createHome = true;
     };
-- 
cgit v1.2.3


From bed170dd8a8ca5ba4c9109fc858dc658f90df68c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 5 Jun 2020 10:31:17 +0200
Subject: pkgs.kpaste: paste either stdin or file from parameter

---
 krebs/5pkgs/simple/kpaste/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/simple/kpaste/default.nix b/krebs/5pkgs/simple/kpaste/default.nix
index 217cb8a44..02f482316 100644
--- a/krebs/5pkgs/simple/kpaste/default.nix
+++ b/krebs/5pkgs/simple/kpaste/default.nix
@@ -1,6 +1,6 @@
 { curl, gnused, writeDashBin }:
 
 writeDashBin "kpaste" ''
-  ${curl}/bin/curl -sS http://p.r --data-binary @- |
-  ${gnused}/bin/sed '$ {p;s/\<r\>/krebsco.de/}'
+  ${curl}/bin/curl -sS http://p.r --data-binary @"''${1:--}" |
+  ${gnused}/bin/sed '$ {p;s/\<http://p.r\>/krebsco.de/}'
 ''
-- 
cgit v1.2.3


From 360e823a9a187dd61d1c7f3f712a8edc9e7879d9 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 5 Jun 2020 10:39:43 +0200
Subject: pkgs.kpaste: replace internal host with https external host

---
 krebs/5pkgs/simple/kpaste/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/simple/kpaste/default.nix b/krebs/5pkgs/simple/kpaste/default.nix
index 02f482316..9820c931d 100644
--- a/krebs/5pkgs/simple/kpaste/default.nix
+++ b/krebs/5pkgs/simple/kpaste/default.nix
@@ -2,5 +2,5 @@
 
 writeDashBin "kpaste" ''
   ${curl}/bin/curl -sS http://p.r --data-binary @"''${1:--}" |
-  ${gnused}/bin/sed '$ {p;s/\<http://p.r\>/krebsco.de/}'
+  ${gnused}/bin/sed '$ {p;s|http://p.r|https://p.krebsco.de|}'
 ''
-- 
cgit v1.2.3