Added flake_name:str argument everywhere, nix fmt doesn't complain anymore

pkgs/clan-cli/clan_cli/secrets/sops.py

@@ -51,7 +51,7 @@ def generate_private_key() -> tuple[str, str]:
         raise ClanError("Failed to generate private sops key") from e
 
 
-def get_user_name(user: str) -> str:
+def get_user_name(flake_name: str, user: str) -> str:
     """Ask the user for their name until a unique one is provided."""
     while True:
         name = input(
@@ -59,14 +59,14 @@ def get_user_name(user: str) -> str:
         )
         if name:
             user = name
-        if not (sops_users_folder() / user).exists():
+        if not (sops_users_folder(flake_name) / user).exists():
             return user
-        print(f"{sops_users_folder() / user} already exists")
+        print(f"{sops_users_folder(flake_name) / user} already exists")
 
 
-def ensure_user_or_machine(pub_key: str) -> SopsKey:
+def ensure_user_or_machine(flake_name: str, pub_key: str) -> SopsKey:
     key = SopsKey(pub_key, username="")
-    folders = [sops_users_folder(), sops_machines_folder()]
+    folders = [sops_users_folder(flake_name), sops_machines_folder(flake_name)]
     for folder in folders:
         if folder.exists():
             for user in folder.iterdir():
@@ -90,13 +90,13 @@ def default_sops_key_path() -> Path:
         return user_config_dir() / "sops" / "age" / "keys.txt"
 
 
-def ensure_sops_key() -> SopsKey:
+def ensure_sops_key(flake_name: str) -> SopsKey:
     key = os.environ.get("SOPS_AGE_KEY")
     if key:
-        return ensure_user_or_machine(get_public_key(key))
+        return ensure_user_or_machine(flake_name, get_public_key(key))
     path = default_sops_key_path()
     if path.exists():
-        return ensure_user_or_machine(get_public_key(path.read_text()))
+        return ensure_user_or_machine(flake_name, get_public_key(path.read_text()))
     else:
         raise ClanError(
             "No sops key found. Please generate one with 'clan secrets key generate'."