diff --git a/configuration-nixbsd.nix b/configuration-nixbsd.nix index ac12b80..c29c31f 100644 --- a/configuration-nixbsd.nix +++ b/configuration-nixbsd.nix @@ -2,6 +2,8 @@ let nixKey = "/var/lib/nix/binary-cache-key" ; in { + # it's already default + lix.enable = false; init.services.nix-key-setup = { description = "Generate a nix build signing key"; startType = "oneshot"; diff --git a/flake.lock b/flake.lock index 20e46af..fbc414d 100644 --- a/flake.lock +++ b/flake.lock @@ -30,7 +30,75 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flakey-profile": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "lix": { + "flake": false, + "locked": { + "lastModified": 1737234286, + "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", + "rev": "079528098f5998ba13c88821a2eca1005c1695de", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils", + "flakey-profile": "flakey-profile", + "lix": "lix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742943028, + "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", + "rev": "868d97695bab9d21f6070b03957bcace249fbe3c", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz" + } + }, + "lix_2": { "inputs": { "flake-compat": "flake-compat_2", "nix2container": "nix2container", @@ -99,7 +167,7 @@ "nixbsd": { "inputs": { "flake-compat": "flake-compat", - "lix": "lix", + "lix": "lix_2", "mini-tmpfiles": "mini-tmpfiles", "nixpkgs": "nixpkgs" }, @@ -168,9 +236,25 @@ }, "root": { "inputs": { + "lix-module": "lix-module", "nixbsd": "nixbsd", "nixpkgs": "nixpkgs_2" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 0a2682e..44ad245 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,12 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixbsd.url = "github:nixos-bsd/nixbsd/main"; + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, nixbsd, ... }: let + outputs = { self, nixpkgs, nixbsd, lix-module, ... }: let sitesFiles = builtins.readDir ./sites; sitesNames = builtins.filter (name: builtins.pathExists ./sites/${name}/configuration.nix) (builtins.attrNames sitesFiles); systemTypes = { @@ -19,6 +23,7 @@ ./configuration-${systemName name}.nix ./sites/${name}/configuration.nix { nixpkgs.buildPlatform = platform; } + lix-module.nixosModules.default ]; }; in { inherit (evaluated) config;