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

Merge pull request 'Remove nixos-factor-modules for now' (#1980) from disable-nixos-facter-modules into main

Browse Source
This commit is contained in:
clan-bot
2024-08-27 07:42:27 +00:00
parent aeba73ac60 ed2975acea
commit 5deae67137
3 changed files with 13 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
flake.lock generated
View File

@@ -1,28 +1,5 @@
{ {
"nodes": { "nodes": {
"blueprint": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"systems": [
"systems"
]
},
"locked": {
"lastModified": 1724053269,
"narHash": "sha256-DinmPyxmUSLjBUYMe3eK0GKykwe33vWbVTmp7++P4Ng=",
"owner": "numtide",
"repo": "blueprint",
"rev": "766302be9063650ca6578e5ba09cc4260b0da29c",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "blueprint",
"type": "github"
}
},
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -63,35 +40,6 @@
"type": "github" "type": "github"
} }
}, },
"nixos-facter-modules": {
"inputs": {
"blueprint": [
"blueprint"
],
"nixpkgs": [
"nixpkgs"
],
"systems": [
"systems"
],
"treefmt-nix": [
"treefmt-nix"
]
},
"locked": {
"lastModified": 1724320449,
"narHash": "sha256-0hB5P75tIwPS9lNI3nYxEorpcFtuQUJGmGHGIEgWksY=",
"owner": "numtide",
"repo": "nixos-facter-modules",
"rev": "e00d789870e72baabb79d19afcc645428c3c6980",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nixos-facter-modules",
"type": "github"
}
},
"nixos-images": { "nixos-images": {
"inputs": { "inputs": {
"nixos-stable": [], "nixos-stable": [],
@@ -131,10 +79,8 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"blueprint": "blueprint",
"disko": "disko", "disko": "disko",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixos-facter-modules": "nixos-facter-modules",
"nixos-images": "nixos-images", "nixos-images": "nixos-images",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",

16
flake.nix
View File

@@ -18,16 +18,16 @@
treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.url = "github:numtide/treefmt-nix";
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; #nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
nixos-facter-modules.inputs.nixpkgs.follows = "nixpkgs"; #nixos-facter-modules.inputs.nixpkgs.follows = "nixpkgs";
nixos-facter-modules.inputs.systems.follows = "systems"; #nixos-facter-modules.inputs.systems.follows = "systems";
nixos-facter-modules.inputs.blueprint.follows = "blueprint"; #nixos-facter-modules.inputs.blueprint.follows = "blueprint";
nixos-facter-modules.inputs.treefmt-nix.follows = "treefmt-nix"; #nixos-facter-modules.inputs.treefmt-nix.follows = "treefmt-nix";
# Pinned input for nixos-facter-modules # Pinned input for nixos-facter-modules
# Allows downstream flakes to .follow override the input # Allows downstream flakes to .follow override the input
blueprint.url = "github:numtide/blueprint"; #blueprint.url = "github:numtide/blueprint";
blueprint.inputs.nixpkgs.follows = "nixpkgs"; #blueprint.inputs.nixpkgs.follows = "nixpkgs";
blueprint.inputs.systems.follows = "systems"; #blueprint.inputs.systems.follows = "systems";
}; };
outputs = outputs =

10
lib/build-clan/module.nix
View File

@@ -67,13 +67,13 @@ let
facterJson = "${directory}/machines/${name}/facter.json"; facterJson = "${directory}/machines/${name}/facter.json";
hwConfig = "${directory}/machines/${name}/hardware-configuration.nix"; hwConfig = "${directory}/machines/${name}/hardware-configuration.nix";
facterModules = lib.optionals (builtins.pathExists facterJson) [
clan-core.inputs.nixos-facter-modules.nixosModules.facter
{ config.facter.reportPath = facterJson; }
];
in in
#facterModules = lib.optionals (builtins.pathExists facterJson) [
# clan-core.inputs.nixos-facter-modules.nixosModules.facter
# { config.facter.reportPath = facterJson; }
#];
(machineImports settings) (machineImports settings)
++ facterModules #++ facterModules
++ [ ++ [
{ {
# Autoinclude configuration.nix and hardware-configuration.nix # Autoinclude configuration.nix and hardware-configuration.nix