From 9b414d104a2bbe356c490952dc82d5773ba1cd83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 19 Apr 2022 23:28:00 +0200
Subject: [PATCH] fix(makanek): names

---
 flake.lock                |  6 +++---
 systems/makanek/names.nix | 11 ++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index b52fd26..15185ce 100644
--- a/flake.lock
+++ b/flake.lock
@@ -194,11 +194,11 @@
     "scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1648400983,
-        "narHash": "sha256-I9ADWgUN1orbnXPBW4kulHpv8wkx6C8zsQcg9wphpPg=",
+        "lastModified": 1650402678,
+        "narHash": "sha256-LkaKJvF09wVHpN5FuJtX0M4vOA/DrO9xUMFI8fMtNeA=",
         "owner": "kmein",
         "repo": "scripts",
-        "rev": "f5df67a2416d8f05a7dbfea269c44668854c7887",
+        "rev": "adfd4238f7a8f0f894547998cbb04327bad97884",
         "type": "github"
       },
       "original": {
diff --git a/systems/makanek/names.nix b/systems/makanek/names.nix
index fc49aed..1b9099b 100644
--- a/systems/makanek/names.nix
+++ b/systems/makanek/names.nix
@@ -4,8 +4,8 @@
   ...
 }: let
   port = 5703;
-  geogen-src = "${<scripts>}/onomastics";
-  geogen = pkgs.callPackage geogen-src {};
+  onomap-src = "${<scripts>}/onomastics-ng";
+  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 = ''
-      cd $(mktemp -d)
-      ln -s "${geogen-src}/wsgi.py" wsgi.py
-      ${geogen.dependencyEnv}/bin/gunicorn wsgi:app -b :${toString port}
-    '';
+    environment.PORT = toString port;
   };
 
   services.nginx = {