refactor: move modules to common folder since separation was unsound

This commit is contained in:
oddlama 2023-12-17 17:31:52 +01:00
parent 32ce7fe25d
commit 558f67ee7d
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
16 changed files with 15 additions and 22 deletions

View file

@ -26,13 +26,11 @@ Make sure to utilize the github search if you know what you need!
These just add configuration unconditionally and don't expose any further options. These just add configuration unconditionally and don't expose any further options.
- `modules/optional/` contains configuration that is only needed sometimes, and which should - `modules/optional/` contains configuration that is only needed sometimes, and which should
be included explicitly by hosts that require it. be included explicitly by hosts that require it.
- `modules/meta/` contains meta-modules that simplify the option interface of existing options. - `modules/*` contains regular modules and meta-modules that simplify the option interface of existing options.
I use this for stuff that I don't need on all my hosts and that may require different settings I use this for stuff that I don't need on all my hosts and that may require different settings
for each host while sharing a common basis. for each host while sharing a common basis.
Some of these are "meta" in the sense that they depend on their own definitions on multiple hosts (wireguard). Some of these are "meta" in the sense that they depend on their own definitions on multiple hosts (wireguard).
These are probably as opinionated as stuff in `modules/config/` but may be a little more general. These are probably as opinionated as stuff in `modules/config/` but may be a little more general.
The `wireguard` module would even be a candidate for extraction to a separate flake, together with the related apps.
- `modules/*/` regular modules related to <xyz>, similar structure as in `nixpkgs/nixos/modules`
- `nix/` library functions and flake plumbing - `nix/` library functions and flake plumbing
- `generate-installer-package.nix` Helper package that that will be available in our iso images. This provides the `install-system` command that will do a full install including partitioning. - `generate-installer-package.nix` Helper package that that will be available in our iso images. This provides the `install-system` command that will do a full install including partitioning.

View file

@ -27,25 +27,20 @@
./guests ./guests
# TODO merge as ./* ./acme-wildcard.nix
./meta/kanidm.nix ./deterministic-ids.nix
./meta/nginx.nix ./distributed-config.nix
./meta/oauth2-proxy.nix ./interface-naming.nix
./meta/promtail.nix ./kanidm.nix
./meta/telegraf.nix ./meta.nix
./meta/wireguard.nix ./nginx.nix
./meta/wireguard-proxy.nix ./oauth2-proxy.nix
./promtail.nix
./networking/interface-naming.nix ./provided-domains.nix
./networking/provided-domains.nix ./secrets.nix
./telegraf.nix
./repo/distributed-config.nix ./wireguard-proxy.nix
./repo/meta.nix ./wireguard.nix
./repo/secrets.nix
./security/acme-wildcard.nix
./system/deterministic-ids.nix
]; ];
nixpkgs.overlays = [ nixpkgs.overlays = [