- New unified flake with two nixpkgs channels (unstable for desktops, 25.11 for muffin)
- modules/common-{doas,shell-fish,nix}.nix extracted from duplicated blocks
- modules/desktop-common.nix: renamed from system/common.nix; secret paths point to secrets/desktop/
- hosts/{mreow,yarn}/default.nix import desktop-common; yarn imports modules/no-rgb.nix
- hosts/muffin/default.nix imports common-* + server-prefixed modules + services/; duplicate doas/fish/nix blocks removed; gc retention preserved as mkForce override
- modules/age-secrets.nix: file paths → ../secrets/server/*.age
- services/{minecraft,matrix/livekit}: secret paths → ../secrets/server/
- home/profiles/*.nix: ./progs/ → ../progs/
- hosts/{mreow,yarn}/home.nix: imports rewired to ../../home/profiles/ and ../../home/progs/
- home/progs/pi.nix and hosts/yarn/home.nix: secret reads → ../../secrets/home/
- tests/*.nix: ../modules/security.nix → ../modules/server-security.nix; ../modules/overlays.nix → ../lib/overlays.nix
- lib/default.nix: takes explicit lib param (defaults to nixpkgs-stable.lib)
204 lines
5.0 KiB
Nix
204 lines
5.0 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
inputs,
|
|
...
|
|
}:
|
|
{
|
|
imports = [
|
|
inputs.agenix.nixosModules.default
|
|
];
|
|
|
|
# Configure all agenix secrets
|
|
age.secrets = {
|
|
# ZFS encryption key
|
|
# path is set to /etc/zfs-key to match the ZFS dataset keylocation property
|
|
zfs-key = {
|
|
file = ../secrets/server/zfs-key.age;
|
|
mode = "0400";
|
|
owner = "root";
|
|
group = "root";
|
|
path = "/etc/zfs-key";
|
|
};
|
|
|
|
# Secureboot keys archive
|
|
secureboot-tar = {
|
|
file = ../secrets/server/secureboot.tar.age;
|
|
mode = "0400";
|
|
owner = "root";
|
|
group = "root";
|
|
};
|
|
|
|
# System passwords
|
|
hashedPass = {
|
|
file = ../secrets/server/hashedPass.age;
|
|
mode = "0400";
|
|
owner = "root";
|
|
group = "root";
|
|
};
|
|
|
|
# Service authentication
|
|
caddy_auth = {
|
|
file = ../secrets/server/caddy_auth.age;
|
|
mode = "0400";
|
|
owner = "caddy";
|
|
group = "caddy";
|
|
};
|
|
|
|
# Njalla API token (NJALLA_API_TOKEN=...) for Caddy DNS-01 challenge
|
|
njalla-api-token-env = {
|
|
file = ../secrets/server/njalla-api-token-env.age;
|
|
mode = "0400";
|
|
owner = "caddy";
|
|
group = "caddy";
|
|
};
|
|
|
|
# ddns-updater config.json with Njalla provider credentials
|
|
ddns-updater-config = {
|
|
file = ../secrets/server/ddns-updater-config.age;
|
|
mode = "0400";
|
|
owner = "ddns-updater";
|
|
group = "ddns-updater";
|
|
};
|
|
|
|
jellyfin-api-key = {
|
|
file = ../secrets/server/jellyfin-api-key.age;
|
|
mode = "0400";
|
|
owner = "root";
|
|
group = "root";
|
|
};
|
|
|
|
slskd_env = {
|
|
file = ../secrets/server/slskd_env.age;
|
|
mode = "0500";
|
|
owner = config.services.slskd.user;
|
|
group = config.services.slskd.group;
|
|
};
|
|
|
|
# Network configuration
|
|
wg0-conf = {
|
|
file = ../secrets/server/wg0.conf.age;
|
|
mode = "0400";
|
|
owner = "root";
|
|
group = "root";
|
|
};
|
|
|
|
# ntfy-alerts secrets (group-readable for CI runner notifications)
|
|
ntfy-alerts-topic = {
|
|
file = ../secrets/server/ntfy-alerts-topic.age;
|
|
mode = "0440";
|
|
owner = "root";
|
|
group = "gitea-runner";
|
|
};
|
|
|
|
ntfy-alerts-token = {
|
|
file = ../secrets/server/ntfy-alerts-token.age;
|
|
mode = "0440";
|
|
owner = "root";
|
|
group = "gitea-runner";
|
|
};
|
|
|
|
# Firefox Sync server secrets (SYNC_MASTER_SECRET)
|
|
firefox-syncserver-env = {
|
|
file = ../secrets/server/firefox-syncserver-env.age;
|
|
mode = "0400";
|
|
};
|
|
|
|
# MollySocket env (MOLLY_VAPID_PRIVKEY + MOLLY_ALLOWED_UUIDS)
|
|
mollysocket-env = {
|
|
file = ../secrets/server/mollysocket-env.age;
|
|
mode = "0400";
|
|
};
|
|
|
|
# Murmur (Mumble) server password
|
|
murmur-password-env = {
|
|
file = ../secrets/server/murmur-password-env.age;
|
|
mode = "0400";
|
|
owner = "murmur";
|
|
group = "murmur";
|
|
};
|
|
|
|
# Coturn static auth secret
|
|
coturn-auth-secret = {
|
|
file = ../secrets/server/coturn-auth-secret.age;
|
|
mode = "0400";
|
|
owner = "turnserver";
|
|
group = "turnserver";
|
|
};
|
|
|
|
# Matrix (continuwuity) registration token
|
|
matrix-reg-token = {
|
|
file = ../secrets/server/matrix-reg-token.age;
|
|
mode = "0400";
|
|
owner = "continuwuity";
|
|
group = "continuwuity";
|
|
};
|
|
|
|
# Matrix (continuwuity) TURN secret — same secret as coturn-auth-secret,
|
|
# decrypted separately so continuwuity can read it with its own ownership
|
|
matrix-turn-secret = {
|
|
file = ../secrets/server/coturn-auth-secret.age;
|
|
mode = "0400";
|
|
owner = "continuwuity";
|
|
group = "continuwuity";
|
|
};
|
|
|
|
# CI deploy SSH key
|
|
ci-deploy-key = {
|
|
file = ../secrets/server/ci-deploy-key.age;
|
|
mode = "0400";
|
|
owner = "gitea-runner";
|
|
group = "gitea-runner";
|
|
};
|
|
|
|
# Git-crypt symmetric key for dotfiles repo
|
|
git-crypt-key-dotfiles = {
|
|
file = ../secrets/server/git-crypt-key-dotfiles.age;
|
|
mode = "0400";
|
|
owner = "gitea-runner";
|
|
group = "gitea-runner";
|
|
};
|
|
|
|
# Git-crypt symmetric key for server-config repo
|
|
git-crypt-key-server-config = {
|
|
file = ../secrets/server/git-crypt-key-server-config.age;
|
|
mode = "0400";
|
|
owner = "gitea-runner";
|
|
group = "gitea-runner";
|
|
};
|
|
|
|
# Gitea Actions runner registration token
|
|
gitea-runner-token = {
|
|
file = ../secrets/server/gitea-runner-token.age;
|
|
mode = "0400";
|
|
owner = "gitea-runner";
|
|
group = "gitea-runner";
|
|
};
|
|
|
|
# llama-cpp API key for bearer token auth
|
|
llama-cpp-api-key = {
|
|
file = ../secrets/server/llama-cpp-api-key.age;
|
|
mode = "0400";
|
|
owner = "root";
|
|
group = "root";
|
|
};
|
|
|
|
# Harmonia binary cache signing key
|
|
harmonia-sign-key = {
|
|
file = ../secrets/server/harmonia-sign-key.age;
|
|
mode = "0400";
|
|
owner = "harmonia";
|
|
group = "harmonia";
|
|
};
|
|
|
|
# Caddy basic auth for nix binary cache (separate from main caddy_auth)
|
|
nix-cache-auth = {
|
|
file = ../secrets/server/nix-cache-auth.age;
|
|
mode = "0400";
|
|
owner = "caddy";
|
|
group = "caddy";
|
|
};
|
|
};
|
|
}
|