nix

commit 4745ff9dd29edfc84cf91957bf4362186d3a032f
parent d3cbaa2bc796c49efe70837beea2cb67de6f7cf4
Author: mtmn <miro@haravara.org>
Date:   Fri, 17 Apr 2026 23:05:04 +0200

chore: corpus cleanup

Diffstat:
M
flake.lock
 | 
8
++++----
M
hosts/void/default.nix
 | 
1
+
D
modules/services/corpus-filip.nix
 | 
5
-----
D
modules/services/corpus-pstmn.nix
 | 
5
-----
D
modules/services/corpus-robo.nix
 | 
5
-----
M
modules/services/corpus.nix
 | 
4
++--

6 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -30,11 +30,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1776458484,
-        "narHash": "sha256-6plTxzPlI7DkRCP7YvldqTBk1Fy5b7Ag6YFXc6OCxvY=",
+        "lastModified": 1776459742,
+        "narHash": "sha256-oxzjFcbVzi/oV4yXPZmb6pKDG7S3UoEDh0lNAdtRW3Q=",
         "ref": "refs/heads/master",
-        "rev": "3a65b1d22b79f30adc09247979c6730c524c33a1",
-        "revCount": 73,
+        "rev": "9309cda5faf2c219404e52aa0b68d7564c9aad8d",
+        "revCount": 76,
         "type": "git",
         "url": "ssh://git@codeberg.org/mtmn/corpus"
       },
diff --git a/hosts/void/default.nix b/hosts/void/default.nix
@@ -130,6 +130,7 @@
       nix-diff
       alejandra
       nixd
+      attic-client
     ];
 
     javascript =
diff --git a/modules/services/corpus-filip.nix b/modules/services/corpus-filip.nix
@@ -1,5 +0,0 @@
-import ./mk-corpus.nix {
-  optionName = "corpusFilip";
-  defaultPort = 8459;
-  defaultSecretFile = ../../secrets/corpus-filip.age;
-}
diff --git a/modules/services/corpus-pstmn.nix b/modules/services/corpus-pstmn.nix
@@ -1,5 +0,0 @@
-import ./mk-corpus.nix {
-  optionName = "corpusPstmn";
-  defaultPort = 8322;
-  defaultSecretFile = ../../secrets/corpus-pstmn.age;
-}
diff --git a/modules/services/corpus-robo.nix b/modules/services/corpus-robo.nix
@@ -1,5 +0,0 @@
-import ./mk-corpus.nix {
-  optionName = "corpusRobo";
-  defaultPort = 8323;
-  defaultSecretFile = ../../secrets/corpus-robo.age;
-}
diff --git a/modules/services/corpus.nix b/modules/services/corpus.nix
@@ -8,7 +8,7 @@
   cfg = config.services.haravara.corpus;
 
   users =
-    pkgs.runCommand "users.json" {
+    pkgs.runCommand "users" {
       nativeBuildInputs = [pkgs.dhall-json];
     } ''
       dhall-to-json --file ${./../mixins/corpus/users.dhall} > $out
@@ -50,7 +50,7 @@ in {
 
       environment = {
         PORT = toString cfg.port;
-        CORPUS_CONFIG_FILE = "${users}";
+        CORPUS_USERS_FILE = "${users}";
         DATABASE_PATH = cfg.dataDir;
       };