flake.lock: Update

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/2f06b87f64bc06229e05045853e0876666e1b023' (2022-04-14)
  → 'github:NixOS/nixpkgs/a318a09a96a38382fe61a7f85d03ea6e25c46c56' (2022-04-22)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/6140c314d5850406dddc78e55dcc8716ea111ee4' (2022-04-17)
  → 'github:NixOS/nixpkgs/0f1f92d85be76e0bd79ebb2285be8f43683eb845' (2022-04-24)

configs/cloud.nix

@@ -49,6 +49,11 @@ in {
     };
   };
 
+  systemd.user.services.nextcloud-client = {
+    wants = ["gnome-keyring.service"];
+    after = ["gnome-keyring.service"];
+  };
+
   environment.systemPackages = [
     (pkgs.writers.writeDashBin "book" ''
       set -efu

flake.lock

@@ -109,11 +109,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1649944829,
+        "lastModified": 1650647313,
-        "narHash": "sha256-wjOgLfjCdyoRamMOrVJceeDJk4LvJsQOxBoT3k16/7Q=",
+        "narHash": "sha256-6ghnNPXDlG6/tXeIFdbP0cGnik6TGNwc615hhG9dpl4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2f06b87f64bc06229e05045853e0876666e1b023",
+        "rev": "a318a09a96a38382fe61a7f85d03ea6e25c46c56",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1650167080,
+        "lastModified": 1650760898,
-        "narHash": "sha256-sSFOXf1YtX6EIHG5HAh64y6EqJ1/5epcCSq1c8wxCi4=",
+        "narHash": "sha256-r1rzTgwi1FKx5t3KKi7Xt4hyGdOnTD0RSTpbNls09KU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6140c314d5850406dddc78e55dcc8716ea111ee4",
+        "rev": "0f1f92d85be76e0bd79ebb2285be8f43683eb845",
         "type": "github"
       },
       "original": {
@@ -194,11 +194,11 @@
     "scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1648400983,
+        "lastModified": 1650402678,
-        "narHash": "sha256-I9ADWgUN1orbnXPBW4kulHpv8wkx6C8zsQcg9wphpPg=",
+        "narHash": "sha256-LkaKJvF09wVHpN5FuJtX0M4vOA/DrO9xUMFI8fMtNeA=",
         "owner": "kmein",
         "repo": "scripts",
-        "rev": "f5df67a2416d8f05a7dbfea269c44668854c7887",
+        "rev": "adfd4238f7a8f0f894547998cbb04327bad97884",
         "type": "github"
       },
       "original": {

systems/makanek/names.nix

@@ -4,8 +4,8 @@
   ...
 }: let
   port = 5703;
-  geogen-src = "${<scripts>}/onomastics";
+  onomap-src = "${<scripts>}/onomastics-ng";
-  geogen = pkgs.callPackage geogen-src {};
+  onomap = pkgs.haskellPackages.callCabal2nix "onomap" onomap-src {};
 in {
   systemd.services.names = {
     wants = ["network-online.target"];
@@ -13,12 +13,9 @@ in {
     description = "Better clone of geogen.stoepel.net";
     serviceConfig = {
       DynamicUser = true;
+      ExecStart = "${onomap}/bin/onomap-web";
     };
-    script = ''
+    environment.PORT = toString port;
-      cd $(mktemp -d)
-      ln -s "${geogen-src}/wsgi.py" wsgi.py
-      ${geogen.dependencyEnv}/bin/gunicorn wsgi:app -b :${toString port}
-    '';
   };
 
   services.nginx = {