From f72a6da0132b370a6d84db2c91e53e3a8857cc37 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Sun, 26 Oct 2025 14:24:18 -0500
Subject: [PATCH] feat: fixed actual install

---
 modules/nixos-modules/server/actual/actual.nix     | 14 +++++++++-----
 modules/nixos-modules/server/actual/const.nix      |  2 +-
 .../nixos-modules/server/actual/impermanence.nix   | 10 ++++++++--
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/modules/nixos-modules/server/actual/actual.nix b/modules/nixos-modules/server/actual/actual.nix
index 96ea586..4cca449 100644
--- a/modules/nixos-modules/server/actual/actual.nix
+++ b/modules/nixos-modules/server/actual/actual.nix
@@ -6,14 +6,18 @@
   const = import ./const.nix;
   dataDirectory = const.dataDirectory;
 in {
+  options.services.actual = {
+    port = lib.mkOption {
+      type = lib.types.port;
+      description = "The port to listen on";
+      default = 5006;
+    };
+  };
   config = lib.mkIf config.services.actual.enable {
-    systemd.tmpfiles.rules = [
-      "d ${dataDirectory} 2770 actual actual"
-    ];
-
     services.actual = {
       settings = {
-        ACTUAL_DATA_DIR = dataDirectory;
+        port = config.services.actual.port;
+        dataDir = dataDirectory;
       };
     };
   };
diff --git a/modules/nixos-modules/server/actual/const.nix b/modules/nixos-modules/server/actual/const.nix
index 13b068e..14b715e 100644
--- a/modules/nixos-modules/server/actual/const.nix
+++ b/modules/nixos-modules/server/actual/const.nix
@@ -1,3 +1,3 @@
 {
-  dataDirectory = "/var/lib/actual/";
+  dataDirectory = "/var/lib/private/actual";
 }
diff --git a/modules/nixos-modules/server/actual/impermanence.nix b/modules/nixos-modules/server/actual/impermanence.nix
index 5a2bb6c..f203178 100644
--- a/modules/nixos-modules/server/actual/impermanence.nix
+++ b/modules/nixos-modules/server/actual/impermanence.nix
@@ -5,6 +5,8 @@
 }: let
   const = import ./const.nix;
   dataDirectory = const.dataDirectory;
+  # Strip /private from dataDirectory for assertion check (systemd DynamicUser adds /private automatically)
+  configDataDirectory = lib.strings.replaceStrings ["/var/lib/private"] ["/var/lib"] dataDirectory;
 in {
   options.services.actual = {
     impermanence.enable = lib.mkOption {
@@ -16,8 +18,12 @@ in {
   config = lib.mkIf config.services.actual.impermanence.enable {
     assertions = [
       {
-        assertion = config.services.actual.settings.ACTUAL_DATA_DIR == dataDirectory;
-        message = "actual data location does not match persistence";
+        assertion = config.services.actual.settings.dataDir == dataDirectory;
+        message = "actual data location does not match persistence\nconfig directory: ${config.services.actual.settings.dataDir}\npersistence directory: ${dataDirectory}";
+      }
+      {
+        assertion = config.systemd.services.actual.serviceConfig.DynamicUser or false;
+        message = "actual systemd service must have DynamicUser enabled to use private directory";
       }
     ];
     environment.persistence."/persist/system/root" = {