diff --git a/clanModules/flake-module.nix b/clanModules/flake-module.nix index 54bcfc4d1..2cbdd6744 100644 --- a/clanModules/flake-module.nix +++ b/clanModules/flake-module.nix @@ -33,7 +33,6 @@ in root-password = ./root-password; single-disk = ./single-disk; sshd = ./sshd; - state-version = ./state-version; static-hosts = ./static-hosts; sunshine = ./sunshine; syncthing = ./syncthing; diff --git a/clanModules/state-version/README.md b/clanModules/state-version/README.md deleted file mode 100644 index f8544f0de..000000000 --- a/clanModules/state-version/README.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -description = "Automatically generate the state version of the nixos installation." -features = [ "inventory", "deprecated" ] ---- - -This module generates the `system.stateVersion` of the nixos installation automatically. - -Options: [system.stateVersion](https://search.nixos.org/options?channel=unstable&show=system.stateVersion&from=0&size=50&sort=relevance&type=packages&query=stateVersion) - -Migration: -If you are already setting `system.stateVersion`, then import the module and then either let the automatic generation happen, or trigger the generation manually for the machine. The module will take the specified version, if one is already supplied through the config. -To manually generate the version for a specified machine run: - -``` -clan vars generate [MACHINE] -``` - -If the setting was already set you can then remove `system.stateVersion` from your machine configuration. For new machines, just import the module. diff --git a/clanModules/state-version/default.nix b/clanModules/state-version/default.nix deleted file mode 100644 index ed6af3368..000000000 --- a/clanModules/state-version/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Dont import this file -# It is only here for backwards compatibility. -# Dont author new modules with this file. -{ - imports = [ ./roles/default.nix ]; -} diff --git a/clanModules/state-version/roles/default.nix b/clanModules/state-version/roles/default.nix deleted file mode 100644 index a136e8432..000000000 --- a/clanModules/state-version/roles/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ config, lib, ... }: -let - var = config.clan.core.vars.generators.state-version.files.version or { }; -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 - (https://docs.clan.lol/reference/clanServices)." - ]; - - system.stateVersion = lib.mkDefault (lib.removeSuffix "\n" var.value); - - clan.core.vars.generators.state-version = { - files.version = { - secret = false; - value = lib.mkDefault config.system.nixos.release; - }; - runtimeInputs = [ ]; - script = '' - echo -n ${config.system.stateVersion} > "$out"/version - ''; - }; -} diff --git a/clanServices/state-version/README.md b/clanServices/state-version/README.md deleted file mode 100644 index c55063b66..000000000 --- a/clanServices/state-version/README.md +++ /dev/null @@ -1,37 +0,0 @@ -This service generates the `system.stateVersion` of the nixos installation -automatically. - -Possible values: -[system.stateVersion](https://search.nixos.org/options?channel=unstable&show=system.stateVersion&from=0&size=50&sort=relevance&type=packages&query=stateVersion) - -## Usage - -The following configuration will set `stateVersion` for all machines: - -``` -inventory.instances = { - state-version = { - module = { - name = "state-version"; - input = "clan"; - }; - roles.default.tags.all = { }; - }; -``` - -## Migration - -If you are already setting `system.stateVersion`, either let the automatic -generation happen, or trigger the generation manually for the machine. The -service will take the specified version, if one is already supplied through the -config. - -To manually generate the version for a specified machine run: - -``` -clan vars generate [MACHINE] -``` - -If the setting was already set, you can then remove `system.stateVersion` from -your machine configuration. For new machines, just import the service as shown -above. diff --git a/clanServices/state-version/default.nix b/clanServices/state-version/default.nix deleted file mode 100644 index 34a0575e8..000000000 --- a/clanServices/state-version/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ ... }: -{ - _class = "clan.service"; - manifest.name = "clan-core/state-version"; - manifest.description = "Automatically generate the state version of the nixos installation."; - manifest.categories = [ "System" ]; - - roles.default = { - - perInstance = - { ... }: - { - nixosModule = - { - config, - lib, - ... - }: - let - var = config.clan.core.vars.generators.state-version.files.version or { }; - in - { - system.stateVersion = lib.mkDefault (lib.removeSuffix "\n" var.value); - - clan.core.vars.generators.state-version = { - files.version = { - secret = false; - value = lib.mkDefault config.system.nixos.release; - }; - runtimeInputs = [ ]; - script = '' - echo -n ${config.system.stateVersion} > "$out"/version - ''; - }; - }; - }; - }; - -} diff --git a/clanServices/state-version/flake-module.nix b/clanServices/state-version/flake-module.nix deleted file mode 100644 index c4ff9d633..000000000 --- a/clanServices/state-version/flake-module.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ lib, ... }: -let - module = lib.modules.importApply ./default.nix { }; -in -{ - clan.modules.state-version = module; - perSystem = - { ... }: - { - clan.nixosTests.state-version = { - imports = [ ./tests/vm/default.nix ]; - - clan.modules."@clan/state-version" = module; - }; - }; -} diff --git a/clanServices/state-version/tests/vm/default.nix b/clanServices/state-version/tests/vm/default.nix deleted file mode 100644 index efd4a6f14..000000000 --- a/clanServices/state-version/tests/vm/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - name = "state-version"; - - clan = { - directory = ./.; - inventory = { - machines.server = { }; - instances.default = { - module.name = "@clan/state-version"; - module.input = "self"; - roles.default.machines."server" = { }; - }; - }; - }; - - nodes.server = { }; - - testScript = '' - start_all() - ''; -} diff --git a/clanServices/state-version/tests/vm/sops/users/admin/key.json b/clanServices/state-version/tests/vm/sops/users/admin/key.json deleted file mode 100644 index e408aa96b..000000000 --- a/clanServices/state-version/tests/vm/sops/users/admin/key.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "publickey": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", - "type": "age" -} diff --git a/clanServices/state-version/tests/vm/vars/per-machine/server/state-version/version/value b/clanServices/state-version/tests/vm/vars/per-machine/server/state-version/version/value deleted file mode 100644 index 115ab7a6a..000000000 --- a/clanServices/state-version/tests/vm/vars/per-machine/server/state-version/version/value +++ /dev/null @@ -1 +0,0 @@ -25.11 \ No newline at end of file diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index ddf1d0810..08f9db0c7 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -91,7 +91,6 @@ nav: - reference/clanServices/mycelium.md - reference/clanServices/packages.md - reference/clanServices/sshd.md - - reference/clanServices/state-version.md - reference/clanServices/trusted-nix-caches.md - reference/clanServices/users.md - reference/clanServices/wifi.md @@ -126,7 +125,6 @@ nav: - reference/clanModules/root-password.md - reference/clanModules/single-disk.md - reference/clanModules/sshd.md - - reference/clanModules/state-version.md - reference/clanModules/static-hosts.md - reference/clanModules/sunshine.md - reference/clanModules/syncthing-static-peers.md