diff --git a/flake-parts/install-anywhere.nix b/flake-parts/install-anywhere.nix index e95c048..8030b1e 100644 --- a/flake-parts/install-anywhere.nix +++ b/flake-parts/install-anywhere.nix @@ -23,7 +23,7 @@ _: { destination="$2" root="/tmp/anywhere/$host" - impermanence="$(nix eval ".#nixosConfigurations.$host.config.custom.impermanence.enable")" + impermanence="$(nix eval ".#nixosConfigurations.$host.config.custom.persistence.enable")" if [ "$impermanence" = true ]; then ssh_dir="$root/persist/etc/ssh" else diff --git a/hosts/srv-public/default.nix b/hosts/srv-public/default.nix index 7b6de63..125a3c0 100644 --- a/hosts/srv-public/default.nix +++ b/hosts/srv-public/default.nix @@ -14,7 +14,7 @@ }; custom = { - impermanence.enable = true; + persistence.enable = true; sops = { enable = true; diff --git a/hosts/vps-monitor/default.nix b/hosts/vps-monitor/default.nix index c5cfbbe..4a9d065 100644 --- a/hosts/vps-monitor/default.nix +++ b/hosts/vps-monitor/default.nix @@ -14,7 +14,7 @@ }; custom = { - impermanence.enable = true; + persistence.enable = true; sops = { enable = true; diff --git a/hosts/vps-private/default.nix b/hosts/vps-private/default.nix index 32604b5..0e267d5 100644 --- a/hosts/vps-private/default.nix +++ b/hosts/vps-private/default.nix @@ -14,7 +14,7 @@ }; custom = { - impermanence.enable = true; + persistence.enable = true; sops = { enable = true; diff --git a/modules/system/impermanence.nix b/modules/system/persistence.nix similarity index 79% rename from modules/system/impermanence.nix rename to modules/system/persistence.nix index 83e4438..594d58b 100644 --- a/modules/system/impermanence.nix +++ b/modules/system/persistence.nix @@ -5,14 +5,14 @@ ... }: let - cfg = config.custom.impermanence; + cfg = config.custom.persistence; in { imports = [ inputs.impermanence.nixosModules.impermanence ]; - options.custom = { - impermanence.enable = lib.mkEnableOption ""; - persist.directories = lib.mkOption { + options.custom.persistence = { + enable = lib.mkEnableOption ""; + directories = lib.mkOption { type = lib.types.listOf lib.types.path; default = [ ]; }; @@ -32,7 +32,7 @@ in "/var/lib/systemd" "/var/log" ] - ++ config.custom.persist.directories; + ++ config.custom.persistence.directories; files = [ "/etc/machine-id" diff --git a/modules/system/services/caddy.nix b/modules/system/services/caddy.nix index fefac9e..3413301 100644 --- a/modules/system/services/caddy.nix +++ b/modules/system/services/caddy.nix @@ -95,7 +95,7 @@ in virtualHosts = virtualHosts |> lib.map mkVirtualHost |> lib.listToAttrs; }; - custom.persist.directories = [ "/var/lib/caddy" ]; + custom.persistence.directories = [ "/var/lib/caddy" ]; } (lib.mkIf publicHostsExist { diff --git a/modules/system/services/crowdsec/default.nix b/modules/system/services/crowdsec/default.nix index 18a110d..63461ec 100644 --- a/modules/system/services/crowdsec/default.nix +++ b/modules/system/services/crowdsec/default.nix @@ -114,6 +114,6 @@ in lib.mkAfter collectionsScript; }; - custom.persist.directories = [ "/var/lib/crowdsec" ]; + custom.persistence.directories = [ "/var/lib/crowdsec" ]; }; } diff --git a/modules/system/services/syncthing.nix b/modules/system/services/syncthing.nix index 0d257aa..c859fd2 100644 --- a/modules/system/services/syncthing.nix +++ b/modules/system/services/syncthing.nix @@ -142,7 +142,7 @@ in }; }; - persist.directories = [ dataDir ]; + persistence.directories = [ dataDir ]; }; }; } diff --git a/modules/system/services/tailscale.nix b/modules/system/services/tailscale.nix index deaf3aa..28fc6e1 100644 --- a/modules/system/services/tailscale.nix +++ b/modules/system/services/tailscale.nix @@ -34,6 +34,6 @@ in systemd.services.tailscaled-set.after = [ "tailscaled-autoconnect.service" ]; - custom.persist.directories = [ "/var/lib/tailscale" ]; + custom.persistence.directories = [ "/var/lib/tailscale" ]; }; } diff --git a/modules/system/sops.nix b/modules/system/sops.nix index 0975fe7..9234d42 100644 --- a/modules/system/sops.nix +++ b/modules/system/sops.nix @@ -32,7 +32,7 @@ in config = lib.mkIf cfg.enable { sops = { age.sshKeyPaths = [ - "${lib.optionalString config.custom.impermanence.enable "/persist"}/etc/ssh/ssh_host_ed25519_key" + "${lib.optionalString config.custom.persistence.enable "/persist"}/etc/ssh/ssh_host_ed25519_key" ]; defaultSopsFile = absoluteSecretsPath; }; diff --git a/modules/system/web-services/actualbudget.nix b/modules/system/web-services/actualbudget.nix index 1beec10..8cf0ff7 100644 --- a/modules/system/web-services/actualbudget.nix +++ b/modules/system/web-services/actualbudget.nix @@ -56,7 +56,7 @@ in }; }; - persist.directories = [ dataDir ]; + persistence.directories = [ dataDir ]; }; }; } diff --git a/modules/system/web-services/filebrowser.nix b/modules/system/web-services/filebrowser.nix index 4f01c0b..e808d1b 100644 --- a/modules/system/web-services/filebrowser.nix +++ b/modules/system/web-services/filebrowser.nix @@ -62,7 +62,7 @@ in }; }; - persist.directories = [ dataDir ]; + persistence.directories = [ dataDir ]; }; }; } diff --git a/modules/system/web-services/forgejo/default.nix b/modules/system/web-services/forgejo/default.nix index bc3007c..6424459 100644 --- a/modules/system/web-services/forgejo/default.nix +++ b/modules/system/web-services/forgejo/default.nix @@ -128,7 +128,7 @@ in }; }; - persist.directories = [ config.services.forgejo.stateDir ]; + persistence.directories = [ config.services.forgejo.stateDir ]; }; }; } diff --git a/modules/system/web-services/freshrss.nix b/modules/system/web-services/freshrss.nix index 8401a8f..58d0dfc 100644 --- a/modules/system/web-services/freshrss.nix +++ b/modules/system/web-services/freshrss.nix @@ -53,7 +53,7 @@ in }; }; - persist.directories = [ dataDir ]; + persistence.directories = [ dataDir ]; }; }; } diff --git a/modules/system/web-services/gatus.nix b/modules/system/web-services/gatus.nix index b62ab79..efe9c0b 100644 --- a/modules/system/web-services/gatus.nix +++ b/modules/system/web-services/gatus.nix @@ -211,7 +211,7 @@ in caddy.virtualHosts.${cfg.domain}.port = cfg.port; }; - persist.directories = [ dataDir ]; + persistence.directories = [ dataDir ]; }; }; } diff --git a/modules/system/web-services/memos.nix b/modules/system/web-services/memos.nix index 375d783..0599cea 100644 --- a/modules/system/web-services/memos.nix +++ b/modules/system/web-services/memos.nix @@ -64,7 +64,7 @@ in }; }; - persist.directories = [ dataDir ]; + persistence.directories = [ dataDir ]; }; }; } diff --git a/modules/system/web-services/outline.nix b/modules/system/web-services/outline.nix index b3384ec..7620ec3 100644 --- a/modules/system/web-services/outline.nix +++ b/modules/system/web-services/outline.nix @@ -86,7 +86,7 @@ in }; }; - persist.directories = [ + persistence.directories = [ dataDir config.services.postgresql.dataDir ]; diff --git a/modules/system/web-services/radicale.nix b/modules/system/web-services/radicale.nix index 0503fd1..4c81d31 100644 --- a/modules/system/web-services/radicale.nix +++ b/modules/system/web-services/radicale.nix @@ -116,7 +116,7 @@ in }; }; - persist.directories = [ dataDir ]; + persistence.directories = [ dataDir ]; }; }; } diff --git a/modules/system/web-services/uptime-kuma.nix b/modules/system/web-services/uptime-kuma.nix index 1ba80d7..01f008b 100644 --- a/modules/system/web-services/uptime-kuma.nix +++ b/modules/system/web-services/uptime-kuma.nix @@ -29,7 +29,7 @@ in custom = { services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; - persist.directories = [ config.services.uptime-kuma.settings.DATA_DIR ]; + persistence.directories = [ config.services.uptime-kuma.settings.DATA_DIR ]; }; }; } diff --git a/modules/system/web-services/victorialogs.nix b/modules/system/web-services/victorialogs.nix index 5770e44..31218c6 100644 --- a/modules/system/web-services/victorialogs.nix +++ b/modules/system/web-services/victorialogs.nix @@ -60,7 +60,7 @@ in custom = { services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; - persist.directories = [ "/var/lib/${config.services.victorialogs.stateDir}" ]; + persistence.directories = [ "/var/lib/${config.services.victorialogs.stateDir}" ]; }; }; } diff --git a/modules/system/web-services/victoriametrics.nix b/modules/system/web-services/victoriametrics.nix index 8e4e775..a1dd560 100644 --- a/modules/system/web-services/victoriametrics.nix +++ b/modules/system/web-services/victoriametrics.nix @@ -65,7 +65,7 @@ in custom = { services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; - persist.directories = [ "/var/lib/${config.services.victoriametrics.stateDir}" ]; + persistence.directories = [ "/var/lib/${config.services.victoriametrics.stateDir}" ]; }; }; }