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

mod: do not import sops module in the default module

Browse source
This commit is contained in:
ibizaman 2025-10-28 09:21:14 +01:00 committed by Pierre Penninckx
parent ac5df335ba
commit a2b274ca80
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/usage.md
View file

@ -27,6 +27,10 @@ imports = [
]; ];
``` ```
If you use `sops-nix` for secrets, SHB provides an additional module,
not imported in the `default` module. It can be added by importing
`inputs.selfhostblocks.sops`.
Self Host Blocks provides its own `pkgs.lib` and `nixpkgs`. Self Host Blocks provides its own `pkgs.lib` and `nixpkgs`.
It is required to use the provided ones as input for your deployments, It is required to use the provided ones as input for your deployments,
otherwise you might end up blocked when Self Host Blocks patches a module, function or package. otherwise you might end up blocked when Self Host Blocks patches a module, function or package.

9
flake.nix
View file

@ -65,7 +65,10 @@
{ {
packages.manualHtml = pkgs.callPackage ./docs { packages.manualHtml = pkgs.callPackage ./docs {
inherit nmdsrc; inherit nmdsrc;
allModules = self.nixosModules.all.imports ++ contractDummyModules; allModules = self.nixosModules.default.imports
++ [
self.nixosModules.sops
] ++ contractDummyModules;
release = builtins.readFile ./VERSION; release = builtins.readFile ./VERSION;
substituteVersionIn = [ substituteVersionIn = [
@ -284,8 +287,7 @@
) // { ) // {
herculesCI.ciSystems = [ "x86_64-linux" ]; herculesCI.ciSystems = [ "x86_64-linux" ];
nixosModules.default = self.nixosModules.all; nixosModules.default = {
nixosModules.all = {
imports = [ imports = [
# blocks # blocks
self.nixosModules.authelia self.nixosModules.authelia
@ -298,7 +300,6 @@
self.nixosModules.postgresql self.nixosModules.postgresql
self.nixosModules.restic self.nixosModules.restic
self.nixosModules.ssl self.nixosModules.ssl
self.nixosModules.sops
self.nixosModules.tinyproxy self.nixosModules.tinyproxy
self.nixosModules.vpn self.nixosModules.vpn
self.nixosModules.zfs self.nixosModules.zfs