From 558f67ee7dde691168dc8e5433345de52ac1c15d Mon Sep 17 00:00:00 2001 From: oddlama Date: Sun, 17 Dec 2023 17:31:52 +0100 Subject: [PATCH] refactor: move modules to common folder since separation was unsound --- STRUCTURE.md | 4 +-- modules/{security => }/acme-wildcard.nix | 0 modules/default.nix | 33 ++++++++----------- modules/{system => }/deterministic-ids.nix | 0 modules/{repo => }/distributed-config.nix | 0 modules/{networking => }/interface-naming.nix | 0 modules/{meta => }/kanidm.nix | 0 modules/{repo => }/meta.nix | 0 modules/{meta => }/nginx.nix | 0 modules/{meta => }/oauth2-proxy.nix | 0 modules/{meta => }/promtail.nix | 0 modules/{networking => }/provided-domains.nix | 0 modules/{repo => }/secrets.nix | 0 modules/{meta => }/telegraf.nix | 0 modules/{meta => }/wireguard-proxy.nix | 0 modules/{meta => }/wireguard.nix | 0 16 files changed, 15 insertions(+), 22 deletions(-) rename modules/{security => }/acme-wildcard.nix (100%) rename modules/{system => }/deterministic-ids.nix (100%) rename modules/{repo => }/distributed-config.nix (100%) rename modules/{networking => }/interface-naming.nix (100%) rename modules/{meta => }/kanidm.nix (100%) rename modules/{repo => }/meta.nix (100%) rename modules/{meta => }/nginx.nix (100%) rename modules/{meta => }/oauth2-proxy.nix (100%) rename modules/{meta => }/promtail.nix (100%) rename modules/{networking => }/provided-domains.nix (100%) rename modules/{repo => }/secrets.nix (100%) rename modules/{meta => }/telegraf.nix (100%) rename modules/{meta => }/wireguard-proxy.nix (100%) rename modules/{meta => }/wireguard.nix (100%) diff --git a/STRUCTURE.md b/STRUCTURE.md index 0849717..74cbe0d 100644 --- a/STRUCTURE.md +++ b/STRUCTURE.md @@ -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. - `modules/optional/` contains configuration that is only needed sometimes, and which should 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 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). 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 , similar structure as in `nixpkgs/nixos/modules` - `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. diff --git a/modules/security/acme-wildcard.nix b/modules/acme-wildcard.nix similarity index 100% rename from modules/security/acme-wildcard.nix rename to modules/acme-wildcard.nix diff --git a/modules/default.nix b/modules/default.nix index 9d6d277..077aa13 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -27,25 +27,20 @@ ./guests - # TODO merge as ./* - ./meta/kanidm.nix - ./meta/nginx.nix - ./meta/oauth2-proxy.nix - ./meta/promtail.nix - ./meta/telegraf.nix - ./meta/wireguard.nix - ./meta/wireguard-proxy.nix - - ./networking/interface-naming.nix - ./networking/provided-domains.nix - - ./repo/distributed-config.nix - ./repo/meta.nix - ./repo/secrets.nix - - ./security/acme-wildcard.nix - - ./system/deterministic-ids.nix + ./acme-wildcard.nix + ./deterministic-ids.nix + ./distributed-config.nix + ./interface-naming.nix + ./kanidm.nix + ./meta.nix + ./nginx.nix + ./oauth2-proxy.nix + ./promtail.nix + ./provided-domains.nix + ./secrets.nix + ./telegraf.nix + ./wireguard-proxy.nix + ./wireguard.nix ]; nixpkgs.overlays = [ diff --git a/modules/system/deterministic-ids.nix b/modules/deterministic-ids.nix similarity index 100% rename from modules/system/deterministic-ids.nix rename to modules/deterministic-ids.nix diff --git a/modules/repo/distributed-config.nix b/modules/distributed-config.nix similarity index 100% rename from modules/repo/distributed-config.nix rename to modules/distributed-config.nix diff --git a/modules/networking/interface-naming.nix b/modules/interface-naming.nix similarity index 100% rename from modules/networking/interface-naming.nix rename to modules/interface-naming.nix diff --git a/modules/meta/kanidm.nix b/modules/kanidm.nix similarity index 100% rename from modules/meta/kanidm.nix rename to modules/kanidm.nix diff --git a/modules/repo/meta.nix b/modules/meta.nix similarity index 100% rename from modules/repo/meta.nix rename to modules/meta.nix diff --git a/modules/meta/nginx.nix b/modules/nginx.nix similarity index 100% rename from modules/meta/nginx.nix rename to modules/nginx.nix diff --git a/modules/meta/oauth2-proxy.nix b/modules/oauth2-proxy.nix similarity index 100% rename from modules/meta/oauth2-proxy.nix rename to modules/oauth2-proxy.nix diff --git a/modules/meta/promtail.nix b/modules/promtail.nix similarity index 100% rename from modules/meta/promtail.nix rename to modules/promtail.nix diff --git a/modules/networking/provided-domains.nix b/modules/provided-domains.nix similarity index 100% rename from modules/networking/provided-domains.nix rename to modules/provided-domains.nix diff --git a/modules/repo/secrets.nix b/modules/secrets.nix similarity index 100% rename from modules/repo/secrets.nix rename to modules/secrets.nix diff --git a/modules/meta/telegraf.nix b/modules/telegraf.nix similarity index 100% rename from modules/meta/telegraf.nix rename to modules/telegraf.nix diff --git a/modules/meta/wireguard-proxy.nix b/modules/wireguard-proxy.nix similarity index 100% rename from modules/meta/wireguard-proxy.nix rename to modules/wireguard-proxy.nix diff --git a/modules/meta/wireguard.nix b/modules/wireguard.nix similarity index 100% rename from modules/meta/wireguard.nix rename to modules/wireguard.nix