Add state-version nixos option

This reverts commit 8f6f06bef3.

checks/flake-module.nix

@@ -22,6 +22,7 @@ in
   imports = filter pathExists [
     ./backups/flake-module.nix
     ../nixosModules/clanCore/machine-id/tests/flake-module.nix
+    ../nixosModules/clanCore/state-version/tests/flake-module.nix
     ./devshell/flake-module.nix
     ./flash/flake-module.nix
     ./impure/flake-module.nix

clanModules/state-version/roles/default.nix

@@ -5,9 +5,12 @@ in
 {
 
   warnings = [
-    "The clan.state-version module is deprecated and will be removed on 2025-07-15.
+    ''
-      Please migrate to user-maintained configuration or the new equivalent clan services
+      The clan.state-version service is deprecated and will be
-      (https://docs.clan.lol/reference/clanServices)."
+      removed on 2025-07-15 in favor of a nix option.
+
+      Please migrate your configuration to use `clan.core.settings.state-version.enable = true` instead.
+    ''
   ];
 
   system.stateVersion = lib.mkDefault (lib.removeSuffix "\n" var.value);

clanServices/state-version/default.nix

@@ -20,6 +20,16 @@
             var = config.clan.core.vars.generators.state-version.files.version or { };
           in
           {
+
+            warnings = [
+              ''
+                The clan.state-version service is deprecated and will be
+                removed on 2025-07-15 in favor of a nix option. 
+
+                Please migrate your configuration to use `clan.core.settings.state-version.enable = true` instead.
+              ''
+            ];
+
             system.stateVersion = lib.mkDefault (lib.removeSuffix "\n" var.value);
 
             clan.core.vars.generators.state-version = {

clanServices/state-version/tests/vm/default.nix

@@ -1,5 +1,6 @@
+{ lib, ... }:
 {
-  name = "state-version";
+  name = "service-state-version";
 
   clan = {
     directory = ./.;
@@ -15,7 +16,7 @@
 
   nodes.server = { };
 
-  testScript = ''
+  testScript = lib.mkDefault ''
     start_all()
   '';
 }

nixosModules/clanCore/default.nix

@@ -13,13 +13,13 @@
       ./options.nix
       ./outputs.nix
       ./sops.nix
-      ./state-version/default.nix
       ./vars
     ]
     ++ lib.optionals (_class == "nixos") [
       ./nixos-facter.nix
       ./vm.nix
       ./machine-id
+      ./state-version
       ./wayland-proxy-virtwl.nix
       ./zerotier
       ./zfs.nix

nixosModules/clanCore/state-version/tests/sops/users/admin/key.json

@@ -0,0 +1,4 @@
+{
+  "publickey": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg",
+  "type": "age"
+}

nixosModules/clanCore/state-version/tests/vars/per-machine/server/state-version/version/value

@@ -0,0 +1 @@
+25.11

pkgs/clan-cli/clan_lib/tests/test_create.py

@@ -64,17 +64,7 @@ def create_base_inventory(ssh_keys_pairs: list[SSHKeyPair]) -> InventoryWrapper:
         ssh_keys.append(InvSSHKeyEntry(f"user_{num}", ssh_key.public.read_text()))
 
     """Create the base inventory structure."""
-    legacy_services: dict[str, Any] = {
+    legacy_services: dict[str, Any] = {}
-        "state-version": {
-            "someid": {
-                "roles": {
-                    "default": {
-                        "tags": ["all"],
-                    }
-                }
-            }
-        },
-    }
 
     instances = InventoryInstancesType(
         {

templates/clan/new-clan/modules/shared.nix

@@ -12,7 +12,6 @@
     # Set a root password
     clan-core.clanModules.root-password
     clan-core.clanModules.user-password
-    clan-core.clanModules.state-version
 
     # You can access other flakes imported in your flake via `self` like this:
     # self.inputs.nix-index-database.nixosModules.nix-index