From 40ce518b7ef94b8e80d7149f28f30b00a881d1e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 3 Sep 2023 15:35:14 +0200 Subject: [PATCH 1/2] template/buildClan: use self as directory paths somehow don't end up in the store for some reason, which breaks sops-nix --- templates/new-clan/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/new-clan/flake.nix b/templates/new-clan/flake.nix index 7687075e2..17c6154b8 100644 --- a/templates/new-clan/flake.nix +++ b/templates/new-clan/flake.nix @@ -11,7 +11,7 @@ { # all machines managed by cLAN nixosConfigurations = clan-core.lib.buildClan { - directory = ./.; + directory = self; }; # add the cLAN cli tool to the dev shell devShells.${system}.default = pkgs.mkShell { From efce138b2462bb91f2c334142403aa329f6cf125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 3 Sep 2023 15:36:00 +0200 Subject: [PATCH 2/2] template: do not rely on flake registry for nixpkgs otherwise we end up downloading nixpkgs twice. --- templates/new-clan/flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/new-clan/flake.nix b/templates/new-clan/flake.nix index 17c6154b8..4493397b6 100644 --- a/templates/new-clan/flake.nix +++ b/templates/new-clan/flake.nix @@ -3,10 +3,10 @@ inputs.clan-core.url = "git+https://git.clan.lol/clan/clan-core"; - outputs = { clan-core, nixpkgs, ... }: + outputs = { self, clan-core, ... }: let system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.x86_64-linux; + pkgs = clan-core.inputs.nixpkgs.legacyPackages.${system}; in { # all machines managed by cLAN