From 5e613b1aaf709ca73bbe58302c9a8ab2e7f38c15 Mon Sep 17 00:00:00 2001
From: ibizaman <ibizapeanut@gmail.com>
Date: Sun, 16 Mar 2025 21:28:53 +0100
Subject: [PATCH] add SHB nixpkgs patches to demo

---
 demo/homeassistant/flake.nix | 16 +++++++++++++---
 demo/nextcloud/flake.nix     | 18 ++++++++++++++----
 docs/usage.md                |  6 ++----
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/demo/homeassistant/flake.nix b/demo/homeassistant/flake.nix
index 878bc66..4fa9362 100644
--- a/demo/homeassistant/flake.nix
+++ b/demo/homeassistant/flake.nix
@@ -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;
diff --git a/demo/nextcloud/flake.nix b/demo/nextcloud/flake.nix
index 6668fb0..01ccb5e 100644
--- a/demo/nextcloud/flake.nix
+++ b/demo/nextcloud/flake.nix
@@ -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;
diff --git a/docs/usage.md b/docs/usage.md
index 6e742a2..b64e4a7 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -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