Skip to content

Commit 16e2efb

Browse files
committed
feat: switch over secret consumers to central secret loading
Signed-off-by: Reputable2722 <153411261+Reputable2772@users.noreply.github.com>
1 parent 55d7272 commit 16e2efb

13 files changed

Lines changed: 10 additions & 72 deletions

File tree

Config/config.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,10 @@ rec {
383383
"important-files.age".publicKeys = [ users.wickedwizard.secrets.encryption.key ];
384384

385385
# Rclone config file
386-
"rclone.age".publicKeys = [ users.wickedwizard.secrets.encryption.key ];
386+
"rclone.age" = {
387+
publicKeys = [ users.wickedwizard.secrets.encryption.key ];
388+
dontLoad = true;
389+
};
387390

388391
# Container files
389392
"containers-backup-pwd.age".publicKeys = [ users.wickedwizard.secrets.encryption.key ];

System/HP-Laptop/users.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
...
99
}:
1010
{
11-
age.secrets.selfhostedPassword.file = ../../Config/selfhostedPassword.age;
12-
age.secrets.rootPassword.file = ../../Config/rootPassword.age;
13-
age.secrets.guestPassword.file = ../../Config/guestPassword.age;
14-
1511
users.mutableUsers = false;
1612
users.users.root.hashedPasswordFile = config.age.secrets.rootPassword.path;
1713
users.users.selfhosted = {

System/Lenovo-Laptop/Misc/bitlocker.nix

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
}:
88
let
99
inherit (lib.attrsets)
10-
mapAttrs
1110
mapAttrs'
1211
nameValuePair
1312
;
@@ -22,12 +21,6 @@ let
2221
) cond;
2322
in
2423
{
25-
age.secrets = onlyIf (
26-
mapAttrs (n: v: {
27-
file = ./. + "../../../../Config/${n}.age";
28-
}) config'.system.${config.networking.hostName}.mounts.bitlocker
29-
);
30-
3124
systemd.services = onlyIf (
3225
mapAttrs' (
3326
n: v:

System/Lenovo-Laptop/users.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
# Shell autocomplete for HM's ZSH.
1515
environment.pathsToLink = [ "/share/zsh" ];
1616

17-
age.secrets.wickedwizardPassword.file = ../../Config/wickedwizardPassword.age;
18-
age.secrets.rootPassword.file = ../../Config/rootPassword.age;
19-
age.secrets.guestPassword.file = ../../Config/guestPassword.age;
20-
2117
users.mutableUsers = false;
2218
users.users.root.hashedPasswordFile = config.age.secrets.rootPassword.path;
2319
users.users.wickedwizard = {

Users/WickedWizard/Programs/Backup/backup.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ in
2020
};
2121

2222
config = {
23-
age.secrets."${config.home.username}-backup".file = ../../../../Config/wickedwizard-backup.age;
24-
2523
services.restic = {
2624
enable = true;
2725
backups.${config.home.username} = {

Users/WickedWizard/Programs/Backup/rclone.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
lib.optionalAttrs (config'.secrets ? rcloneAgeFile && config'.secrets.rcloneAgeFile != null)
1313
{
1414
rclone = {
15-
file = ./. + "../../../../../Config/${config'.secrets.rcloneAgeFile}.age";
15+
file = ./. + "../../../../../Config/Secrets/${config'.secrets.rcloneAgeFile}.age";
1616
path = "${config.xdg.configHome}/rclone/rclone.conf";
1717
};
1818
};

Users/WickedWizard/Programs/Selfhosted/Containers/default.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
{
1+
{ config', lib, ... }: {
2+
programs.quadlets.enable =
3+
config'.dir ? containers && lib.strings.typeOf config'.dir.containers == "string";
4+
25
imports = [
36
# ./baikal.nix
47
./caddy.nix
@@ -9,7 +12,6 @@
912
./ollama.nix
1013
./podman-socket-proxy.nix
1114
./radicale.nix
12-
./secrets-loader.nix
1315
./syncthing.nix
1416
./vaultwarden.nix
1517
./wud.nix

Users/WickedWizard/Programs/Selfhosted/Containers/radicale.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ in
6363
{
6464
containers.caddy.services.radicale = "radicale:5232";
6565

66-
# Mounted directly as a file, not an environment variable.
67-
age.secrets.radicale.file = ../../../../../Config/radicale.age;
68-
6966
programs.quadlets.quadlets."radicale.container" = {
7067
Container = {
7168
Image = "docker.io/tomsquest/docker-radicale";
@@ -95,6 +92,7 @@ in
9592
Volume = [
9693
"data:/data"
9794
"${pkgs.writeText "radicale-config" radicaleConfig}:/config/config:ro:noMap"
95+
# Mounted directly as a file, not an environment variable.
9896
"${config.age.secrets.radicale.path}:${userFilePath}:noMap"
9997
"${birthdayHookShFile}:${birthdayHookSh}:noMap"
10098
"${sources.radicale_birthday_hook.src}${birthdayHook}:${birthdayHook}:noMap"

Users/WickedWizard/Programs/Selfhosted/Containers/secrets-loader.nix

Lines changed: 0 additions & 18 deletions
This file was deleted.

Users/WickedWizard/Programs/Selfhosted/backup.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
}:
88
let
99
inherit (config'.containers.backup)
10-
pwdFile
1110
blacklistedContainers
1211
blacklistedPaths
1312
location
@@ -57,8 +56,6 @@ let
5756
) config.programs.quadlets.finalQuadlets;
5857
in
5958
{
60-
age.secrets.containers-backup-pwd.file = ./. + "../../../../../Config/${pwdFile}.age";
61-
6259
services.restic = {
6360
enable = true;
6461
backups.containers = {

0 commit comments

Comments
 (0)