diff --git a/flake.lock b/flake.lock index 5983c087..94e9c2d3 100644 --- a/flake.lock +++ b/flake.lock @@ -583,10 +583,10 @@ "mysecrets": { "flake": false, "locked": { - "lastModified": 1766070008, - "narHash": "sha256-DU5ATFeUY5S5Z1ZZAkJLwqDCJXRk15qMp/nLP3Tmoew=", + "lastModified": 1773850740, + "narHash": "sha256-izDf+wgii0KGAfNZ3/RFt2HJgUY/s+u8qKyKvNi0uGc=", "ref": "refs/heads/main", - "rev": "cfe34c222cf7ee4290438c97e6cc734aa7792346", + "rev": "86de5313787257806723f03dccabd52bb7501ff3", "shallow": true, "type": "git", "url": "ssh://git@github.com/ryan4yin/nix-secrets.git" diff --git a/hosts/idols-aquamarine/gitea.nix b/hosts/idols-aquamarine/gitea.nix index 39bcc365..3101c306 100644 --- a/hosts/idols-aquamarine/gitea.nix +++ b/hosts/idols-aquamarine/gitea.nix @@ -49,7 +49,7 @@ ENABLED = true; MAILER_TYPE = "sendmail"; FROM = "do-not-reply@writefor.fun"; - SENDMAIL_PATH = "${pkgs.stdenv.hostPlatform.system-sendmail}/bin/sendmail"; + SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; }; other = { SHOW_FOOTER_VERSION = false; diff --git a/hosts/idols-aquamarine/grafana/default.nix b/hosts/idols-aquamarine/grafana/default.nix index f869c8f8..df5c0ec4 100644 --- a/hosts/idols-aquamarine/grafana/default.nix +++ b/hosts/idols-aquamarine/grafana/default.nix @@ -39,6 +39,7 @@ # Use file provider to read the admin password from a file. # https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#file-provider admin_password = "$__file{${config.age.secrets."grafana-admin-password".path}}"; + secret_key = "$__file{${config.age.secrets."grafana-secret-key".path}}"; }; users = { allow_sign_up = false; diff --git a/hosts/idols-aquamarine/transmission.nix b/hosts/idols-aquamarine/transmission.nix index d1b36613..f8897709 100644 --- a/hosts/idols-aquamarine/transmission.nix +++ b/hosts/idols-aquamarine/transmission.nix @@ -1,6 +1,7 @@ { config, myvars, + pkgs, ... }: let @@ -13,6 +14,7 @@ in # https://wiki.archlinux.org/title/transmission services.transmission = { enable = true; + package = pkgs.transmission_4; user = name; group = name; home = dataDir; diff --git a/secrets/nixos.nix b/secrets/nixos.nix index 71e90698..305ee11a 100644 --- a/secrets/nixos.nix +++ b/secrets/nixos.nix @@ -203,6 +203,11 @@ in mode = "0400"; owner = "grafana"; }; + "grafana-secret-key" = { + file = "${mysecrets}/server/grafana-secret-key.age"; + mode = "0400"; + owner = "grafana"; + }; "alertmanager.env" = { file = "${mysecrets}/server/alertmanager.env.age";