File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff 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 ] ;
Original file line number Diff line number Diff line change 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 = {
Original file line number Diff line number Diff line change 77} :
88let
99 inherit ( lib . attrsets )
10- mapAttrs
1110 mapAttrs'
1211 nameValuePair
1312 ;
2221 ) cond ;
2322in
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 :
Original file line number Diff line number Diff line change 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 = {
Original file line number Diff line number Diff line change 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 } = {
Original file line number Diff line number Diff line change 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 } ;
Original file line number Diff line number Diff line change 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
912 ./ollama.nix
1013 ./podman-socket-proxy.nix
1114 ./radicale.nix
12- ./secrets-loader.nix
1315 ./syncthing.nix
1416 ./vaultwarden.nix
1517 ./wud.nix
Original file line number Diff line number Diff line change 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" ;
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"
Load diff This file was deleted.
Original file line number Diff line number Diff line change 77} :
88let
99 inherit ( config' . containers . backup )
10- pwdFile
1110 blacklistedContainers
1211 blacklistedPaths
1312 location
5756 ) config . programs . quadlets . finalQuadlets ;
5857in
5958{
60- age . secrets . containers-backup-pwd . file = ./. + "../../../../../Config/${ pwdFile } .age" ;
61-
6259 services . restic = {
6360 enable = true ;
6461 backups . containers = {
You can’t perform that action at this time.
0 commit comments