diff options
| author | lassulus <lassulus@lassul.us> | 2020-06-07 13:09:45 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-06-07 13:09:45 +0200 |
| commit | fe119203ea4d2dc3e618d113c7f70629fd750aa3 (patch) | |
| tree | 9b1b2e347e8fe66cacc9d93da7479100256332c9 /krebs | |
| parent | 0f01f2899f68b8e142610994da529b5893f2a5f6 (diff) | |
| parent | 360e823a9a187dd61d1c7f3f712a8edc9e7879d9 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/urlwatch.nix | 4 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/kpaste/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
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; }; diff --git a/krebs/5pkgs/simple/kpaste/default.nix b/krebs/5pkgs/simple/kpaste/default.nix index 217cb8a44..9820c931d 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|https://p.krebsco.de|}' '' |