This commit is contained in:
Chris Kruining 2025-09-16 14:06:04 +02:00
parent 3dc01cc803
commit 56a029331b
No known key found for this signature in database
GPG key ID: EB894A3560CCCAD2
3 changed files with 30 additions and 20 deletions

2
.envrc Normal file
View file

@ -0,0 +1,2 @@
# shellcheck shell=bash
use flake

17
flake.lock generated
View file

@ -183,8 +183,7 @@
"nixpkgs": [ "nixpkgs": [
"clan-core", "clan-core",
"nixpkgs" "nixpkgs"
], ]
"systems": "systems_2"
} }
}, },
"sops-nix": { "sops-nix": {
@ -223,20 +222,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"id": "systems",
"type": "indirect"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View file

@ -12,16 +12,39 @@
}; };
}; };
outputs = inputs@{ flake-parts, clan-core, systems, ... }: flake-parts.lib.mkFlake { inherit inputs; } ({ self, lib, ... }: { outputs = inputs@{ self, flake-parts, clan-core, nixpkgs, ... }:
let
# clan = clan-core.lib.clan {
# inherit self;
# imports = [];
# specialArgs = { inherit inputs; };
# };
in
{
# inherit (clan.config) nixosConfigurations nixosModules clanInternals;
# clan = clan.config;
imports = [ imports = [
clan-core.flakeModules.default clan-core.flakeModules.default
# ./clanServices/flake-module.nix # ./clanServices/flake-module.nix
]; ];
clan.modules = { clan.modules = {
"@amarth/k3s" = lib.importApply ./clanServices/k3s/default.nix {}; "@amarth/k3s" = flake-parts.lib.importApply ./clanServices/k3s/default.nix {};
}; };
systems = import systems; devShells =
}); nixpkgs.lib.genAttrs
[
"x86_64-linux"
"aarch64-linux"
"aarch64-darwin"
"x86_64-darwin"
]
(system: {
default = clan-core.inputs.nixpkgs.legacyPackages.${system}.mkShell {
packages = [ clan-core.packages.${system}.clan-cli ];
};
});
};
} }