diff --git a/flake.lock b/flake.lock index 16e093b..13ad1a5 100644 --- a/flake.lock +++ b/flake.lock @@ -1,6 +1,55 @@ { "nodes": { + "disko": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1747274630, + "narHash": "sha256-87RJwXbfOHyzTB9LYagAQ6vOZhszCvd8Gvudu+gf3qo=", + "owner": "nix-community", + "repo": "disko", + "rev": "ec7c109a4f794fce09aad87239eab7f66540b888", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, + "facter": { + "locked": { + "lastModified": 1743671943, + "narHash": "sha256-7sYig0+RcrR3sOL5M+2spbpFUHyEP7cnUvCaqFOBjyU=", + "owner": "nix-community", + "repo": "nixos-facter-modules", + "rev": "58ad9691670d293a15221d4a78818e0088d2e086", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-facter-modules", + "type": "github" + } + }, "nixpkgs": { + "locked": { + "lastModified": 1747060738, + "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1745279238, "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", @@ -16,9 +65,46 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { - "nixpkgs": "nixpkgs" + "disko": "disko", + "facter": "facter", + "nixpkgs": "nixpkgs_2", + "sops-nix": "sops-nix" + } + }, + "sops-nix": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1746485181, + "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 9148fcb..7740e42 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,8 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; sops-nix.url = "github:Mic92/sops-nix"; + disko.url = "github:nix-community/disko"; + facter.url = "github:nix-community/nixos-facter-modules"; }; outputs = inputs: { diff --git a/setup/README.md b/setup/README.md index a406482..2c09c01 100644 --- a/setup/README.md +++ b/setup/README.md @@ -4,7 +4,7 @@ Execute ``` nix run nixpkgs#nixos-anywhere -- \ - --flake .#raid1base \ + --flake ..#raid1base \ --generate-hardware-config nixos-facter ./facter.json \ root@ ``` diff --git a/setup/default.nix b/setup/default.nix index a295e11..b83787f 100644 --- a/setup/default.nix +++ b/setup/default.nix @@ -5,7 +5,7 @@ inputs.nixpkgs.lib.nixosSystem { inputs.disko.nixosModules.disko ./disk_conf.nix - inputs.nixos-facter-modules.nixosModules.facter + inputs.facter.nixosModules.facter { config.facter.reportPath = ./facter.json; } ./mini_conf.nix