nix

commit d3f9af09ac44964d233e551606eb6480bceedc62
parent 017ce47c986ff4b5f98cc18a1bcb61abeb5d2d21
Author: mtmn <miro@haravara.org>
Date:   Thu, 16 Apr 2026 20:13:02 +0200

feat: add central cache; corpus instance

Diffstat:
M
flake.lock
 | 
14
+++++++-------
M
flake.nix
 | 
5
+++++
M
hosts/nixaran/configuration.nix
 | 
0

M
modules/nixos/base.nix
 | 
2
++
A
modules/services/corpus-filip.nix
 | 
5
+++++
M
secrets.nix
 | 
1
+
A
secrets/corpus-filip.age
 | 
0

M
secrets/corpus-robo.age
 | 
0

M
secrets/corpus.age
 | 
0

9 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -30,11 +30,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1776279594,
-        "narHash": "sha256-N8RdA+ExCkSUcnabRXY8v2vaY1Zt9HfMGyEr1ATavkM=",
+        "lastModified": 1776374839,
+        "narHash": "sha256-fVh4BTu3xZfkQI3WC4T/ELN/AfIG7JI5zH1DBm6P+As=",
         "ref": "refs/heads/master",
-        "rev": "e83086e5d74a178afbd0da7f2c0a4c4d6b9b883b",
-        "revCount": 62,
+        "rev": "9ce663eb3af0ff7a7d55a46f2b9794d0b8e3b46a",
+        "revCount": 63,
         "type": "git",
         "url": "ssh://git@codeberg.org/mtmn/corpus"
       },
@@ -182,11 +182,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776184304,
-        "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=",
+        "lastModified": 1776373306,
+        "narHash": "sha256-iAJIzHngGZeLIkjzuuWI6VBsYJ1n89a/Esq0m8R1vjs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3c7524c68348ef79ce48308e0978611a050089b2",
+        "rev": "d401492e2acd4fea42f7705a3c266cea739c9c36",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
@@ -68,10 +68,12 @@
                 substituters = [
                   "https://cache.nixos.org"
                   "https://nix-community.cachix.org"
+                  "https://attic.saatana.cat/central"
                 ];
                 trusted-public-keys = [
                   "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
                   "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+                  "central:7OgUwblUa9YD6dVxXSApAGyC0/oQ/JJUH2puRZ0sv0M="
                 ];
                 netrc-file = "/run/agenix/netrc";
               };
@@ -107,10 +109,12 @@
                     substituters = [
                       "https://cache.nixos.org"
                       "https://nix-community.cachix.org"
+                      "https://attic.saatana.cat/central"
                     ];
                     trusted-public-keys = [
                       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
                       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+                      "central:7OgUwblUa9YD6dVxXSApAGyC0/oQ/JJUH2puRZ0sv0M="
                     ];
                   };
                 }
@@ -176,6 +180,7 @@
         "corpus"
         "corpus-pstmn"
         "corpus-robo"
+        "corpus-filip"
         "napkins"
         "listenbrainz-mpd"
         "redlib"
diff --git a/hosts/nixaran/configuration.nix b/hosts/nixaran/configuration.nix
Binary files differ.
diff --git a/modules/nixos/base.nix b/modules/nixos/base.nix
@@ -13,10 +13,12 @@
       substituters = [
         "https://cache.nixos.org"
         "https://nix-community.cachix.org"
+        "https://attic.saatana.cat/central"
       ];
       trusted-public-keys = [
         "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "central:7OgUwblUa9YD6dVxXSApAGyC0/oQ/JJUH2puRZ0sv0M="
       ];
     };
     gc = {
diff --git a/modules/services/corpus-filip.nix b/modules/services/corpus-filip.nix
@@ -0,0 +1,5 @@
+import ./mk-corpus.nix {
+  optionName = "corpusFilip";
+  defaultPort = 8459;
+  defaultSecretFile = ../../secrets/corpus-filip.age;
+}
diff --git a/secrets.nix b/secrets.nix
@@ -19,4 +19,5 @@ in {
   "secrets/corpus.age".publicKeys = allKeys;
   "secrets/corpus-pstmn.age".publicKeys = allKeys;
   "secrets/corpus-robo.age".publicKeys = allKeys;
+  "secrets/corpus-filip.age".publicKeys = allKeys;
 }
diff --git a/secrets/corpus-filip.age b/secrets/corpus-filip.age
Binary files differ.
diff --git a/secrets/corpus-robo.age b/secrets/corpus-robo.age
Binary files differ.
diff --git a/secrets/corpus.age b/secrets/corpus.age
Binary files differ.