From e7ce8dba6d4a102ab90893840a36e3ac25d55667 Mon Sep 17 00:00:00 2001 From: Romain Paquet Date: Wed, 31 Dec 2025 00:32:37 +0100 Subject: [PATCH] cleanup flake inputs --- flake.lock | 135 ++++++------------ flake.nix | 11 +- .../openssh-ca/id_ed25519/machines/crocus | 0 .../openssh-ca/id_ed25519/machines/genepi | 0 .../openssh-ca/id_ed25519/machines/verbena | 0 5 files changed, 42 insertions(+), 104 deletions(-) mode change 120000 => 100644 vars/shared/openssh-ca/id_ed25519/machines/crocus mode change 120000 => 100644 vars/shared/openssh-ca/id_ed25519/machines/genepi mode change 120000 => 100644 vars/shared/openssh-ca/id_ed25519/machines/verbena diff --git a/flake.lock b/flake.lock index 68faa8f..215c716 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1765893949, - "narHash": "sha256-5wn3/cMZ6cQ7BHaoTkeDiMxgjZUV/8FPGplCJ/P6Idc=", + "lastModified": 1766893577, + "narHash": "sha256-8SFRZJt9HlNN1ic3asTCOc6Vr/QJQDdZjJ4C5XzxFi0=", "owner": "nix-community", "repo": "buildbot-nix", - "rev": "39896cb5a1a6ad52d1feb6634913087e11059454", + "rev": "4f590eb97462eef698f2c96c67a080876c1f8051", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1766058975, - "narHash": "sha256-HBnRRq9wLq7UfJxMM55wR10lZFK1F0lNyRgUwwOby6s=", + "lastModified": 1766934363, + "narHash": "sha256-aZV2cirZSoQq1vW3vEcY7MvzKQ2gwCGbLbMpuwkC2Ic=", "ref": "refs/heads/main", - "rev": "9032d11a0e31641808ef1427150aac0f40e2e0b9", - "revCount": 11671, + "rev": "808fd6cb7fc0c831840a5580cf4fb41d9c0626a4", + "revCount": 11768, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1765768061, - "narHash": "sha256-RZ/ocDUJ3WPr2KcDc2MB6Fu+ZPqzwsMKQ16XxqrPi+o=", - "rev": "53351f9953ecf9dbe18795b4784abe53b14e6eee", + "lastModified": 1766372687, + "narHash": "sha256-cGOe30ePOX+7OMLFXJha3y/Q8umHftaG+5tB6DXu110=", + "rev": "7d819044ed7f39801277b39ea34f4aa133d86889", "type": "tarball", - "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/53351f9953ecf9dbe18795b4784abe53b14e6eee.tar.gz" + "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/7d819044ed7f39801277b39ea34f4aa133d86889.tar.gz" }, "original": { "type": "tarball", @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1765794845, - "narHash": "sha256-YD5QWlGnusNbZCqR3pxG8tRxx9yUXayLZfAJRWspq2s=", + "lastModified": 1766150702, + "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", "owner": "nix-community", "repo": "disko", - "rev": "7194cfe5b7a3660726b0fe7296070eaef601cae9", + "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1765794845, - "narHash": "sha256-YD5QWlGnusNbZCqR3pxG8tRxx9yUXayLZfAJRWspq2s=", + "lastModified": 1766150702, + "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", "owner": "nix-community", "repo": "disko", - "rev": "7194cfe5b7a3660726b0fe7296070eaef601cae9", + "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1765980955, - "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=", + "lastModified": 1766936966, + "narHash": "sha256-LfixPDPlysn7sAUVyHEL8sjzgoYv2abDLoCxAlzY440=", "owner": "nix-community", "repo": "home-manager", - "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173", + "rev": "80cca72314c3b18896f2a412f2f070d17810b45f", "type": "github" }, "original": { @@ -208,42 +208,6 @@ "type": "github" } }, - "impermanence": { - "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", - "owner": "nix-community", - "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "impermanence", - "type": "github" - } - }, - "matugen": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1765981892, - "narHash": "sha256-c7VKaNiBUkwGsTq398EQSM4K7skPacmOz8NeLj67M7s=", - "owner": "InioX", - "repo": "Matugen", - "rev": "e405cd9de87510dd40c1328bcf06e0daf3d1a5bf", - "type": "github" - }, - "original": { - "owner": "InioX", - "repo": "Matugen", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -252,11 +216,11 @@ ] }, "locked": { - "lastModified": 1764161084, - "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", + "lastModified": 1766784396, + "narHash": "sha256-rIlgatT0JtwxsEpzq+UrrIJCRfVAXgbYPzose1DmAcM=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "e95de00a471d07435e0527ff4db092c84998698e", + "rev": "f0c8e1f6feb562b5db09cee9fb566a2f989e6b55", "type": "github" }, "original": { @@ -295,11 +259,11 @@ }, "nixos-facter-modules": { "locked": { - "lastModified": 1765442039, - "narHash": "sha256-k3lYQ+A1F7aTz8HnlU++bd9t/x/NP2A4v9+x6opcVg0=", + "lastModified": 1766558141, + "narHash": "sha256-Ud9v49ZPsoDBFuyJSQ2Mpw1ZgAH/aMwUwwzrVoetNus=", "owner": "nix-community", "repo": "nixos-facter-modules", - "rev": "9dd775ee92de63f14edd021d59416e18ac2c00f1", + "rev": "e796d536e3d83de74267069e179dc620a608ed7d", "type": "github" }, "original": { @@ -329,11 +293,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1766568855, + "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", "type": "github" }, "original": { @@ -361,11 +325,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -382,8 +346,6 @@ "disko": "disko_2", "flake-parts": "flake-parts_2", "home-manager": "home-manager", - "impermanence": "impermanence", - "matugen": "matugen", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", @@ -398,11 +360,11 @@ ] }, "locked": { - "lastModified": 1765836173, - "narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=", + "lastModified": 1766894905, + "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63", + "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7", "type": "github" }, "original": { @@ -418,11 +380,11 @@ ] }, "locked": { - "lastModified": 1766020451, - "narHash": "sha256-Jy7rX7sMbSJEX0KKwvNcGUfRVZ0SDWo3Zk2e5LGyqw0=", + "lastModified": 1766626001, + "narHash": "sha256-YQk9UVG4PsrTp4LVbWCDwuc594S9H05pxNgjK8R30/U=", "owner": "nix-community", "repo": "srvos", - "rev": "5ecd4a56da963480db305e56ab3a42d13597c0a7", + "rev": "cf609acbe9aa6f53120df7b1adad16957e481b93", "type": "github" }, "original": { @@ -446,21 +408,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -469,11 +416,11 @@ ] }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1766000401, + "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 79ffcc8..c7e7b0e 100644 --- a/flake.nix +++ b/flake.nix @@ -6,15 +6,11 @@ nixpkgs, clan-core, flake-parts, - home-manager, - impermanence, - nixos-hardware, - self, ... }: flake-parts.lib.mkFlake { inherit inputs; } ({ imports = [ - inputs.clan-core.flakeModules.default + clan-core.flakeModules.default ./clan/flake-module.nix ./clanServices/flake-module.nix ./devShells/flake-module.nix @@ -39,8 +35,6 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - impermanence.url = "github:nix-community/impermanence"; - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-generators.url = "github:nix-community/nixos-generators"; @@ -49,9 +43,6 @@ clan-core.inputs.nixpkgs.follows = "nixpkgs"; clan-core.inputs.flake-parts.follows = "flake-parts"; - matugen.url = "github:InioX/Matugen"; - matugen.inputs.nixpkgs.follows = "nixpkgs"; - flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; diff --git a/vars/shared/openssh-ca/id_ed25519/machines/crocus b/vars/shared/openssh-ca/id_ed25519/machines/crocus deleted file mode 120000 index 1ca5db3..0000000 --- a/vars/shared/openssh-ca/id_ed25519/machines/crocus +++ /dev/null @@ -1 +0,0 @@ -../../../../../sops/machines/crocus \ No newline at end of file diff --git a/vars/shared/openssh-ca/id_ed25519/machines/crocus b/vars/shared/openssh-ca/id_ed25519/machines/crocus new file mode 100644 index 0000000..1ca5db3 --- /dev/null +++ b/vars/shared/openssh-ca/id_ed25519/machines/crocus @@ -0,0 +1 @@ +../../../../../sops/machines/crocus \ No newline at end of file diff --git a/vars/shared/openssh-ca/id_ed25519/machines/genepi b/vars/shared/openssh-ca/id_ed25519/machines/genepi deleted file mode 120000 index be44d39..0000000 --- a/vars/shared/openssh-ca/id_ed25519/machines/genepi +++ /dev/null @@ -1 +0,0 @@ -../../../../../sops/machines/genepi \ No newline at end of file diff --git a/vars/shared/openssh-ca/id_ed25519/machines/genepi b/vars/shared/openssh-ca/id_ed25519/machines/genepi new file mode 100644 index 0000000..be44d39 --- /dev/null +++ b/vars/shared/openssh-ca/id_ed25519/machines/genepi @@ -0,0 +1 @@ +../../../../../sops/machines/genepi \ No newline at end of file diff --git a/vars/shared/openssh-ca/id_ed25519/machines/verbena b/vars/shared/openssh-ca/id_ed25519/machines/verbena deleted file mode 120000 index de62703..0000000 --- a/vars/shared/openssh-ca/id_ed25519/machines/verbena +++ /dev/null @@ -1 +0,0 @@ -../../../../../sops/machines/verbena \ No newline at end of file diff --git a/vars/shared/openssh-ca/id_ed25519/machines/verbena b/vars/shared/openssh-ca/id_ed25519/machines/verbena new file mode 100644 index 0000000..de62703 --- /dev/null +++ b/vars/shared/openssh-ca/id_ed25519/machines/verbena @@ -0,0 +1 @@ +../../../../../sops/machines/verbena \ No newline at end of file