From 4a9ae3a45fdef7427da6648de2bd20e0cd5f1359 Mon Sep 17 00:00:00 2001
From: DavHau <d.hauer.it@gmail.com>
Date: Wed, 8 Jan 2025 11:55:12 +0700
Subject: [PATCH] vars: rename `createFile` -> persist

---
 clanModules/dyndns/default.nix           | 2 +-
 clanModules/wifi/roles/default.nix       | 4 ++--
 nixosModules/clanCore/vars/generator.nix | 2 +-
 nixosModules/clanCore/vars/interface.nix | 5 ++++-
 pkgs/clan-cli/clan_cli/vars/prompt.py    | 2 +-
 pkgs/clan-cli/tests/test_vars.py         | 6 +++---
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/clanModules/dyndns/default.nix b/clanModules/dyndns/default.nix
index a6859249d..3d686dd7a 100644
--- a/clanModules/dyndns/default.nix
+++ b/clanModules/dyndns/default.nix
@@ -52,7 +52,7 @@ let
       migrateFact = "${secret_id opt}";
       prompts.${secret_id opt} = {
         type = "hidden";
-        createFile = true;
+        persist = true;
       };
     };
   };
diff --git a/clanModules/wifi/roles/default.nix b/clanModules/wifi/roles/default.nix
index ff03cc64c..f0608c059 100644
--- a/clanModules/wifi/roles/default.nix
+++ b/clanModules/wifi/roles/default.nix
@@ -14,9 +14,9 @@ let
     name = "iwd.${name}";
     value = {
       prompts.ssid.type = "line";
-      prompts.ssid.createFile = true;
+      prompts.ssid.persist = true;
       prompts.password.type = "hidden";
-      prompts.password.createFile = true;
+      prompts.password.persist = true;
       share = true;
     };
   };
diff --git a/nixosModules/clanCore/vars/generator.nix b/nixosModules/clanCore/vars/generator.nix
index c3ee1033a..aae8dc22f 100644
--- a/nixosModules/clanCore/vars/generator.nix
+++ b/nixosModules/clanCore/vars/generator.nix
@@ -21,7 +21,7 @@ let
 
   promptsToFilesScript = concatMapStrings promptToFile;
 
-  filePromptNames = attrNames (filterAttrs (_name: prompt: prompt.createFile) config.prompts);
+  filePromptNames = attrNames (filterAttrs (_name: prompt: prompt.persist) config.prompts);
 in
 {
   finalScript = mkOptionDefault (
diff --git a/nixosModules/clanCore/vars/interface.nix b/nixosModules/clanCore/vars/interface.nix
index 27208e308..20c743ce9 100644
--- a/nixosModules/clanCore/vars/interface.nix
+++ b/nixosModules/clanCore/vars/interface.nix
@@ -253,6 +253,9 @@ in
               default = { };
               type = attrsOf (
                 submodule (prompt: {
+                  imports = [
+                    (lib.mkRenamedOptionModule [ "createFile" ] [ "persist" ])
+                  ];
                   options = {
                     name = lib.mkOption {
                       description = ''
@@ -263,7 +266,7 @@ in
                       default = prompt.config._module.args.name;
                       defaultText = "Name of the prompt";
                     };
-                    createFile = lib.mkOption {
+                    persist = lib.mkOption {
                       description = ''
                         Whether the prompted value should be stored in a file with the same name as the prompt.
 
diff --git a/pkgs/clan-cli/clan_cli/vars/prompt.py b/pkgs/clan-cli/clan_cli/vars/prompt.py
index bc4bba156..0278a6ba4 100644
--- a/pkgs/clan-cli/clan_cli/vars/prompt.py
+++ b/pkgs/clan-cli/clan_cli/vars/prompt.py
@@ -32,7 +32,7 @@ class Prompt:
             name=data["name"],
             description=data["description"],
             prompt_type=PromptType(data["type"]),
-            create_file=data["createFile"],
+            create_file=data.get("persist", data["createFile"]),
             previous_value=data.get("previousValue"),
         )
 
diff --git a/pkgs/clan-cli/tests/test_vars.py b/pkgs/clan-cli/tests/test_vars.py
index 57273390b..1720b606b 100644
--- a/pkgs/clan-cli/tests/test_vars.py
+++ b/pkgs/clan-cli/tests/test_vars.py
@@ -477,14 +477,14 @@ def test_prompt(
     my_generator["files"]["multiline_value"]["secret"] = False
 
     my_generator["prompts"]["prompt1"]["description"] = "dream2nix"
-    my_generator["prompts"]["prompt1"]["createFile"] = False
+    my_generator["prompts"]["prompt1"]["persist"] = False
     my_generator["prompts"]["prompt1"]["type"] = "line"
 
     my_generator["prompts"]["prompt2"]["description"] = "dream2nix"
-    my_generator["prompts"]["prompt2"]["createFile"] = False
+    my_generator["prompts"]["prompt2"]["persist"] = False
     my_generator["prompts"]["prompt2"]["type"] = "line"
 
-    my_generator["prompts"]["prompt_create_file"]["createFile"] = True
+    my_generator["prompts"]["prompt_create_file"]["persist"] = True
 
     my_generator["script"] = (
         "cat $prompts/prompt1 > $out/line_value; cat $prompts/prompt2 > $out/multiline_value"