chore(package): gitea: verify heatmap package build

This commit is contained in:
2026-06-06 23:01:57 +00:00
parent 72168aa8fa
commit 98bb6c568f
6 changed files with 29 additions and 19 deletions
+15 -7
View File
@@ -187,19 +187,27 @@ in {
readModulesRecursive' = path: extraArgs: readModulesRecursive' = path: extraArgs:
with lib; with lib;
with builtins; let with builtins; let
paths = pipe "${path}" [ collectPaths = dir: prefix:
(filesystem.listFilesRecursive) concatLists (mapAttrsToList (name: type: let
(filter (hasSuffix ".nix")) path' = dir + "/${name}";
]; name' = if prefix == "" then name else "${prefix}/${name}";
in
if type == "directory"
then collectPaths path' name'
else [{
inherit path';
name = name';
}]
) (readDir dir));
paths = filter (path': hasSuffix ".nix" path'.name) (collectPaths path "");
pathToName = flip pipe [ pathToName = flip pipe [
(removePrefix "${path}/")
(replaceStrings ["/" ".nix"] ["." ""]) (replaceStrings ["/" ".nix"] ["." ""])
(removeSuffix ".nix") (removeSuffix ".nix")
]; ];
attrList = attrList =
map (path': { map (path': {
name = pathToName (unsafeDiscardStringContext path'); name = pathToName path'.name;
value = import path' extraArgs; value = import path'.path' extraArgs;
}) })
paths; paths;
in in
+2 -2
View File
@@ -9,11 +9,11 @@ with self.lib;
let let
# Combine hectic modules into one # Combine hectic modules into one
hectic.imports = attrValues ( hectic.imports = attrValues (
readModulesRecursive' ./hectic { inherit flake self inputs; } readModulesRecursive' (flake + "/nixos/module/hectic") { inherit flake self inputs; }
); );
# Read generic modules separately # Read generic modules separately
generic = readModulesRecursive' generic = readModulesRecursive'
./generic (flake + "/nixos/module/generic")
{ inherit flake self inputs; }; { inherit flake self inputs; };
in generic // { in generic // {
inherit hectic; inherit hectic;
@@ -18,6 +18,7 @@
]; ];
adminNames = [ "yukkop" ]; adminNames = [ "yukkop" ];
matrixClusterSopsFile = flake + "/sus/matrix-cluster.yaml";
cfg = config.hectic.generic.matrix-cluster; cfg = config.hectic.generic.matrix-cluster;
in { in {
@@ -39,7 +40,7 @@ in {
value = { value = {
key = "matrix/users/${name}/password"; key = "matrix/users/${name}/password";
owner = "matrix-synapse"; owner = "matrix-synapse";
sopsFile = "${flake}/sus/matrix-cluster.yaml"; sopsFile = matrixClusterSopsFile;
}; };
}) userNames }) userNames
); );
+1 -1
View File
@@ -147,7 +147,7 @@ in {
(lib.mkIf cfg.watcher.enable { (lib.mkIf cfg.watcher.enable {
sops.secrets."sentinèlla/watcher/environment" = lib.mkDefault { sops.secrets."sentinèlla/watcher/environment" = lib.mkDefault {
sopsFile = "${flake}/sus/sentinella-default.yaml"; sopsFile = flake + "/sus/sentinella-default.yaml";
}; };
systemd.services."sentinella-watcher" = { systemd.services."sentinella-watcher" = {
@@ -14,6 +14,7 @@
jitsiHost = "meet.accord.tube"; jitsiHost = "meet.accord.tube";
elementEntryDomain = "element.bfs.band"; elementEntryDomain = "element.bfs.band";
polandEntryDomain = "bfs.band"; polandEntryDomain = "bfs.band";
matrixClusterSopsFile = flake + "/sus/matrix-cluster.yaml";
backendProxyConfig = '' backendProxyConfig = ''
proxy_ssl_server_name on; proxy_ssl_server_name on;
proxy_ssl_name ${matrixHost}; proxy_ssl_name ${matrixHost};
@@ -203,41 +204,41 @@ in {
key = "matrix/signing-key"; key = "matrix/signing-key";
owner = "matrix-synapse"; owner = "matrix-synapse";
mode = "0400"; mode = "0400";
sopsFile = "${flake}/sus/matrix-cluster.yaml"; sopsFile = matrixClusterSopsFile;
}; };
sops.secrets."matrix/postgres-replication-password" = { sops.secrets."matrix/postgres-replication-password" = {
key = "matrix/postgres-replication-password"; key = "matrix/postgres-replication-password";
owner = "postgres"; owner = "postgres";
mode = "0400"; mode = "0400";
sopsFile = "${flake}/sus/matrix-cluster.yaml"; sopsFile = matrixClusterSopsFile;
}; };
sops.secrets."matrix/object-storage/credentials" = { sops.secrets."matrix/object-storage/credentials" = {
key = "matrix/object-storage/credentials"; key = "matrix/object-storage/credentials";
owner = "matrix-synapse"; owner = "matrix-synapse";
mode = "0400"; mode = "0400";
sopsFile = "${flake}/sus/matrix-cluster.yaml"; sopsFile = matrixClusterSopsFile;
}; };
sops.secrets."matrix/secrets" = { sops.secrets."matrix/secrets" = {
key = "matrix/secrets"; key = "matrix/secrets";
owner = "matrix-synapse"; owner = "matrix-synapse";
mode = "0400"; mode = "0400";
sopsFile = "${flake}/sus/matrix-cluster.yaml"; sopsFile = matrixClusterSopsFile;
}; };
sops.secrets."matrix/turn-secret" = { sops.secrets."matrix/turn-secret" = {
key = "matrix/turn-secret"; key = "matrix/turn-secret";
owner = "turnserver"; owner = "turnserver";
group = "turnserver"; group = "turnserver";
mode = "0400"; mode = "0400";
sopsFile = "${flake}/sus/matrix-cluster.yaml"; sopsFile = matrixClusterSopsFile;
}; };
sops.secrets."matrix/porkbun-api-key" = { sops.secrets."matrix/porkbun-api-key" = {
key = "matrix/porkbun-api-key"; key = "matrix/porkbun-api-key";
mode = "0400"; mode = "0400";
sopsFile = "${flake}/sus/matrix-cluster.yaml"; sopsFile = matrixClusterSopsFile;
}; };
sops.secrets."matrix/porkbun-secret-api-key" = { sops.secrets."matrix/porkbun-secret-api-key" = {
key = "matrix/porkbun-secret-api-key"; key = "matrix/porkbun-secret-api-key";
mode = "0400"; mode = "0400";
sopsFile = "${flake}/sus/matrix-cluster.yaml"; sopsFile = matrixClusterSopsFile;
}; };
} }
+1 -1
View File
@@ -116,7 +116,7 @@ in {
sops = { sops = {
gnupg.sshKeyPaths = [ ]; gnupg.sshKeyPaths = [ ];
age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
defaultSopsFile = "${flake}/sus/hectic-lab.yaml"; defaultSopsFile = flake + "/sus/hectic-lab.yaml";
secrets = builtins.listToAttrs (map mkMailPasswordSecret mailUserNames) // { secrets = builtins.listToAttrs (map mkMailPasswordSecret mailUserNames) // {
"init-postgresql" = { "init-postgresql" = {
key = "init-postgresql"; key = "init-postgresql";