Merge remote-tracking branch 'lassul.us/master'

7 files changed, 76 insertions, 96 deletions

diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix
index a20878487..683556081 100644
--- a/krebs/1systems/hotdog/config.nix
+++ b/krebs/1systems/hotdog/config.nix
@@ -12,6 +12,7 @@
     <stockholm/krebs/2configs/wiki.nix>
     <stockholm/krebs/2configs/acme.nix>
     <stockholm/krebs/2configs/mud.nix>
+    <stockholm/krebs/2configs/repo-sync.nix>
 
     <stockholm/krebs/2configs/cal.nix>
     <stockholm/krebs/2configs/mastodon.nix>
diff --git a/krebs/2configs/ircd.nix b/krebs/2configs/ircd.nix
index 5435ea166..c56883d3e 100644
--- a/krebs/2configs/ircd.nix
+++ b/krebs/2configs/ircd.nix
@@ -38,6 +38,8 @@
         hidden = false;
         password = "$2a$04$0AtVycWQJ07ymrDdKyAm2un3UVSVIzpzL3wsWbWb3PF95d1CZMcMO";
       };
+      server.max-line-length = 1024;
+      server.lookup-hostnames = true;
     };
   };
 }
diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 39039cc11..0a5031415 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -51,6 +51,45 @@ let
     };
   };
 
+  bing = {
+    pattern = "!bing (.*)$";
+    activate = "match";
+    arguments = [1];
+    timeoutSec = 1337;
+    command = {
+      filename = pkgs.writeDash "bing" ''
+        set -efu
+        report_error() {
+          printf '%s' "$*" |
+            curl -Ss http://p.r --data-binary @- |
+            tail -1 |
+            echo "error $(cat)"
+          exit 0
+        }
+        export PATH=${makeBinPath [
+          pkgs.coreutils
+          pkgs.curl
+          pkgs.jq
+        ]}
+        response=$(printf '%s' "$*" |
+          curl -SsG http://bing-gpt.r/api/chat --data-urlencode 'prompt@-'
+        )
+        if [ "$?" -ne 0 ]; then
+          report_error "$response"
+        else
+          if ! text=$(printf '%s' "$response" | jq -er '.item.messages[1].text'); then
+            echo "$_from: $(report_error "$response")"
+            exit 0
+          fi
+          printf '%s' "$text" | echo "$_from: $(cat)"
+
+          printf '%s' "$response" |
+            jq -r '[.item.messages[1].sourceAttributions[].seeMoreUrl] | to_entries[] | "[\(.key + 1)]: \(.value)"'
+        fi
+      '';
+    };
+  };
+
   confuse = {
     pattern = "!confuse (.*)$";
     activate = "match";
@@ -322,6 +361,7 @@ let
         }
         bedger-add
         bedger-balance
+        bing
         hooks.sed
         interrogate
         say
