From 381f717a5a197c6604bca29e38bbd2327b67b61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 5 Dec 2024 12:18:20 +0100 Subject: [PATCH 1/2] add clan flake-parts module --- flake.lock | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++--- flake.nix | 17 ++++++++ 2 files changed, 124 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d5e30d4..dc0891b 100644 --- a/flake.lock +++ b/flake.lock @@ -107,6 +107,34 @@ "type": "github" } }, + "clan": { + "inputs": { + "disko": "disko", + "flake-parts": [ + "flake-parts" + ], + "nixos-facter-modules": "nixos-facter-modules", + "nixpkgs": [ + "nixpkgs" + ], + "sops-nix": "sops-nix", + "systems": "systems", + "treefmt-nix": [ + "treefmt-nix" + ] + }, + "locked": { + "lastModified": 1733395601, + "narHash": "sha256-wrspKPkTxoUKsYtSovH3reYJn7rONtVb5rhxK4iGpv8=", + "rev": "957ff48195ee96a290656e7f9a318441e5798175", + "type": "tarball", + "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/957ff48195ee96a290656e7f9a318441e5798175.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.clan.lol/clan/clan-core/archive/main.tar.gz" + } + }, "commonmark-simple": { "flake": false, "locked": { @@ -296,6 +324,27 @@ "type": "github" } }, + "disko": { + "inputs": { + "nixpkgs": [ + "clan", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732988076, + "narHash": "sha256-2uMaVAZn7fiyTUGhKgleuLYe5+EAAYB/diKxrM7g3as=", + "owner": "nix-community", + "repo": "disko", + "rev": "2814a5224a47ca19e858e027f7e8bff74a8ea9f1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, "dmerge": { "inputs": { "haumea": [ @@ -810,7 +859,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -828,7 +877,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1726560853, @@ -861,7 +910,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1694529238, @@ -1493,6 +1542,21 @@ "type": "github" } }, + "nixos-facter-modules": { + "locked": { + "lastModified": 1732288619, + "narHash": "sha256-zSQ2cR+NRJfHUVfkv+O6Wi53wXfzX8KHiO8fRfnvc0M=", + "owner": "numtide", + "repo": "nixos-facter-modules", + "rev": "862648589993a96480c2255197a28feea712f68f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nixos-facter-modules", + "type": "github" + } + }, "nixos-unified": { "locked": { "lastModified": 1729549045, @@ -1925,7 +1989,7 @@ "mkdocs-flake", "nixpkgs" ], - "systems": "systems_2", + "systems": "systems_3", "treefmt-nix": "treefmt-nix_3" }, "locked": { @@ -2120,6 +2184,7 @@ "inputs": { "agenix-rekey": "agenix-rekey", "agenix-shell": "agenix-shell", + "clan": "clan", "devenv": "devenv", "devshell": "devshell_2", "dream2nix_legacy": "dream2nix_legacy", @@ -2203,6 +2268,27 @@ "type": "github" } }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "clan", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732575825, + "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "std": { "inputs": { "arion": [ @@ -2275,6 +2361,21 @@ } }, "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2288,7 +2389,7 @@ "type": "indirect" } }, - "systems_3": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2303,7 +2404,7 @@ "type": "github" } }, - "systems_4": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index 84d6d88..511492d 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,10 @@ agenix-shell.url = "github:aciceri/agenix-shell"; agenix-shell.inputs.nixpkgs.follows = "nixpkgs"; devenv.url = "github:hercules-ci/devenv/flake-module"; + clan.url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; + clan.inputs.treefmt-nix.follows = "treefmt-nix"; + clan.inputs.flake-parts.follows = "flake-parts"; + clan.inputs.nixpkgs.follows = "nixpkgs"; devenv.inputs.nixpkgs.follows = "nixpkgs"; devshell.url = "github:numtide/devshell"; devshell.inputs.nixpkgs.follows = "nixpkgs"; # https://github.com/NixOS/nix/issues/7730 @@ -103,6 +107,19 @@ ''; }; + clan = { + title = "clan"; + baseUrl = "https://git.clan.lol/clan/clan-core/src/branch/main"; + attributePath = [ "flakeModules" "default" ]; + intro = '' + [Clan](https://clan.lol) is a multi-machine configuration framework for NixOS with a focus on + VPNs, automatic secret and backup management. + + Checkout our [documentation](https://docs.clan.lol/manual/flake-parts/) for more information on using the flake-parts module and + also our [getting started guide](https://docs.clan.lol/getting-started) for general information. + ''; + }; + devenv = { title = "devenv"; baseUrl = "https://github.com/cachix/devenv/blob/main"; From f3e737893bda5c8380f846274dc6e54e2b8619f9 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 5 Dec 2024 13:25:38 +0100 Subject: [PATCH 2/2] Add clan flakeRef --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 511492d..22d1087 100644 --- a/flake.nix +++ b/flake.nix @@ -110,6 +110,7 @@ clan = { title = "clan"; baseUrl = "https://git.clan.lol/clan/clan-core/src/branch/main"; + flakeRef = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; attributePath = [ "flakeModules" "default" ]; intro = '' [Clan](https://clan.lol) is a multi-machine configuration framework for NixOS with a focus on