danvics/selfhostblocks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

add SHB nixpkgs patches to demo

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

16
demo/homeassistant/flake.nix
View file

@ -8,6 +8,16 @@
outputs = inputs@{ self, selfhostblocks, sops-nix }: outputs = inputs@{ self, selfhostblocks, sops-nix }:
let 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, ... }: { basic = { config, ... }: {
imports = [ imports = [
./configuration.nix ./configuration.nix
@ -103,7 +113,7 @@
in in
{ {
nixosConfigurations = { nixosConfigurations = {
basic = selfhostblocks.inputs.nixpkgs.lib.nixosSystem { basic = nixosSystem' {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
basic basic
@ -111,7 +121,7 @@
]; ];
}; };
ldap = selfhostblocks.inputs.nixpkgs.lib.nixosSystem { ldap = nixosSystem' {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
basic basic
@ -123,7 +133,7 @@
colmena = { colmena = {
meta = { meta = {
nixpkgs = import selfhostblocks.inputs.nixpkgs { nixpkgs = import nixpkgs' {
system = "x86_64-linux"; system = "x86_64-linux";
}; };
specialArgs = inputs; specialArgs = inputs;

18
demo/nextcloud/flake.nix
View file

@ -8,6 +8,16 @@
outputs = inputs@{ self, selfhostblocks, sops-nix }: outputs = inputs@{ self, selfhostblocks, sops-nix }:
let 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, ... }: { basic = { config, ... }: {
imports = [ imports = [
./configuration.nix ./configuration.nix
@ -212,14 +222,14 @@
in in
{ {
nixosConfigurations = { nixosConfigurations = {
basic = selfhostblocks.inputs.nixpkgs.lib.nixosSystem { basic = nixosSystem' {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
sopsConfig sopsConfig
basic basic
]; ];
}; };
ldap = selfhostblocks.inputs.nixpkgs.lib.nixosSystem { ldap = nixosSystem' {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
sopsConfig sopsConfig
@ -227,7 +237,7 @@
ldap ldap
]; ];
}; };
sso = selfhostblocks.inputs.nixpkgs.lib.nixosSystem { sso = nixosSystem' {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
sopsConfig sopsConfig
@ -240,7 +250,7 @@
colmena = { colmena = {
meta = { meta = {
nixpkgs = import selfhostblocks.inputs.nixpkgs { nixpkgs = import nixpkgs' {
system = "x86_64-linux"; system = "x86_64-linux";
}; };
specialArgs = inputs; specialArgs = inputs;

6
docs/usage.md
View file

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