add SHB nixpkgs patches to demo

This commit is contained in:
ibizaman 2025-03-16 21:28:53 +01:00 committed by Pierre Penninckx
parent 7d6827b411
commit 5e613b1aaf
3 changed files with 29 additions and 11 deletions

View file

@ -8,6 +8,16 @@
outputs = inputs@{ self, selfhostblocks, sops-nix }:
let
system = "x86_64-linux";
originPkgs = selfhostblocks.inputs.nixpkgs;
nixpkgs' = originPkgs.legacyPackages.${system}.applyPatches {
name = "nixpkgs-patched";
src = originPkgs;
patches = selfhostblocks.patches.${system};
};
nixosSystem' = import "${nixpkgs'}/nixos/lib/eval-config.nix";
basic = { config, ... }: {
imports = [
./configuration.nix
@ -103,7 +113,7 @@
in
{
nixosConfigurations = {
basic = selfhostblocks.inputs.nixpkgs.lib.nixosSystem {
basic = nixosSystem' {
system = "x86_64-linux";
modules = [
basic
@ -111,7 +121,7 @@
];
};
ldap = selfhostblocks.inputs.nixpkgs.lib.nixosSystem {
ldap = nixosSystem' {
system = "x86_64-linux";
modules = [
basic
@ -123,7 +133,7 @@
colmena = {
meta = {
nixpkgs = import selfhostblocks.inputs.nixpkgs {
nixpkgs = import nixpkgs' {
system = "x86_64-linux";
};
specialArgs = inputs;

View file

@ -8,6 +8,16 @@
outputs = inputs@{ self, selfhostblocks, sops-nix }:
let
system = "x86_64-linux";
originPkgs = selfhostblocks.inputs.nixpkgs;
nixpkgs' = originPkgs.legacyPackages.${system}.applyPatches {
name = "nixpkgs-patched";
src = originPkgs;
patches = selfhostblocks.patches.${system};
};
nixosSystem' = import "${nixpkgs'}/nixos/lib/eval-config.nix";
basic = { config, ... }: {
imports = [
./configuration.nix
@ -212,14 +222,14 @@
in
{
nixosConfigurations = {
basic = selfhostblocks.inputs.nixpkgs.lib.nixosSystem {
basic = nixosSystem' {
system = "x86_64-linux";
modules = [
sopsConfig
basic
];
};
ldap = selfhostblocks.inputs.nixpkgs.lib.nixosSystem {
ldap = nixosSystem' {
system = "x86_64-linux";
modules = [
sopsConfig
@ -227,7 +237,7 @@
ldap
];
};
sso = selfhostblocks.inputs.nixpkgs.lib.nixosSystem {
sso = nixosSystem' {
system = "x86_64-linux";
modules = [
sopsConfig
@ -240,7 +250,7 @@
colmena = {
meta = {
nixpkgs = import selfhostblocks.inputs.nixpkgs {
nixpkgs = import nixpkgs' {
system = "x86_64-linux";
};
specialArgs = inputs;

View file

@ -99,12 +99,10 @@ The following snippets show how to deploy Self Host Blocks using the standard de
patches = selfhostblocks.patches.${system};
};
shbNixpkgs = import nixpkgs' {
inherit system;
};
nixosSystem' = import "${nixpkgs'}/nixos/lib/eval-config.nix";
in
nixosConfigurations = {
machine = shbNixpkgs.lib.nixosSystem {
machine = nixosSystem' {
inherit system;
modules = [
selfhostblocks.nixosModules.${system}.default