From d5337709c63b6bfc26f369647ad9073a1285c14d Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 30 Nov 2024 13:31:01 +0000 Subject: [PATCH 1/5] fixup! WIP: even more directories? Maybe? --- modules/nixos/system/persist/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/system/persist/default.nix b/modules/nixos/system/persist/default.nix index 2e7bb07..6e58502 100644 --- a/modules/nixos/system/persist/default.nix +++ b/modules/nixos/system/persist/default.nix @@ -58,7 +58,7 @@ in "/var/log" # Logs "/var/lib/nixos" # UID/GID maps "/var/lib/systemd/coredump" # Coredumps - + "/var/lib/systemd/coredump" "/var/lib/systemd" # FIXME: needed? "/var/spool" # FIXME: needed? "/var/tmp" # FIXME: needed? From b23cd9e891dd4165828408348daeef35c4a2053d Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 30 Nov 2024 13:31:01 +0000 Subject: [PATCH 2/5] fixup! WIP: nixos: system: add persist --- modules/nixos/system/persist/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/nixos/system/persist/default.nix b/modules/nixos/system/persist/default.nix index 6e58502..0a4f036 100644 --- a/modules/nixos/system/persist/default.nix +++ b/modules/nixos/system/persist/default.nix @@ -47,8 +47,9 @@ in config = lib.mkIf cfg.enable { environment.persistence."${cfg.mountPoint}" = { files = [ - "/etc/machine-id" # Machine-specific ID - "/etc/adjtime" # Clock drift factor and offsets + "/etc/machine-id" + "/etc/adjtime" + "/var/lib/systemd/timesync/clock" ] ++ lib.unique cfg.files ; From d31e8a35b731ca7be1123f8253d04d41cde8c13b Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 30 Nov 2024 13:31:01 +0000 Subject: [PATCH 3/5] fixup! WIP: nixos: system: add persist --- modules/nixos/system/persist/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/system/persist/default.nix b/modules/nixos/system/persist/default.nix index 0a4f036..4f1fc4a 100644 --- a/modules/nixos/system/persist/default.nix +++ b/modules/nixos/system/persist/default.nix @@ -56,7 +56,7 @@ in directories = [ "/etc/nixos" # In case it's storage directory of our configuration - "/var/log" # Logs + "/var/log" "/var/lib/nixos" # UID/GID maps "/var/lib/systemd/coredump" # Coredumps "/var/lib/systemd/coredump" From 3ebd6f47a322a7582ac16386fc839da69e8505d0 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Wed, 4 Dec 2024 19:59:09 +0000 Subject: [PATCH 4/5] fixup! fixup! WIP: even more directories? Maybe? --- modules/nixos/system/persist/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/nixos/system/persist/default.nix b/modules/nixos/system/persist/default.nix index 4f1fc4a..f7178c2 100644 --- a/modules/nixos/system/persist/default.nix +++ b/modules/nixos/system/persist/default.nix @@ -58,7 +58,6 @@ in "/etc/nixos" # In case it's storage directory of our configuration "/var/log" "/var/lib/nixos" # UID/GID maps - "/var/lib/systemd/coredump" # Coredumps "/var/lib/systemd/coredump" "/var/lib/systemd" # FIXME: needed? "/var/spool" # FIXME: needed? From 0a8b2b8e5500501e9efb38122ccaf8e146a7a548 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Wed, 4 Dec 2024 19:59:09 +0000 Subject: [PATCH 5/5] fixup! fixup! WIP: even more directories? Maybe? --- modules/nixos/system/persist/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/system/persist/default.nix b/modules/nixos/system/persist/default.nix index f7178c2..ac1820e 100644 --- a/modules/nixos/system/persist/default.nix +++ b/modules/nixos/system/persist/default.nix @@ -59,6 +59,7 @@ in "/var/log" "/var/lib/nixos" # UID/GID maps "/var/lib/systemd/coredump" + "/var/lib/systemd" # FIXME: needed? "/var/spool" # FIXME: needed? "/var/tmp" # FIXME: needed?