From 50d192c8090075c66935601d90850a3deee3e121 Mon Sep 17 00:00:00 2001 From: Nathan Date: Tue, 20 Jan 2026 13:34:12 -0600 Subject: [PATCH] reorganize --- flake.nix | 4 ++-- {system/profiles => profiles}/container/default.nix | 0 {system/profiles => profiles}/homebox/default.nix | 0 {system/profiles => profiles}/iso/default.nix | 0 {system/profiles => profiles}/jesstop/default.nix | 0 .../jesstop/hardware-configuration.nix | 0 {system/profiles => profiles}/laptop/default.nix | 0 {system/profiles => profiles}/live/default.nix | 0 {system/profiles => profiles}/live/disko.nix | 0 {system/profiles => profiles}/live/secrets.yaml | 0 {system/profiles => profiles}/pi4/default.nix | 0 {system/profiles => profiles}/pi4/disko.nix | 0 .../pi4/hardware-configuration.nix | 0 {system/profiles => profiles}/pi4/secrets.yaml | 0 system/default.nix | 12 ++++++------ system/services/default.nix | 10 ---------- .../containers/authentik/default.nix | 0 .../containers/code-server/default.nix | 0 .../containers/default.nix | 0 .../containers/gitea/default.nix | 0 .../containers/gitlab/default.nix | 0 .../containers/homeassistant/default.nix | 0 .../containers/jellyfin/default.nix | 0 .../containers/keycloak/default.nix | 0 .../containers/minecraft/default.nix | 0 .../containers/n8n/default.nix | 0 .../containers/netbird/default.nix | 0 .../containers/nextcloud/default.nix | 0 .../containers/nginx/default.nix | 0 .../containers/novnc/default.nix | 0 .../containers/ntfy/default.nix | 0 .../containers/openwebui/default.nix | 0 .../containers/rustdesk/default.nix | 0 .../containers/sandbox/default.nix | 0 .../containers/traefik/default.nix | 0 .../containers/wyoming/default.nix | 0 system/virtualization/default.nix | 9 +++++++++ .../docker/authentik/default.nix | 0 .../{services => virtualization}/docker/default.nix | 0 .../docker/ollama/default.nix | 0 .../docker/pihole/default.nix | 0 .../docker/portainer/default.nix | 2 +- .../docker/searxng/default.nix | 0 system/virtualization/virtual-machines/default.nix | 1 + 44 files changed, 19 insertions(+), 19 deletions(-) rename {system/profiles => profiles}/container/default.nix (100%) rename {system/profiles => profiles}/homebox/default.nix (100%) rename {system/profiles => profiles}/iso/default.nix (100%) rename {system/profiles => profiles}/jesstop/default.nix (100%) rename {system/profiles => profiles}/jesstop/hardware-configuration.nix (100%) rename {system/profiles => profiles}/laptop/default.nix (100%) rename {system/profiles => profiles}/live/default.nix (100%) rename {system/profiles => profiles}/live/disko.nix (100%) rename {system/profiles => profiles}/live/secrets.yaml (100%) rename {system/profiles => profiles}/pi4/default.nix (100%) rename {system/profiles => profiles}/pi4/disko.nix (100%) rename {system/profiles => profiles}/pi4/hardware-configuration.nix (100%) rename {system/profiles => profiles}/pi4/secrets.yaml (100%) rename system/{services => virtualization}/containers/authentik/default.nix (100%) rename system/{services => virtualization}/containers/code-server/default.nix (100%) rename system/{services => virtualization}/containers/default.nix (100%) rename system/{services => virtualization}/containers/gitea/default.nix (100%) rename system/{services => virtualization}/containers/gitlab/default.nix (100%) rename system/{services => virtualization}/containers/homeassistant/default.nix (100%) rename system/{services => virtualization}/containers/jellyfin/default.nix (100%) rename system/{services => virtualization}/containers/keycloak/default.nix (100%) rename system/{services => virtualization}/containers/minecraft/default.nix (100%) rename system/{services => virtualization}/containers/n8n/default.nix (100%) rename system/{services => virtualization}/containers/netbird/default.nix (100%) rename system/{services => virtualization}/containers/nextcloud/default.nix (100%) rename system/{services => virtualization}/containers/nginx/default.nix (100%) rename system/{services => virtualization}/containers/novnc/default.nix (100%) rename system/{services => virtualization}/containers/ntfy/default.nix (100%) rename system/{services => virtualization}/containers/openwebui/default.nix (100%) rename system/{services => virtualization}/containers/rustdesk/default.nix (100%) rename system/{services => virtualization}/containers/sandbox/default.nix (100%) rename system/{services => virtualization}/containers/traefik/default.nix (100%) rename system/{services => virtualization}/containers/wyoming/default.nix (100%) create mode 100644 system/virtualization/default.nix rename system/{services => virtualization}/docker/authentik/default.nix (100%) rename system/{services => virtualization}/docker/default.nix (100%) rename system/{services => virtualization}/docker/ollama/default.nix (100%) rename system/{services => virtualization}/docker/pihole/default.nix (100%) rename system/{services => virtualization}/docker/portainer/default.nix (95%) rename system/{services => virtualization}/docker/searxng/default.nix (100%) create mode 100644 system/virtualization/virtual-machines/default.nix diff --git a/flake.nix b/flake.nix index 9193598..2b7d205 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,7 @@ outputs = { self, nixpkgs, home-manager, ... } @ inputs: { profiles = let - dir = builtins.readDir ./system/profiles; + dir = builtins.readDir ./profiles; filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir); in (builtins.listToAttrs (builtins.map @@ -51,7 +51,7 @@ value = { ... }: { imports = [ ./system - ./system/profiles/${name} + ./profiles/${name} ]; }; })) filtered) diff --git a/system/profiles/container/default.nix b/profiles/container/default.nix similarity index 100% rename from system/profiles/container/default.nix rename to profiles/container/default.nix diff --git a/system/profiles/homebox/default.nix b/profiles/homebox/default.nix similarity index 100% rename from system/profiles/homebox/default.nix rename to profiles/homebox/default.nix diff --git a/system/profiles/iso/default.nix b/profiles/iso/default.nix similarity index 100% rename from system/profiles/iso/default.nix rename to profiles/iso/default.nix diff --git a/system/profiles/jesstop/default.nix b/profiles/jesstop/default.nix similarity index 100% rename from system/profiles/jesstop/default.nix rename to profiles/jesstop/default.nix diff --git a/system/profiles/jesstop/hardware-configuration.nix b/profiles/jesstop/hardware-configuration.nix similarity index 100% rename from system/profiles/jesstop/hardware-configuration.nix rename to profiles/jesstop/hardware-configuration.nix diff --git a/system/profiles/laptop/default.nix b/profiles/laptop/default.nix similarity index 100% rename from system/profiles/laptop/default.nix rename to profiles/laptop/default.nix diff --git a/system/profiles/live/default.nix b/profiles/live/default.nix similarity index 100% rename from system/profiles/live/default.nix rename to profiles/live/default.nix diff --git a/system/profiles/live/disko.nix b/profiles/live/disko.nix similarity index 100% rename from system/profiles/live/disko.nix rename to profiles/live/disko.nix diff --git a/system/profiles/live/secrets.yaml b/profiles/live/secrets.yaml similarity index 100% rename from system/profiles/live/secrets.yaml rename to profiles/live/secrets.yaml diff --git a/system/profiles/pi4/default.nix b/profiles/pi4/default.nix similarity index 100% rename from system/profiles/pi4/default.nix rename to profiles/pi4/default.nix diff --git a/system/profiles/pi4/disko.nix b/profiles/pi4/disko.nix similarity index 100% rename from system/profiles/pi4/disko.nix rename to profiles/pi4/disko.nix diff --git a/system/profiles/pi4/hardware-configuration.nix b/profiles/pi4/hardware-configuration.nix similarity index 100% rename from system/profiles/pi4/hardware-configuration.nix rename to profiles/pi4/hardware-configuration.nix diff --git a/system/profiles/pi4/secrets.yaml b/profiles/pi4/secrets.yaml similarity index 100% rename from system/profiles/pi4/secrets.yaml rename to profiles/pi4/secrets.yaml diff --git a/system/default.nix b/system/default.nix index a2e0c3b..1bcd87d 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,11 +1,11 @@ { config, lib, pkgs, nixpkgs, ... }: { - imports = [ - ./services - ./packages - ./programs - ./users - ]; + imports = let + dir = builtins.readDir ./.; + in builtins.map (x: ./${x}) (builtins.filter + (file: (dir.${file} == "directory")) + (builtins.attrNames dir) + ); options.sysconfig = with lib; { host = mkOption { diff --git a/system/services/default.nix b/system/services/default.nix index 2e559d1..8c32d01 100644 --- a/system/services/default.nix +++ b/system/services/default.nix @@ -6,14 +6,4 @@ (file: (dir.${file} == "directory")) (builtins.attrNames dir) ); - /*imports = [ - ./ollama - ./wyoming - ./openssh - ./pipewire - ./containers - ./sddm - ./novnc - ./kdePlasma6 - ];*/ } diff --git a/system/services/containers/authentik/default.nix b/system/virtualization/containers/authentik/default.nix similarity index 100% rename from system/services/containers/authentik/default.nix rename to system/virtualization/containers/authentik/default.nix diff --git a/system/services/containers/code-server/default.nix b/system/virtualization/containers/code-server/default.nix similarity index 100% rename from system/services/containers/code-server/default.nix rename to system/virtualization/containers/code-server/default.nix diff --git a/system/services/containers/default.nix b/system/virtualization/containers/default.nix similarity index 100% rename from system/services/containers/default.nix rename to system/virtualization/containers/default.nix diff --git a/system/services/containers/gitea/default.nix b/system/virtualization/containers/gitea/default.nix similarity index 100% rename from system/services/containers/gitea/default.nix rename to system/virtualization/containers/gitea/default.nix diff --git a/system/services/containers/gitlab/default.nix b/system/virtualization/containers/gitlab/default.nix similarity index 100% rename from system/services/containers/gitlab/default.nix rename to system/virtualization/containers/gitlab/default.nix diff --git a/system/services/containers/homeassistant/default.nix b/system/virtualization/containers/homeassistant/default.nix similarity index 100% rename from system/services/containers/homeassistant/default.nix rename to system/virtualization/containers/homeassistant/default.nix diff --git a/system/services/containers/jellyfin/default.nix b/system/virtualization/containers/jellyfin/default.nix similarity index 100% rename from system/services/containers/jellyfin/default.nix rename to system/virtualization/containers/jellyfin/default.nix diff --git a/system/services/containers/keycloak/default.nix b/system/virtualization/containers/keycloak/default.nix similarity index 100% rename from system/services/containers/keycloak/default.nix rename to system/virtualization/containers/keycloak/default.nix diff --git a/system/services/containers/minecraft/default.nix b/system/virtualization/containers/minecraft/default.nix similarity index 100% rename from system/services/containers/minecraft/default.nix rename to system/virtualization/containers/minecraft/default.nix diff --git a/system/services/containers/n8n/default.nix b/system/virtualization/containers/n8n/default.nix similarity index 100% rename from system/services/containers/n8n/default.nix rename to system/virtualization/containers/n8n/default.nix diff --git a/system/services/containers/netbird/default.nix b/system/virtualization/containers/netbird/default.nix similarity index 100% rename from system/services/containers/netbird/default.nix rename to system/virtualization/containers/netbird/default.nix diff --git a/system/services/containers/nextcloud/default.nix b/system/virtualization/containers/nextcloud/default.nix similarity index 100% rename from system/services/containers/nextcloud/default.nix rename to system/virtualization/containers/nextcloud/default.nix diff --git a/system/services/containers/nginx/default.nix b/system/virtualization/containers/nginx/default.nix similarity index 100% rename from system/services/containers/nginx/default.nix rename to system/virtualization/containers/nginx/default.nix diff --git a/system/services/containers/novnc/default.nix b/system/virtualization/containers/novnc/default.nix similarity index 100% rename from system/services/containers/novnc/default.nix rename to system/virtualization/containers/novnc/default.nix diff --git a/system/services/containers/ntfy/default.nix b/system/virtualization/containers/ntfy/default.nix similarity index 100% rename from system/services/containers/ntfy/default.nix rename to system/virtualization/containers/ntfy/default.nix diff --git a/system/services/containers/openwebui/default.nix b/system/virtualization/containers/openwebui/default.nix similarity index 100% rename from system/services/containers/openwebui/default.nix rename to system/virtualization/containers/openwebui/default.nix diff --git a/system/services/containers/rustdesk/default.nix b/system/virtualization/containers/rustdesk/default.nix similarity index 100% rename from system/services/containers/rustdesk/default.nix rename to system/virtualization/containers/rustdesk/default.nix diff --git a/system/services/containers/sandbox/default.nix b/system/virtualization/containers/sandbox/default.nix similarity index 100% rename from system/services/containers/sandbox/default.nix rename to system/virtualization/containers/sandbox/default.nix diff --git a/system/services/containers/traefik/default.nix b/system/virtualization/containers/traefik/default.nix similarity index 100% rename from system/services/containers/traefik/default.nix rename to system/virtualization/containers/traefik/default.nix diff --git a/system/services/containers/wyoming/default.nix b/system/virtualization/containers/wyoming/default.nix similarity index 100% rename from system/services/containers/wyoming/default.nix rename to system/virtualization/containers/wyoming/default.nix diff --git a/system/virtualization/default.nix b/system/virtualization/default.nix new file mode 100644 index 0000000..8c32d01 --- /dev/null +++ b/system/virtualization/default.nix @@ -0,0 +1,9 @@ +{ ... }: { + + imports = let + dir = builtins.readDir ./.; + in builtins.map (x: ./${x}) (builtins.filter + (file: (dir.${file} == "directory")) + (builtins.attrNames dir) + ); +} diff --git a/system/services/docker/authentik/default.nix b/system/virtualization/docker/authentik/default.nix similarity index 100% rename from system/services/docker/authentik/default.nix rename to system/virtualization/docker/authentik/default.nix diff --git a/system/services/docker/default.nix b/system/virtualization/docker/default.nix similarity index 100% rename from system/services/docker/default.nix rename to system/virtualization/docker/default.nix diff --git a/system/services/docker/ollama/default.nix b/system/virtualization/docker/ollama/default.nix similarity index 100% rename from system/services/docker/ollama/default.nix rename to system/virtualization/docker/ollama/default.nix diff --git a/system/services/docker/pihole/default.nix b/system/virtualization/docker/pihole/default.nix similarity index 100% rename from system/services/docker/pihole/default.nix rename to system/virtualization/docker/pihole/default.nix diff --git a/system/services/docker/portainer/default.nix b/system/virtualization/docker/portainer/default.nix similarity index 95% rename from system/services/docker/portainer/default.nix rename to system/virtualization/docker/portainer/default.nix index e26fd8a..3c28844 100644 --- a/system/services/docker/portainer/default.nix +++ b/system/virtualization/docker/portainer/default.nix @@ -27,7 +27,7 @@ labels = { "traefik.http.routers.portainer.entrypoints" = "localsecure"; - "traefik.http.routers.portainer.rule" = "Host(`prtnr.esotericbytes.com`) || Host(`portainer.esotericbytes.com`)"; + "traefik.http.routers.portainer.rule" = "Host(`prtnr.esotericbytes.com`)"; "traefik.http.routers.portainer.service" = "portainer"; "traefik.http.routers.portainer.tls.certResolver" = "cloudflare"; diff --git a/system/services/docker/searxng/default.nix b/system/virtualization/docker/searxng/default.nix similarity index 100% rename from system/services/docker/searxng/default.nix rename to system/virtualization/docker/searxng/default.nix diff --git a/system/virtualization/virtual-machines/default.nix b/system/virtualization/virtual-machines/default.nix new file mode 100644 index 0000000..c157af7 --- /dev/null +++ b/system/virtualization/virtual-machines/default.nix @@ -0,0 +1 @@ +{ ... }: {}