Update aqua (#252)

* fix: Grafana's secret key doesn't have a default value anymore

flake.lock: Update

Flake lock file updates:

• Updated input 'mysecrets':
    'git+ssh://git@github.com/ryan4yin/nix-secrets.git?ref=refs/heads/main&rev=cfe34c222cf7ee4290438c97e6cc734aa7792346&shallow=1' (2025-12-18)
  → 'git+ssh://git@github.com/ryan4yin/nix-secrets.git?ref=refs/heads/main&rev=86de5313787257806723f03dccabd52bb7501ff3&shallow=1' (2026-03-18)

* fix: gitea sendmail path

* fix: transmission_4
This commit is contained in:
Ryan Yin
2026-03-19 01:02:42 +08:00
committed by GitHub
parent 4b5a7b1be7
commit ce99c3e2d3
5 changed files with 12 additions and 4 deletions

6
flake.lock generated
View File

@@ -583,10 +583,10 @@
"mysecrets": { "mysecrets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1766070008, "lastModified": 1773850740,
"narHash": "sha256-DU5ATFeUY5S5Z1ZZAkJLwqDCJXRk15qMp/nLP3Tmoew=", "narHash": "sha256-izDf+wgii0KGAfNZ3/RFt2HJgUY/s+u8qKyKvNi0uGc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "cfe34c222cf7ee4290438c97e6cc734aa7792346", "rev": "86de5313787257806723f03dccabd52bb7501ff3",
"shallow": true, "shallow": true,
"type": "git", "type": "git",
"url": "ssh://git@github.com/ryan4yin/nix-secrets.git" "url": "ssh://git@github.com/ryan4yin/nix-secrets.git"

View File

@@ -49,7 +49,7 @@
ENABLED = true; ENABLED = true;
MAILER_TYPE = "sendmail"; MAILER_TYPE = "sendmail";
FROM = "do-not-reply@writefor.fun"; FROM = "do-not-reply@writefor.fun";
SENDMAIL_PATH = "${pkgs.stdenv.hostPlatform.system-sendmail}/bin/sendmail"; SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail";
}; };
other = { other = {
SHOW_FOOTER_VERSION = false; SHOW_FOOTER_VERSION = false;

View File

@@ -39,6 +39,7 @@
# Use file provider to read the admin password from a file. # Use file provider to read the admin password from a file.
# https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#file-provider # https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#file-provider
admin_password = "$__file{${config.age.secrets."grafana-admin-password".path}}"; admin_password = "$__file{${config.age.secrets."grafana-admin-password".path}}";
secret_key = "$__file{${config.age.secrets."grafana-secret-key".path}}";
}; };
users = { users = {
allow_sign_up = false; allow_sign_up = false;

View File

@@ -1,6 +1,7 @@
{ {
config, config,
myvars, myvars,
pkgs,
... ...
}: }:
let let
@@ -13,6 +14,7 @@ in
# https://wiki.archlinux.org/title/transmission # https://wiki.archlinux.org/title/transmission
services.transmission = { services.transmission = {
enable = true; enable = true;
package = pkgs.transmission_4;
user = name; user = name;
group = name; group = name;
home = dataDir; home = dataDir;

View File

@@ -203,6 +203,11 @@ in
mode = "0400"; mode = "0400";
owner = "grafana"; owner = "grafana";
}; };
"grafana-secret-key" = {
file = "${mysecrets}/server/grafana-secret-key.age";
mode = "0400";
owner = "grafana";
};
"alertmanager.env" = { "alertmanager.env" = {
file = "${mysecrets}/server/alertmanager.env.age"; file = "${mysecrets}/server/alertmanager.env.age";