mod: do not import sops module in the default module
This commit is contained in:
parent
ac5df335ba
commit
a2b274ca80
2 changed files with 9 additions and 4 deletions
|
|
@ -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`.
|
||||
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.
|
||||
|
|
|
|||
|
|
@ -65,7 +65,10 @@
|
|||
{
|
||||
packages.manualHtml = pkgs.callPackage ./docs {
|
||||
inherit nmdsrc;
|
||||
allModules = self.nixosModules.all.imports ++ contractDummyModules;
|
||||
allModules = self.nixosModules.default.imports
|
||||
++ [
|
||||
self.nixosModules.sops
|
||||
] ++ contractDummyModules;
|
||||
release = builtins.readFile ./VERSION;
|
||||
|
||||
substituteVersionIn = [
|
||||
|
|
@ -284,8 +287,7 @@
|
|||
) // {
|
||||
herculesCI.ciSystems = [ "x86_64-linux" ];
|
||||
|
||||
nixosModules.default = self.nixosModules.all;
|
||||
nixosModules.all = {
|
||||
nixosModules.default = {
|
||||
imports = [
|
||||
# blocks
|
||||
self.nixosModules.authelia
|
||||
|
|
@ -298,7 +300,6 @@
|
|||
self.nixosModules.postgresql
|
||||
self.nixosModules.restic
|
||||
self.nixosModules.ssl
|
||||
self.nixosModules.sops
|
||||
self.nixosModules.tinyproxy
|
||||
self.nixosModules.vpn
|
||||
self.nixosModules.zfs
|
||||
|
|
|
|||
Loading…
Reference in a new issue