diff --git a/krebs/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix
index e2be477fd..9f129d81c 100644
--- a/krebs/2configs/repo-sync.nix
+++ b/krebs/2configs/repo-sync.nix
@@ -22,7 +22,6 @@ let
         post-receive = pkgs.git-hooks.irc-announce {
           channel = "#xxx";
           refs = [
-            "refs/heads/master"
             "refs/heads/newest"
             "refs/tags/*"
           ];
@@ -37,7 +36,6 @@ let
       {
         user = with config.krebs.users; [
           config.krebs.users."${config.networking.hostName}-repo-sync"
-          jeschli
           lass
           makefu
           tv
@@ -50,7 +48,7 @@ let
           konsens-user
         ];
         repo = [ repo ];
-        perm = push ''refs/heads/master'' [ create merge ];
+        perm = push "refs/heads/common" [ create merge ];
       }
       {
         user = attrValues config.krebs.users;
@@ -61,31 +59,18 @@ let
     repos."${name}" = repo;
   };
 
-  sync-retiolum = {
+  sync-repo = {
     name,
+    remotes,
     desc ? "mirror for ${name}",
     section ? "mirror"
   }:
     {
       krebs.repo-sync.repos.${name} = {
-        branches = {
-          lassulus = {
-            origin.url = "http://cgit.lassul.us/${name}";
-            mirror.url = "${mirror}${name}";
-          };
-          makefu = {
-            origin.url = "http://cgit.gum/${name}";
-            mirror.url = "${mirror}${name}";
-          };
-          nin = {
-            origin.url = "http://cgit.onondaga.r/${name}";
-            mirror.url = "${mirror}${name}";
-          };
-          tv = {
-            origin.url = "http://cgit.ni.r/${name}";
-            mirror.url = "${mirror}${name}";
-          };
-        };
+        branches = (lib.mapAttrs' (user: url: lib.nameValuePair user {
+          origin.url = url;
+          mirror.url = "${mirror}${name}";
+        }) remotes);
         latest = {
           url = "${mirror}${name}";
           ref = "heads/newest";
@@ -94,24 +79,6 @@ let
       krebs.git = defineRepo { inherit name desc section; };
     };
 
-  sync-remote = {
-    name,
-    url,
-    desc ? "mirror for ${name}",
-    section ? "mirror"
-  }:
-    {
-      krebs.repo-sync.repos.${name} = {
-        branches = {
-          remote = {
-            origin.url = url;
-            mirror.url = "${mirror}${name}";
-          };
-        };
-      };
-      krebs.git = defineRepo { inherit name desc section; };
-    };
-
 in {
   krebs.git = {
     enable = true;
@@ -126,7 +93,6 @@ in {
   krebs.konsens = {
     enable = true;
     repos = {
-      krops = { branchesToCheck = [ "lassulus" "tv" ]; };
       stockholm = {};
     };
   };
@@ -137,52 +103,20 @@ in {
   };
 
   imports = [
-    (sync-retiolum { name = "the_playlist"; desc = "Good Music collection + tools"; section = "art"; })
-
-    (sync-retiolum { name = "stockholm"; desc = "take all computers hostage, they love it"; section = "configuration"; })
-
-    (sync-retiolum { name = "cholerab"; desc = "krebs thesauron & enterprise-patterns"; section = "documentation"; })
-
-    (sync-retiolum { name = "buildbot-classic"; desc = "fork of buildbot"; section = "software"; })
-    (sync-retiolum { name = "disko"; desc = "take a description of your disk layout and produce a format script"; section = "software"; })
-    (sync-retiolum { name = "news"; desc = "take a rss feed and a timeout and print it to stdout"; section = "software"; })
-    (sync-retiolum { name = "krops"; desc = "krebs ops"; section = "software"; })
-    (sync-retiolum { name = "go"; desc = "url shortener"; section = "software"; })
-    (sync-retiolum { name = "much"; desc = "curses email client"; section = "software"; })
-    (sync-retiolum { name = "newsbot-js"; desc = "irc rss/atom bot"; section = "software"; })
-    (sync-retiolum { name = "nix-writers"; desc = "high level writers for nix"; section = "software"; })
-
-    (sync-retiolum { name = "cac-api"; desc = "CloudAtCost API command line interface"; section = "miscellaneous"; })
-    (sync-retiolum { name = "dic"; desc = "dict.leo.org command line interface"; section = "miscellaneous"; })
-    (sync-retiolum { name = "get"; section = "miscellaneous"; })
-    (sync-retiolum { name = "hstool"; desc = "Haskell Development Environment ^_^"; section = "miscellaneous"; })
-    (sync-retiolum { name = "htgen"; desc = "toy HTTP server"; section = "miscellaneous"; })
-    (sync-retiolum { name = "kirk"; desc = "IRC tools"; section = "miscellaneous"; })
-    (sync-retiolum { name = "load-env"; section = "miscellaneous"; })
-    (sync-retiolum { name = "loldns"; desc = "toy DNS server"; section = "miscellaneous"; })
-    (sync-retiolum { name = "netcup"; desc = "netcup command line interface"; section = "miscellaneous"; })
-    (sync-retiolum { name = "populate"; desc = "source code installer"; section = "miscellaneous"; })
-    (sync-retiolum { name = "q"; section = "miscellaneous"; })
-    (sync-retiolum { name = "regfish"; section = "miscellaneous"; })
-    (sync-retiolum { name = "soundcloud"; desc = "SoundCloud command line interface"; section = "miscellaneous"; })
-
-    (sync-retiolum { name = "blessings"; section = "Haskell libraries"; })
-    (sync-retiolum { name = "mime"; section = "Haskell libraries"; })
-    (sync-retiolum { name = "quipper"; section = "Haskell libraries"; })
-    (sync-retiolum { name = "scanner"; section = "Haskell libraries"; })
-    (sync-retiolum { name = "wai-middleware-time"; section = "Haskell libraries"; })
-    (sync-retiolum { name = "web-routes-wai-custom"; section = "Haskell libraries"; })
-    (sync-retiolum { name = "xintmap"; section = "Haskell libraries"; })
-    (sync-retiolum { name = "xmonad-stockholm"; desc = "krebs xmonad modules"; section = "Haskell libraries"; })
-
-    (sync-remote { name = "array"; url = "https://github.com/makefu/array"; })
-    (sync-remote { name = "email-header"; url = "https://github.com/4z3/email-header"; })
-    (sync-remote { name = "mycube-flask"; url = "https://github.com/makefu/mycube-flask"; })
-    (sync-remote { name = "reaktor-titlebot"; url = "https://github.com/makefu/reaktor-titlebot"; })
-    (sync-remote { name = "repo-sync"; url = "https://github.com/makefu/repo-sync"; })
-    (sync-remote { name = "skytraq-datalogger"; url = "https://github.com/makefu/skytraq-datalogger"; })
-    (sync-remote { name = "realwallpaper"; url = "https://github.com/lassulus/realwallpaper"; })
-    (sync-remote { name = "painload"; url = "https://github.com/krebs/painload"; })
-    (sync-remote { name = "nixos-wiki"; url = "https://github.com/Mic92/nixos-wiki.wiki.git"; })
+    (sync-repo {
+      name = "stockholm";
+      desc = "take all computers hostage, they love it";
+      section = "configuration";
+      remotes = {
+        makefu = "http://cgit.gum.r/stockholm";
+        tv = "http://cgit.ni.r/stockholm";
+        lassulus = "http://cgit.orange.r/stockholm";
+      };
+    })
+    ({ krebs.git = defineRepo {
+      name = "krops";
+      desc = "deployment tools";
+      section = "deployment";
+    };})
   ];
 }
diff --git a/krebs/3modules/konsens.nix b/krebs/3modules/konsens.nix
index 81486810b..439bcc7f4 100644
--- a/krebs/3modules/konsens.nix
+++ b/krebs/3modules/konsens.nix
@@ -39,10 +39,13 @@ let
   };
 
   imp = {
+    users.groups.konsens.gid = genid "konsens";
     users.users.konsens = rec {
       name = "konsens";
+      group = "konsens";
       uid = genid name;
       home = "/var/lib/konsens";
+      isSystemUser = true;
       createHome = true;
     };
 
diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json
index 885672736..bd1ab98c0 100644
--- a/krebs/nixpkgs-unstable.json
+++ b/krebs/nixpkgs-unstable.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e",
-  "date": "2023-03-21T23:16:58+01:00",
-  "path": "/nix/store/rg3f6v4f7mba0kqnhiarj7yg6066cc5v-nixpkgs",
-  "sha256": "0myq7fnykna5qazbk6hdgahy148yd7f5l8nrxhzllj67y86a5sxw",
+  "rev": "645bc49f34fa8eff95479f0345ff57e55b53437e",
+  "date": "2023-04-19T18:04:47+02:00",
+  "path": "/nix/store/jh86824939585dinrs1zlkh6cvz8l8l7-nixpkgs",
+  "sha256": "0kfndc7xdkm89yl0f27wdnwd6gdad3i49jx7gvaib1hz0ifpmxzv",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 118415785..7e478e9cf 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "e2c97799da5f5cd87adfa5017fba971771e123ef",
-  "date": "2023-03-20T14:29:52+01:00",
-  "path": "/nix/store/vxca9w313d1bzw9dx4yaw8c0vrqjxa0p-nixpkgs",
-  "sha256": "0qff1r8k0m19z1ppzb8gk5xrnlvabjdl3pqwpc3y5bm15qxzk25s",
+  "rev": "fd901ef4bf93499374c5af385b2943f5801c0833",
+  "date": "2023-04-22T11:27:49+08:00",
+  "path": "/nix/store/gpfv5hbki6g1b63nqw7md5bjlcpzsz1w-nixpkgs",
+  "sha256": "1fd7xyfna0klfbv37qq1ms2j4gzjpy14a8vbnw1i8ix6fijkywjf",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,