yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Merge pull request 'machine_id_v2' (#2052) from Qubasa/clan-core:machine_id_v2 into main"

Browse Source 
This reverts commit 68a72a4156, reversing
changes made to 7af3e80249.
This commit is contained in:
a-kenji
2024-09-10 14:01:12 +02:00
parent 140e31ab94
commit f1b857f4ae
28 changed files with 254 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/eval-clan-modules/default.nix
View File

@@ -25,9 +25,6 @@ let
evaled = lib.evalModules {
modules = [
baseModule
({
clan.core.clanDir = ./.;
})
clan-core.nixosModules.clanCore
] ++ (map (name: clanModules.${name}) modulenames);
};

34
lib/inventory/build-inventory/interface.nix
View File

@@ -23,27 +23,27 @@ let
description = ''
List of imported '.nix' files.
Each filename must be a string and is interpreted relative to the 'directory' passed to buildClan.
The import only happens if the machine is part of the service or role.
Each filename must be a string and is interpreted relative to the 'directory' passed to buildClan.
The import only happens if the machine is part of the service or role.
## Example
## Example
To import the `special.nix` file
To import the `special.nix` file
```
. Clan Directory
├── flake.nix
...
└── modules
├── special.nix
└── ...
```
```
. Clan Directory
├── flake.nix
...
└── modules
├── special.nix
└── ...
```
```nix
{
imports = [ "modules/special.nix" ];
}
```
```nix
{
imports = [ "modules/special.nix" ];
}
```
'';
default = [ ];