From 9f449c7ea2017e5abfd074824bd6771bd1cd72dd Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Thu, 6 Aug 2026 09:50:13 -0300 Subject: [PATCH] refactor(hosts): separate nixos and system-manager hosts Assisted-by: pi (gpt-5.6-sol) --- .gitattributes | 3 +-- .sops.yaml | 10 ++++---- AGENTS.md | 24 ++++++++++--------- README.md | 3 ++- flake.nix | 14 +++++------ hosts/{ => nixos}/alcyone/default.nix | 0 .../alcyone/hardware-configuration.nix | 0 hosts/{ => nixos}/alcyone/secrets.yaml | 0 .../alcyone/services/cgit/.gitignore | 0 .../alcyone/services/cgit/cgit.scss | 0 .../alcyone/services/cgit/default.nix | 0 .../alcyone/services/cgit/head.html | 0 .../alcyone/services/cgit/nav.html | 0 .../{ => nixos}/alcyone/services/default.nix | 0 .../alcyone/services/files-server.nix | 0 .../{ => nixos}/alcyone/services/firefly.nix | 0 .../alcyone/services/git-remote.nix | 0 .../services/grafana/dashboards/hosts.json | 0 .../alcyone/services/grafana/default.nix | 0 .../alcyone/services/headscale.nix | 0 hosts/{ => nixos}/alcyone/services/lumis.nix | 0 hosts/{ => nixos}/alcyone/services/mail.nix | 0 .../alcyone/services/prometheus.nix | 0 .../{ => nixos}/alcyone/services/radicale.nix | 0 .../alcyone/services/website/default.nix | 4 ++-- .../services/website/scripts/nix-installer.sh | 0 .../services/website/scripts/setup-gpg.sh | 0 .../alcyone/services/website/shortner.nix | 0 .../alcyone/ssh_host_ed25519_key.pub | 0 hosts/{ => nixos}/atlas/default.nix | 0 .../atlas/hardware-configuration.nix | 0 hosts/{ => nixos}/atlas/llm-server.nix | 0 .../atlas/ssh_host_ed25519_key.pub | 0 hosts/{ => nixos}/celaeno/default.nix | 0 .../celaeno/hardware-configuration.nix | 0 hosts/{ => nixos}/celaeno/secrets.yaml | 0 .../celaeno/services/binary-cache.nix | 0 .../{ => nixos}/celaeno/services/default.nix | 0 .../celaeno/services/hydra/default.nix | 0 .../celaeno/services/hydra/machines.nix | 0 .../celaeno/ssh_host_ed25519_key.pub | 0 .../common/global/auto-upgrade.nix | 0 hosts/{ => nixos}/common/global/default.nix | 0 .../common/global/display-manager.nix | 0 hosts/{ => nixos}/common/global/fish.nix | 0 hosts/{ => nixos}/common/global/gamemode.nix | 0 .../{ => nixos}/common/global/kdeconnect.nix | 0 hosts/{ => nixos}/common/global/locale.nix | 0 hosts/{ => nixos}/common/global/mandoc.nix | 0 hosts/{ => nixos}/common/global/nix-ld.nix | 0 hosts/{ => nixos}/common/global/nix.nix | 0 hosts/{ => nixos}/common/global/openssh.nix | 0 .../common/global/optin-persistence.nix | 0 hosts/{ => nixos}/common/global/podman.nix | 0 .../global/prometheus-node-exporter.nix | 0 .../common/global/security-fixes.nix | 0 hosts/{ => nixos}/common/global/sops.nix | 0 .../common/global/steam-hardware.nix | 0 .../{ => nixos}/common/global/swappiness.nix | 0 .../common/global/systemd-initrd.nix | 0 hosts/{ => nixos}/common/global/tailscale.nix | 0 hosts/{ => nixos}/common/global/tpm.nix | 0 hosts/{ => nixos}/common/global/upower.nix | 0 hosts/{ => nixos}/common/optional/cups.nix | 0 hosts/{ => nixos}/common/optional/docker.nix | 0 .../common/optional/dynamic-timezone.nix | 0 .../common/optional/eduroam-cert.pem | 0 .../common/optional/ephemeral-btrfs.nix | 0 .../{ => nixos}/common/optional/fail2ban.nix | 0 .../common/optional/firefox-session.nix | 0 .../{ => nixos}/common/optional/gamemode.nix | 0 hosts/{ => nixos}/common/optional/gnome.nix | 0 .../common/optional/jellyfin-session.nix | 0 hosts/{ => nixos}/common/optional/keyd.nix | 0 hosts/{ => nixos}/common/optional/mysql.nix | 0 hosts/{ => nixos}/common/optional/nginx.nix | 0 .../{ => nixos}/common/optional/pantheon.nix | 0 .../common/optional/peripherals.nix | 0 .../{ => nixos}/common/optional/pipewire.nix | 0 .../{ => nixos}/common/optional/postgres.nix | 0 .../{ => nixos}/common/optional/quietboot.nix | 0 hosts/{ => nixos}/common/optional/regreet.nix | 0 .../common/optional/secure-boot.nix | 0 .../common/optional/ssh-serve-store.nix | 0 .../common/optional/starcitizen-fixes.nix | 0 .../optional/steam-gamescope-session.nix | 0 .../common/optional/systemd-boot.nix | 0 .../common/optional/tailscale-exit-node.nix | 0 hosts/{ => nixos}/common/optional/tlp.nix | 0 .../{ => nixos}/common/optional/waydroid.nix | 0 .../{ => nixos}/common/optional/wireless.nix | 0 .../{ => nixos}/common/optional/wireshark.nix | 0 .../common/optional/x11-no-suspend.nix | 0 hosts/{ => nixos}/common/secrets.yaml | 0 .../common/users/gabriel/default.nix | 4 ++-- .../common/users/layla/default.nix | 0 .../common/users/layla/packages.nix | 0 hosts/{ => nixos}/maia/default.nix | 0 .../maia/hardware-configuration.nix | 0 .../{ => nixos}/maia/ssh_host_ed25519_key.pub | 0 hosts/{ => nixos}/merope/default.nix | 0 .../merope/hardware-configuration.nix | 0 hosts/{ => nixos}/merope/secrets.yaml | 0 hosts/{ => nixos}/merope/services/default.nix | 0 hosts/{ => nixos}/merope/services/immich.nix | 0 .../merope/services/media/bazarr.nix | 0 .../merope/services/media/default.nix | 0 .../merope/services/media/deluge.nix | 0 .../merope/services/media/flaresolverr.nix | 0 .../merope/services/media/jellyfin.nix | 0 .../merope/services/media/jellysearch.nix | 0 .../merope/services/media/jellyseerr.nix | 0 .../merope/services/media/lidarr.nix | 0 .../merope/services/media/prowlarr.nix | 0 .../merope/services/media/radarr.nix | 0 .../merope/services/media/recyclarr.nix | 0 .../merope/services/media/sabnzbd.nix | 0 .../merope/services/media/sonarr.nix | 0 .../merope/ssh_host_ed25519_key.pub | 0 hosts/{ => nixos}/pleione/default.nix | 0 .../pleione/hardware-configuration.nix | 0 hosts/{ => nixos}/pleione/media-user.nix | 0 hosts/{ => nixos}/pleione/remote-control.nix | 0 .../pleione/ssh_host_ed25519_key.pub | 0 hosts/{ => nixos}/taygeta/default.nix | 0 .../taygeta/hardware-configuration.nix | 0 hosts/{ => nixos}/taygeta/secrets.yaml | 0 .../{ => nixos}/taygeta/services/default.nix | 0 .../{ => nixos}/taygeta/services/factorio.nix | 0 .../services/minecraft/aikar-flags.nix | 0 .../taygeta/services/minecraft/default.nix | 0 .../taygeta/services/minecraft/ops.nix | 0 .../servers/gtnh/configs/SpecialMobs.cfg | 0 .../servers/gtnh/configs/dynmap.default.nix | 0 .../servers/gtnh/configs/journeymap-world.cfg | 0 .../servers/gtnh/configs/serverutilities.cfg | 0 .../minecraft/servers/gtnh/default.nix | 0 .../services/minecraft/servers/gtnh/gtnh.nix | 0 .../taygeta/services/minecraft/whitelist.nix | 0 .../taygeta/ssh_host_ed25519_key.pub | 0 hosts/system-manager/.gitkeep | 0 141 files changed, 32 insertions(+), 30 deletions(-) rename hosts/{ => nixos}/alcyone/default.nix (100%) rename hosts/{ => nixos}/alcyone/hardware-configuration.nix (100%) rename hosts/{ => nixos}/alcyone/secrets.yaml (100%) rename hosts/{ => nixos}/alcyone/services/cgit/.gitignore (100%) rename hosts/{ => nixos}/alcyone/services/cgit/cgit.scss (100%) rename hosts/{ => nixos}/alcyone/services/cgit/default.nix (100%) rename hosts/{ => nixos}/alcyone/services/cgit/head.html (100%) rename hosts/{ => nixos}/alcyone/services/cgit/nav.html (100%) rename hosts/{ => nixos}/alcyone/services/default.nix (100%) rename hosts/{ => nixos}/alcyone/services/files-server.nix (100%) rename hosts/{ => nixos}/alcyone/services/firefly.nix (100%) rename hosts/{ => nixos}/alcyone/services/git-remote.nix (100%) rename hosts/{ => nixos}/alcyone/services/grafana/dashboards/hosts.json (100%) rename hosts/{ => nixos}/alcyone/services/grafana/default.nix (100%) rename hosts/{ => nixos}/alcyone/services/headscale.nix (100%) rename hosts/{ => nixos}/alcyone/services/lumis.nix (100%) rename hosts/{ => nixos}/alcyone/services/mail.nix (100%) rename hosts/{ => nixos}/alcyone/services/prometheus.nix (100%) rename hosts/{ => nixos}/alcyone/services/radicale.nix (100%) rename hosts/{ => nixos}/alcyone/services/website/default.nix (93%) rename hosts/{ => nixos}/alcyone/services/website/scripts/nix-installer.sh (100%) rename hosts/{ => nixos}/alcyone/services/website/scripts/setup-gpg.sh (100%) rename hosts/{ => nixos}/alcyone/services/website/shortner.nix (100%) rename hosts/{ => nixos}/alcyone/ssh_host_ed25519_key.pub (100%) rename hosts/{ => nixos}/atlas/default.nix (100%) rename hosts/{ => nixos}/atlas/hardware-configuration.nix (100%) rename hosts/{ => nixos}/atlas/llm-server.nix (100%) rename hosts/{ => nixos}/atlas/ssh_host_ed25519_key.pub (100%) rename hosts/{ => nixos}/celaeno/default.nix (100%) rename hosts/{ => nixos}/celaeno/hardware-configuration.nix (100%) rename hosts/{ => nixos}/celaeno/secrets.yaml (100%) rename hosts/{ => nixos}/celaeno/services/binary-cache.nix (100%) rename hosts/{ => nixos}/celaeno/services/default.nix (100%) rename hosts/{ => nixos}/celaeno/services/hydra/default.nix (100%) rename hosts/{ => nixos}/celaeno/services/hydra/machines.nix (100%) rename hosts/{ => nixos}/celaeno/ssh_host_ed25519_key.pub (100%) rename hosts/{ => nixos}/common/global/auto-upgrade.nix (100%) rename hosts/{ => nixos}/common/global/default.nix (100%) rename hosts/{ => nixos}/common/global/display-manager.nix (100%) rename hosts/{ => nixos}/common/global/fish.nix (100%) rename hosts/{ => nixos}/common/global/gamemode.nix (100%) rename hosts/{ => nixos}/common/global/kdeconnect.nix (100%) rename hosts/{ => nixos}/common/global/locale.nix (100%) rename hosts/{ => nixos}/common/global/mandoc.nix (100%) rename hosts/{ => nixos}/common/global/nix-ld.nix (100%) rename hosts/{ => nixos}/common/global/nix.nix (100%) rename hosts/{ => nixos}/common/global/openssh.nix (100%) rename hosts/{ => nixos}/common/global/optin-persistence.nix (100%) rename hosts/{ => nixos}/common/global/podman.nix (100%) rename hosts/{ => nixos}/common/global/prometheus-node-exporter.nix (100%) rename hosts/{ => nixos}/common/global/security-fixes.nix (100%) rename hosts/{ => nixos}/common/global/sops.nix (100%) rename hosts/{ => nixos}/common/global/steam-hardware.nix (100%) rename hosts/{ => nixos}/common/global/swappiness.nix (100%) rename hosts/{ => nixos}/common/global/systemd-initrd.nix (100%) rename hosts/{ => nixos}/common/global/tailscale.nix (100%) rename hosts/{ => nixos}/common/global/tpm.nix (100%) rename hosts/{ => nixos}/common/global/upower.nix (100%) rename hosts/{ => nixos}/common/optional/cups.nix (100%) rename hosts/{ => nixos}/common/optional/docker.nix (100%) rename hosts/{ => nixos}/common/optional/dynamic-timezone.nix (100%) rename hosts/{ => nixos}/common/optional/eduroam-cert.pem (100%) rename hosts/{ => nixos}/common/optional/ephemeral-btrfs.nix (100%) rename hosts/{ => nixos}/common/optional/fail2ban.nix (100%) rename hosts/{ => nixos}/common/optional/firefox-session.nix (100%) rename hosts/{ => nixos}/common/optional/gamemode.nix (100%) rename hosts/{ => nixos}/common/optional/gnome.nix (100%) rename hosts/{ => nixos}/common/optional/jellyfin-session.nix (100%) rename hosts/{ => nixos}/common/optional/keyd.nix (100%) rename hosts/{ => nixos}/common/optional/mysql.nix (100%) rename hosts/{ => nixos}/common/optional/nginx.nix (100%) rename hosts/{ => nixos}/common/optional/pantheon.nix (100%) rename hosts/{ => nixos}/common/optional/peripherals.nix (100%) rename hosts/{ => nixos}/common/optional/pipewire.nix (100%) rename hosts/{ => nixos}/common/optional/postgres.nix (100%) rename hosts/{ => nixos}/common/optional/quietboot.nix (100%) rename hosts/{ => nixos}/common/optional/regreet.nix (100%) rename hosts/{ => nixos}/common/optional/secure-boot.nix (100%) rename hosts/{ => nixos}/common/optional/ssh-serve-store.nix (100%) rename hosts/{ => nixos}/common/optional/starcitizen-fixes.nix (100%) rename hosts/{ => nixos}/common/optional/steam-gamescope-session.nix (100%) rename hosts/{ => nixos}/common/optional/systemd-boot.nix (100%) rename hosts/{ => nixos}/common/optional/tailscale-exit-node.nix (100%) rename hosts/{ => nixos}/common/optional/tlp.nix (100%) rename hosts/{ => nixos}/common/optional/waydroid.nix (100%) rename hosts/{ => nixos}/common/optional/wireless.nix (100%) rename hosts/{ => nixos}/common/optional/wireshark.nix (100%) rename hosts/{ => nixos}/common/optional/x11-no-suspend.nix (100%) rename hosts/{ => nixos}/common/secrets.yaml (100%) rename hosts/{ => nixos}/common/users/gabriel/default.nix (93%) rename hosts/{ => nixos}/common/users/layla/default.nix (100%) rename hosts/{ => nixos}/common/users/layla/packages.nix (100%) rename hosts/{ => nixos}/maia/default.nix (100%) rename hosts/{ => nixos}/maia/hardware-configuration.nix (100%) rename hosts/{ => nixos}/maia/ssh_host_ed25519_key.pub (100%) rename hosts/{ => nixos}/merope/default.nix (100%) rename hosts/{ => nixos}/merope/hardware-configuration.nix (100%) rename hosts/{ => nixos}/merope/secrets.yaml (100%) rename hosts/{ => nixos}/merope/services/default.nix (100%) rename hosts/{ => nixos}/merope/services/immich.nix (100%) rename hosts/{ => nixos}/merope/services/media/bazarr.nix (100%) rename hosts/{ => nixos}/merope/services/media/default.nix (100%) rename hosts/{ => nixos}/merope/services/media/deluge.nix (100%) rename hosts/{ => nixos}/merope/services/media/flaresolverr.nix (100%) rename hosts/{ => nixos}/merope/services/media/jellyfin.nix (100%) rename hosts/{ => nixos}/merope/services/media/jellysearch.nix (100%) rename hosts/{ => nixos}/merope/services/media/jellyseerr.nix (100%) rename hosts/{ => nixos}/merope/services/media/lidarr.nix (100%) rename hosts/{ => nixos}/merope/services/media/prowlarr.nix (100%) rename hosts/{ => nixos}/merope/services/media/radarr.nix (100%) rename hosts/{ => nixos}/merope/services/media/recyclarr.nix (100%) rename hosts/{ => nixos}/merope/services/media/sabnzbd.nix (100%) rename hosts/{ => nixos}/merope/services/media/sonarr.nix (100%) rename hosts/{ => nixos}/merope/ssh_host_ed25519_key.pub (100%) rename hosts/{ => nixos}/pleione/default.nix (100%) rename hosts/{ => nixos}/pleione/hardware-configuration.nix (100%) rename hosts/{ => nixos}/pleione/media-user.nix (100%) rename hosts/{ => nixos}/pleione/remote-control.nix (100%) rename hosts/{ => nixos}/pleione/ssh_host_ed25519_key.pub (100%) rename hosts/{ => nixos}/taygeta/default.nix (100%) rename hosts/{ => nixos}/taygeta/hardware-configuration.nix (100%) rename hosts/{ => nixos}/taygeta/secrets.yaml (100%) rename hosts/{ => nixos}/taygeta/services/default.nix (100%) rename hosts/{ => nixos}/taygeta/services/factorio.nix (100%) rename hosts/{ => nixos}/taygeta/services/minecraft/aikar-flags.nix (100%) rename hosts/{ => nixos}/taygeta/services/minecraft/default.nix (100%) rename hosts/{ => nixos}/taygeta/services/minecraft/ops.nix (100%) rename hosts/{ => nixos}/taygeta/services/minecraft/servers/gtnh/configs/SpecialMobs.cfg (100%) rename hosts/{ => nixos}/taygeta/services/minecraft/servers/gtnh/configs/dynmap.default.nix (100%) rename hosts/{ => nixos}/taygeta/services/minecraft/servers/gtnh/configs/journeymap-world.cfg (100%) rename hosts/{ => nixos}/taygeta/services/minecraft/servers/gtnh/configs/serverutilities.cfg (100%) rename hosts/{ => nixos}/taygeta/services/minecraft/servers/gtnh/default.nix (100%) rename hosts/{ => nixos}/taygeta/services/minecraft/servers/gtnh/gtnh.nix (100%) rename hosts/{ => nixos}/taygeta/services/minecraft/whitelist.nix (100%) rename hosts/{ => nixos}/taygeta/ssh_host_ed25519_key.pub (100%) create mode 100644 hosts/system-manager/.gitkeep diff --git a/.gitattributes b/.gitattributes index b3e954e2..a495ab91 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,3 @@ -nixos/hosts/*/secrets/*.yaml diff=sopsdiffer -nixos/common/secrets/*.yaml diff=sopsdiffer +hosts/nixos/**/secrets.yaml diff=sopsdiffer home/gabriel/**/*/*.yaml diff=sopsdiffer nix linguist-generated=true diff --git a/.sops.yaml b/.sops.yaml index f14e9696..eb110942 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -12,32 +12,32 @@ keys: - &maia age150kp4hx4qzfpcxayyfh8xcv8nf0uudppsknwgzgj724djqup2qvqz2gwj5 - &pleione age1mhlh8lj8jv58xy9mdhsarfyanckyx8c2xdu09xrn23nrc56e94xserztxx creation_rules: - - path_regex: hosts/taygeta/secrets.ya?ml$ + - path_regex: hosts/nixos/taygeta/secrets.ya?ml$ key_groups: - age: - *taygeta pgp: - *misterio - - path_regex: hosts/celaeno/secrets.ya?ml$ + - path_regex: hosts/nixos/celaeno/secrets.ya?ml$ key_groups: - age: - *celaeno pgp: - *misterio - - path_regex: hosts/alcyone/secrets.ya?ml$ + - path_regex: hosts/nixos/alcyone/secrets.ya?ml$ key_groups: - age: - *alcyone pgp: - *misterio - - path_regex: hosts/merope/secrets.ya?ml$ + - path_regex: hosts/nixos/merope/secrets.ya?ml$ key_groups: - age: - *merope pgp: - *misterio - - path_regex: hosts/common/.*secrets.ya?ml$ + - path_regex: hosts/nixos/common/.*secrets.ya?ml$ key_groups: - age: - *atlas diff --git a/AGENTS.md b/AGENTS.md index 461f83b0..e8bebbac 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -64,15 +64,17 @@ Update website from f6c09b0b to 70386bb7 (2 commits, docs-only): │ ├── global/ # Always-imported config (xdg, etc.) │ ├── {hostname}.nix # Per-host home-manager config │ └── generic.nix # Non-impermanence fallback -├── hosts/ # NixOS host configs -│ ├── common/ # Shared across hosts -│ │ ├── global/ # Always-imported -│ │ ├── optional/ # Opt-in modules -│ │ └── secrets.yaml # SOPS-encrypted shared secrets -│ └── {hostname}/ # Per-host (atlas, maia, alcyone, celaeno, merope, pleione, taygeta) -│ ├── default.nix # NixOS module -│ ├── hardware-configuration.nix -│ └── secrets.yaml # Host-specific secrets (optional) +├── hosts/ +│ ├── nixos/ # NixOS host configs +│ │ ├── common/ # Shared across hosts +│ │ │ ├── global/ # Always-imported +│ │ │ ├── optional/ # Opt-in modules +│ │ │ └── secrets.yaml # SOPS-encrypted shared secrets +│ │ └── {hostname}/ # Per-host (atlas, maia, alcyone, celaeno, merope, pleione, taygeta) +│ │ ├── default.nix # NixOS module +│ │ ├── hardware-configuration.nix +│ │ └── secrets.yaml # Host-specific secrets (optional) +│ └── system-manager/ # Non-NixOS System Manager host configs ├── modules/ # Custom NixOS & HM modules │ ├── nixos/ │ └── home-manager/ @@ -109,8 +111,8 @@ Update website from f6c09b0b to 70386bb7 (2 commits, docs-only): - Managed with **sops-nix**, keys defined in `.sops.yaml`. - Two types of secret files: - - `hosts/common/secrets.yaml` -- shared across hosts, encrypted to all host age keys. - - `hosts/{hostname}/secrets.yaml` -- per-host, encrypted to that host only. + - `hosts/nixos/common/secrets.yaml` -- shared across hosts, encrypted to all host age keys. + - `hosts/nixos/{hostname}/secrets.yaml` -- per-host, encrypted to that host only. - Both are also encrypted to the PGP key `7088C7421873E0DB97FF17C2245CAB70B4C225E9`. It lives on misterio's yubikey. - **Never** read secrets into context. Ask the user to do it. diff --git a/README.md b/README.md index 197f8e88..70fb4e58 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,8 @@ Looking for something simpler to start out with flakes? Try [my starter config r ## Repository layout ```text -hosts/ per-machine NixOS configurations (atlas, alcyone, ...) +hosts/nixos/ per-machine NixOS configurations (atlas, alcyone, ...) +hosts/system-manager/ configurations for non-NixOS Linux systems home/ home-manager configuration (feature-flagged) modules/ reusable nixos/ and home-manager/ modules overlays/, pkgs/ package overlays and custom packages (including wallpapers) diff --git a/flake.nix b/flake.nix index 2561e19a..51e973b4 100644 --- a/flake.nix +++ b/flake.nix @@ -100,49 +100,49 @@ nixosConfigurations = { # Main desktop atlas = lib.nixosSystem { - modules = [./hosts/atlas]; + modules = [./hosts/nixos/atlas]; specialArgs = { inherit inputs outputs; }; }; # Living room desktop pleione = lib.nixosSystem { - modules = [./hosts/pleione]; + modules = [./hosts/nixos/pleione]; specialArgs = { inherit inputs outputs; }; }; # Personal laptop (Framework 13) maia = lib.nixosSystem { - modules = [./hosts/maia]; + modules = [./hosts/nixos/maia]; specialArgs = { inherit inputs outputs; }; }; # Core server (Vultr) alcyone = lib.nixosSystem { - modules = [./hosts/alcyone]; + modules = [./hosts/nixos/alcyone]; specialArgs = { inherit inputs outputs; }; }; # Build and game server (Oracle) celaeno = lib.nixosSystem { - modules = [./hosts/celaeno]; + modules = [./hosts/nixos/celaeno]; specialArgs = { inherit inputs outputs; }; }; # Build and game server (Magalu Cloud) taygeta = lib.nixosSystem { - modules = [./hosts/taygeta]; + modules = [./hosts/nixos/taygeta]; specialArgs = { inherit inputs outputs; }; }; # Media server (RPi) merope = lib.nixosSystem { - modules = [./hosts/merope]; + modules = [./hosts/nixos/merope]; specialArgs = { inherit inputs outputs; }; diff --git a/hosts/alcyone/default.nix b/hosts/nixos/alcyone/default.nix similarity index 100% rename from hosts/alcyone/default.nix rename to hosts/nixos/alcyone/default.nix diff --git a/hosts/alcyone/hardware-configuration.nix b/hosts/nixos/alcyone/hardware-configuration.nix similarity index 100% rename from hosts/alcyone/hardware-configuration.nix rename to hosts/nixos/alcyone/hardware-configuration.nix diff --git a/hosts/alcyone/secrets.yaml b/hosts/nixos/alcyone/secrets.yaml similarity index 100% rename from hosts/alcyone/secrets.yaml rename to hosts/nixos/alcyone/secrets.yaml diff --git a/hosts/alcyone/services/cgit/.gitignore b/hosts/nixos/alcyone/services/cgit/.gitignore similarity index 100% rename from hosts/alcyone/services/cgit/.gitignore rename to hosts/nixos/alcyone/services/cgit/.gitignore diff --git a/hosts/alcyone/services/cgit/cgit.scss b/hosts/nixos/alcyone/services/cgit/cgit.scss similarity index 100% rename from hosts/alcyone/services/cgit/cgit.scss rename to hosts/nixos/alcyone/services/cgit/cgit.scss diff --git a/hosts/alcyone/services/cgit/default.nix b/hosts/nixos/alcyone/services/cgit/default.nix similarity index 100% rename from hosts/alcyone/services/cgit/default.nix rename to hosts/nixos/alcyone/services/cgit/default.nix diff --git a/hosts/alcyone/services/cgit/head.html b/hosts/nixos/alcyone/services/cgit/head.html similarity index 100% rename from hosts/alcyone/services/cgit/head.html rename to hosts/nixos/alcyone/services/cgit/head.html diff --git a/hosts/alcyone/services/cgit/nav.html b/hosts/nixos/alcyone/services/cgit/nav.html similarity index 100% rename from hosts/alcyone/services/cgit/nav.html rename to hosts/nixos/alcyone/services/cgit/nav.html diff --git a/hosts/alcyone/services/default.nix b/hosts/nixos/alcyone/services/default.nix similarity index 100% rename from hosts/alcyone/services/default.nix rename to hosts/nixos/alcyone/services/default.nix diff --git a/hosts/alcyone/services/files-server.nix b/hosts/nixos/alcyone/services/files-server.nix similarity index 100% rename from hosts/alcyone/services/files-server.nix rename to hosts/nixos/alcyone/services/files-server.nix diff --git a/hosts/alcyone/services/firefly.nix b/hosts/nixos/alcyone/services/firefly.nix similarity index 100% rename from hosts/alcyone/services/firefly.nix rename to hosts/nixos/alcyone/services/firefly.nix diff --git a/hosts/alcyone/services/git-remote.nix b/hosts/nixos/alcyone/services/git-remote.nix similarity index 100% rename from hosts/alcyone/services/git-remote.nix rename to hosts/nixos/alcyone/services/git-remote.nix diff --git a/hosts/alcyone/services/grafana/dashboards/hosts.json b/hosts/nixos/alcyone/services/grafana/dashboards/hosts.json similarity index 100% rename from hosts/alcyone/services/grafana/dashboards/hosts.json rename to hosts/nixos/alcyone/services/grafana/dashboards/hosts.json diff --git a/hosts/alcyone/services/grafana/default.nix b/hosts/nixos/alcyone/services/grafana/default.nix similarity index 100% rename from hosts/alcyone/services/grafana/default.nix rename to hosts/nixos/alcyone/services/grafana/default.nix diff --git a/hosts/alcyone/services/headscale.nix b/hosts/nixos/alcyone/services/headscale.nix similarity index 100% rename from hosts/alcyone/services/headscale.nix rename to hosts/nixos/alcyone/services/headscale.nix diff --git a/hosts/alcyone/services/lumis.nix b/hosts/nixos/alcyone/services/lumis.nix similarity index 100% rename from hosts/alcyone/services/lumis.nix rename to hosts/nixos/alcyone/services/lumis.nix diff --git a/hosts/alcyone/services/mail.nix b/hosts/nixos/alcyone/services/mail.nix similarity index 100% rename from hosts/alcyone/services/mail.nix rename to hosts/nixos/alcyone/services/mail.nix diff --git a/hosts/alcyone/services/prometheus.nix b/hosts/nixos/alcyone/services/prometheus.nix similarity index 100% rename from hosts/alcyone/services/prometheus.nix rename to hosts/nixos/alcyone/services/prometheus.nix diff --git a/hosts/alcyone/services/radicale.nix b/hosts/nixos/alcyone/services/radicale.nix similarity index 100% rename from hosts/alcyone/services/radicale.nix rename to hosts/nixos/alcyone/services/radicale.nix diff --git a/hosts/alcyone/services/website/default.nix b/hosts/nixos/alcyone/services/website/default.nix similarity index 93% rename from hosts/alcyone/services/website/default.nix rename to hosts/nixos/alcyone/services/website/default.nix index 4d9a49bc..2c96826b 100644 --- a/hosts/alcyone/services/website/default.nix +++ b/hosts/nixos/alcyone/services/website/default.nix @@ -1,7 +1,7 @@ {pkgs, ...}: let website = pkgs.website; - pgpKey = ../../../../home/gabriel/pgp.asc; - sshKey = ../../../../home/gabriel/ssh.pub; + pgpKey = ../../../../../home/gabriel/pgp.asc; + sshKey = ../../../../../home/gabriel/ssh.pub; redir = { forceSSL = true; enableACME = true; diff --git a/hosts/alcyone/services/website/scripts/nix-installer.sh b/hosts/nixos/alcyone/services/website/scripts/nix-installer.sh similarity index 100% rename from hosts/alcyone/services/website/scripts/nix-installer.sh rename to hosts/nixos/alcyone/services/website/scripts/nix-installer.sh diff --git a/hosts/alcyone/services/website/scripts/setup-gpg.sh b/hosts/nixos/alcyone/services/website/scripts/setup-gpg.sh similarity index 100% rename from hosts/alcyone/services/website/scripts/setup-gpg.sh rename to hosts/nixos/alcyone/services/website/scripts/setup-gpg.sh diff --git a/hosts/alcyone/services/website/shortner.nix b/hosts/nixos/alcyone/services/website/shortner.nix similarity index 100% rename from hosts/alcyone/services/website/shortner.nix rename to hosts/nixos/alcyone/services/website/shortner.nix diff --git a/hosts/alcyone/ssh_host_ed25519_key.pub b/hosts/nixos/alcyone/ssh_host_ed25519_key.pub similarity index 100% rename from hosts/alcyone/ssh_host_ed25519_key.pub rename to hosts/nixos/alcyone/ssh_host_ed25519_key.pub diff --git a/hosts/atlas/default.nix b/hosts/nixos/atlas/default.nix similarity index 100% rename from hosts/atlas/default.nix rename to hosts/nixos/atlas/default.nix diff --git a/hosts/atlas/hardware-configuration.nix b/hosts/nixos/atlas/hardware-configuration.nix similarity index 100% rename from hosts/atlas/hardware-configuration.nix rename to hosts/nixos/atlas/hardware-configuration.nix diff --git a/hosts/atlas/llm-server.nix b/hosts/nixos/atlas/llm-server.nix similarity index 100% rename from hosts/atlas/llm-server.nix rename to hosts/nixos/atlas/llm-server.nix diff --git a/hosts/atlas/ssh_host_ed25519_key.pub b/hosts/nixos/atlas/ssh_host_ed25519_key.pub similarity index 100% rename from hosts/atlas/ssh_host_ed25519_key.pub rename to hosts/nixos/atlas/ssh_host_ed25519_key.pub diff --git a/hosts/celaeno/default.nix b/hosts/nixos/celaeno/default.nix similarity index 100% rename from hosts/celaeno/default.nix rename to hosts/nixos/celaeno/default.nix diff --git a/hosts/celaeno/hardware-configuration.nix b/hosts/nixos/celaeno/hardware-configuration.nix similarity index 100% rename from hosts/celaeno/hardware-configuration.nix rename to hosts/nixos/celaeno/hardware-configuration.nix diff --git a/hosts/celaeno/secrets.yaml b/hosts/nixos/celaeno/secrets.yaml similarity index 100% rename from hosts/celaeno/secrets.yaml rename to hosts/nixos/celaeno/secrets.yaml diff --git a/hosts/celaeno/services/binary-cache.nix b/hosts/nixos/celaeno/services/binary-cache.nix similarity index 100% rename from hosts/celaeno/services/binary-cache.nix rename to hosts/nixos/celaeno/services/binary-cache.nix diff --git a/hosts/celaeno/services/default.nix b/hosts/nixos/celaeno/services/default.nix similarity index 100% rename from hosts/celaeno/services/default.nix rename to hosts/nixos/celaeno/services/default.nix diff --git a/hosts/celaeno/services/hydra/default.nix b/hosts/nixos/celaeno/services/hydra/default.nix similarity index 100% rename from hosts/celaeno/services/hydra/default.nix rename to hosts/nixos/celaeno/services/hydra/default.nix diff --git a/hosts/celaeno/services/hydra/machines.nix b/hosts/nixos/celaeno/services/hydra/machines.nix similarity index 100% rename from hosts/celaeno/services/hydra/machines.nix rename to hosts/nixos/celaeno/services/hydra/machines.nix diff --git a/hosts/celaeno/ssh_host_ed25519_key.pub b/hosts/nixos/celaeno/ssh_host_ed25519_key.pub similarity index 100% rename from hosts/celaeno/ssh_host_ed25519_key.pub rename to hosts/nixos/celaeno/ssh_host_ed25519_key.pub diff --git a/hosts/common/global/auto-upgrade.nix b/hosts/nixos/common/global/auto-upgrade.nix similarity index 100% rename from hosts/common/global/auto-upgrade.nix rename to hosts/nixos/common/global/auto-upgrade.nix diff --git a/hosts/common/global/default.nix b/hosts/nixos/common/global/default.nix similarity index 100% rename from hosts/common/global/default.nix rename to hosts/nixos/common/global/default.nix diff --git a/hosts/common/global/display-manager.nix b/hosts/nixos/common/global/display-manager.nix similarity index 100% rename from hosts/common/global/display-manager.nix rename to hosts/nixos/common/global/display-manager.nix diff --git a/hosts/common/global/fish.nix b/hosts/nixos/common/global/fish.nix similarity index 100% rename from hosts/common/global/fish.nix rename to hosts/nixos/common/global/fish.nix diff --git a/hosts/common/global/gamemode.nix b/hosts/nixos/common/global/gamemode.nix similarity index 100% rename from hosts/common/global/gamemode.nix rename to hosts/nixos/common/global/gamemode.nix diff --git a/hosts/common/global/kdeconnect.nix b/hosts/nixos/common/global/kdeconnect.nix similarity index 100% rename from hosts/common/global/kdeconnect.nix rename to hosts/nixos/common/global/kdeconnect.nix diff --git a/hosts/common/global/locale.nix b/hosts/nixos/common/global/locale.nix similarity index 100% rename from hosts/common/global/locale.nix rename to hosts/nixos/common/global/locale.nix diff --git a/hosts/common/global/mandoc.nix b/hosts/nixos/common/global/mandoc.nix similarity index 100% rename from hosts/common/global/mandoc.nix rename to hosts/nixos/common/global/mandoc.nix diff --git a/hosts/common/global/nix-ld.nix b/hosts/nixos/common/global/nix-ld.nix similarity index 100% rename from hosts/common/global/nix-ld.nix rename to hosts/nixos/common/global/nix-ld.nix diff --git a/hosts/common/global/nix.nix b/hosts/nixos/common/global/nix.nix similarity index 100% rename from hosts/common/global/nix.nix rename to hosts/nixos/common/global/nix.nix diff --git a/hosts/common/global/openssh.nix b/hosts/nixos/common/global/openssh.nix similarity index 100% rename from hosts/common/global/openssh.nix rename to hosts/nixos/common/global/openssh.nix diff --git a/hosts/common/global/optin-persistence.nix b/hosts/nixos/common/global/optin-persistence.nix similarity index 100% rename from hosts/common/global/optin-persistence.nix rename to hosts/nixos/common/global/optin-persistence.nix diff --git a/hosts/common/global/podman.nix b/hosts/nixos/common/global/podman.nix similarity index 100% rename from hosts/common/global/podman.nix rename to hosts/nixos/common/global/podman.nix diff --git a/hosts/common/global/prometheus-node-exporter.nix b/hosts/nixos/common/global/prometheus-node-exporter.nix similarity index 100% rename from hosts/common/global/prometheus-node-exporter.nix rename to hosts/nixos/common/global/prometheus-node-exporter.nix diff --git a/hosts/common/global/security-fixes.nix b/hosts/nixos/common/global/security-fixes.nix similarity index 100% rename from hosts/common/global/security-fixes.nix rename to hosts/nixos/common/global/security-fixes.nix diff --git a/hosts/common/global/sops.nix b/hosts/nixos/common/global/sops.nix similarity index 100% rename from hosts/common/global/sops.nix rename to hosts/nixos/common/global/sops.nix diff --git a/hosts/common/global/steam-hardware.nix b/hosts/nixos/common/global/steam-hardware.nix similarity index 100% rename from hosts/common/global/steam-hardware.nix rename to hosts/nixos/common/global/steam-hardware.nix diff --git a/hosts/common/global/swappiness.nix b/hosts/nixos/common/global/swappiness.nix similarity index 100% rename from hosts/common/global/swappiness.nix rename to hosts/nixos/common/global/swappiness.nix diff --git a/hosts/common/global/systemd-initrd.nix b/hosts/nixos/common/global/systemd-initrd.nix similarity index 100% rename from hosts/common/global/systemd-initrd.nix rename to hosts/nixos/common/global/systemd-initrd.nix diff --git a/hosts/common/global/tailscale.nix b/hosts/nixos/common/global/tailscale.nix similarity index 100% rename from hosts/common/global/tailscale.nix rename to hosts/nixos/common/global/tailscale.nix diff --git a/hosts/common/global/tpm.nix b/hosts/nixos/common/global/tpm.nix similarity index 100% rename from hosts/common/global/tpm.nix rename to hosts/nixos/common/global/tpm.nix diff --git a/hosts/common/global/upower.nix b/hosts/nixos/common/global/upower.nix similarity index 100% rename from hosts/common/global/upower.nix rename to hosts/nixos/common/global/upower.nix diff --git a/hosts/common/optional/cups.nix b/hosts/nixos/common/optional/cups.nix similarity index 100% rename from hosts/common/optional/cups.nix rename to hosts/nixos/common/optional/cups.nix diff --git a/hosts/common/optional/docker.nix b/hosts/nixos/common/optional/docker.nix similarity index 100% rename from hosts/common/optional/docker.nix rename to hosts/nixos/common/optional/docker.nix diff --git a/hosts/common/optional/dynamic-timezone.nix b/hosts/nixos/common/optional/dynamic-timezone.nix similarity index 100% rename from hosts/common/optional/dynamic-timezone.nix rename to hosts/nixos/common/optional/dynamic-timezone.nix diff --git a/hosts/common/optional/eduroam-cert.pem b/hosts/nixos/common/optional/eduroam-cert.pem similarity index 100% rename from hosts/common/optional/eduroam-cert.pem rename to hosts/nixos/common/optional/eduroam-cert.pem diff --git a/hosts/common/optional/ephemeral-btrfs.nix b/hosts/nixos/common/optional/ephemeral-btrfs.nix similarity index 100% rename from hosts/common/optional/ephemeral-btrfs.nix rename to hosts/nixos/common/optional/ephemeral-btrfs.nix diff --git a/hosts/common/optional/fail2ban.nix b/hosts/nixos/common/optional/fail2ban.nix similarity index 100% rename from hosts/common/optional/fail2ban.nix rename to hosts/nixos/common/optional/fail2ban.nix diff --git a/hosts/common/optional/firefox-session.nix b/hosts/nixos/common/optional/firefox-session.nix similarity index 100% rename from hosts/common/optional/firefox-session.nix rename to hosts/nixos/common/optional/firefox-session.nix diff --git a/hosts/common/optional/gamemode.nix b/hosts/nixos/common/optional/gamemode.nix similarity index 100% rename from hosts/common/optional/gamemode.nix rename to hosts/nixos/common/optional/gamemode.nix diff --git a/hosts/common/optional/gnome.nix b/hosts/nixos/common/optional/gnome.nix similarity index 100% rename from hosts/common/optional/gnome.nix rename to hosts/nixos/common/optional/gnome.nix diff --git a/hosts/common/optional/jellyfin-session.nix b/hosts/nixos/common/optional/jellyfin-session.nix similarity index 100% rename from hosts/common/optional/jellyfin-session.nix rename to hosts/nixos/common/optional/jellyfin-session.nix diff --git a/hosts/common/optional/keyd.nix b/hosts/nixos/common/optional/keyd.nix similarity index 100% rename from hosts/common/optional/keyd.nix rename to hosts/nixos/common/optional/keyd.nix diff --git a/hosts/common/optional/mysql.nix b/hosts/nixos/common/optional/mysql.nix similarity index 100% rename from hosts/common/optional/mysql.nix rename to hosts/nixos/common/optional/mysql.nix diff --git a/hosts/common/optional/nginx.nix b/hosts/nixos/common/optional/nginx.nix similarity index 100% rename from hosts/common/optional/nginx.nix rename to hosts/nixos/common/optional/nginx.nix diff --git a/hosts/common/optional/pantheon.nix b/hosts/nixos/common/optional/pantheon.nix similarity index 100% rename from hosts/common/optional/pantheon.nix rename to hosts/nixos/common/optional/pantheon.nix diff --git a/hosts/common/optional/peripherals.nix b/hosts/nixos/common/optional/peripherals.nix similarity index 100% rename from hosts/common/optional/peripherals.nix rename to hosts/nixos/common/optional/peripherals.nix diff --git a/hosts/common/optional/pipewire.nix b/hosts/nixos/common/optional/pipewire.nix similarity index 100% rename from hosts/common/optional/pipewire.nix rename to hosts/nixos/common/optional/pipewire.nix diff --git a/hosts/common/optional/postgres.nix b/hosts/nixos/common/optional/postgres.nix similarity index 100% rename from hosts/common/optional/postgres.nix rename to hosts/nixos/common/optional/postgres.nix diff --git a/hosts/common/optional/quietboot.nix b/hosts/nixos/common/optional/quietboot.nix similarity index 100% rename from hosts/common/optional/quietboot.nix rename to hosts/nixos/common/optional/quietboot.nix diff --git a/hosts/common/optional/regreet.nix b/hosts/nixos/common/optional/regreet.nix similarity index 100% rename from hosts/common/optional/regreet.nix rename to hosts/nixos/common/optional/regreet.nix diff --git a/hosts/common/optional/secure-boot.nix b/hosts/nixos/common/optional/secure-boot.nix similarity index 100% rename from hosts/common/optional/secure-boot.nix rename to hosts/nixos/common/optional/secure-boot.nix diff --git a/hosts/common/optional/ssh-serve-store.nix b/hosts/nixos/common/optional/ssh-serve-store.nix similarity index 100% rename from hosts/common/optional/ssh-serve-store.nix rename to hosts/nixos/common/optional/ssh-serve-store.nix diff --git a/hosts/common/optional/starcitizen-fixes.nix b/hosts/nixos/common/optional/starcitizen-fixes.nix similarity index 100% rename from hosts/common/optional/starcitizen-fixes.nix rename to hosts/nixos/common/optional/starcitizen-fixes.nix diff --git a/hosts/common/optional/steam-gamescope-session.nix b/hosts/nixos/common/optional/steam-gamescope-session.nix similarity index 100% rename from hosts/common/optional/steam-gamescope-session.nix rename to hosts/nixos/common/optional/steam-gamescope-session.nix diff --git a/hosts/common/optional/systemd-boot.nix b/hosts/nixos/common/optional/systemd-boot.nix similarity index 100% rename from hosts/common/optional/systemd-boot.nix rename to hosts/nixos/common/optional/systemd-boot.nix diff --git a/hosts/common/optional/tailscale-exit-node.nix b/hosts/nixos/common/optional/tailscale-exit-node.nix similarity index 100% rename from hosts/common/optional/tailscale-exit-node.nix rename to hosts/nixos/common/optional/tailscale-exit-node.nix diff --git a/hosts/common/optional/tlp.nix b/hosts/nixos/common/optional/tlp.nix similarity index 100% rename from hosts/common/optional/tlp.nix rename to hosts/nixos/common/optional/tlp.nix diff --git a/hosts/common/optional/waydroid.nix b/hosts/nixos/common/optional/waydroid.nix similarity index 100% rename from hosts/common/optional/waydroid.nix rename to hosts/nixos/common/optional/waydroid.nix diff --git a/hosts/common/optional/wireless.nix b/hosts/nixos/common/optional/wireless.nix similarity index 100% rename from hosts/common/optional/wireless.nix rename to hosts/nixos/common/optional/wireless.nix diff --git a/hosts/common/optional/wireshark.nix b/hosts/nixos/common/optional/wireshark.nix similarity index 100% rename from hosts/common/optional/wireshark.nix rename to hosts/nixos/common/optional/wireshark.nix diff --git a/hosts/common/optional/x11-no-suspend.nix b/hosts/nixos/common/optional/x11-no-suspend.nix similarity index 100% rename from hosts/common/optional/x11-no-suspend.nix rename to hosts/nixos/common/optional/x11-no-suspend.nix diff --git a/hosts/common/secrets.yaml b/hosts/nixos/common/secrets.yaml similarity index 100% rename from hosts/common/secrets.yaml rename to hosts/nixos/common/secrets.yaml diff --git a/hosts/common/users/gabriel/default.nix b/hosts/nixos/common/users/gabriel/default.nix similarity index 93% rename from hosts/common/users/gabriel/default.nix rename to hosts/nixos/common/users/gabriel/default.nix index 4061ebd5..2229ef4e 100644 --- a/hosts/common/users/gabriel/default.nix +++ b/hosts/nixos/common/users/gabriel/default.nix @@ -51,7 +51,7 @@ in { "wireshark" ]; - openssh.authorizedKeys.keys = lib.splitString "\n" (builtins.readFile ../../../../home/gabriel/ssh.pub); + openssh.authorizedKeys.keys = lib.splitString "\n" (builtins.readFile ../../../../../home/gabriel/ssh.pub); hashedPasswordFile = config.sops.secrets.gabriel-password.path; packages = [pkgs.home-manager]; }; @@ -71,7 +71,7 @@ in { }; }; - home-manager.users.gabriel = import ../../../../home/gabriel/${config.networking.hostName}.nix; + home-manager.users.gabriel = import ../../../../../home/gabriel/${config.networking.hostName}.nix; systemd.services.home-manager-gabriel.serviceConfig.ExecStart = lib.mkForce activateHomeForTime; diff --git a/hosts/common/users/layla/default.nix b/hosts/nixos/common/users/layla/default.nix similarity index 100% rename from hosts/common/users/layla/default.nix rename to hosts/nixos/common/users/layla/default.nix diff --git a/hosts/common/users/layla/packages.nix b/hosts/nixos/common/users/layla/packages.nix similarity index 100% rename from hosts/common/users/layla/packages.nix rename to hosts/nixos/common/users/layla/packages.nix diff --git a/hosts/maia/default.nix b/hosts/nixos/maia/default.nix similarity index 100% rename from hosts/maia/default.nix rename to hosts/nixos/maia/default.nix diff --git a/hosts/maia/hardware-configuration.nix b/hosts/nixos/maia/hardware-configuration.nix similarity index 100% rename from hosts/maia/hardware-configuration.nix rename to hosts/nixos/maia/hardware-configuration.nix diff --git a/hosts/maia/ssh_host_ed25519_key.pub b/hosts/nixos/maia/ssh_host_ed25519_key.pub similarity index 100% rename from hosts/maia/ssh_host_ed25519_key.pub rename to hosts/nixos/maia/ssh_host_ed25519_key.pub diff --git a/hosts/merope/default.nix b/hosts/nixos/merope/default.nix similarity index 100% rename from hosts/merope/default.nix rename to hosts/nixos/merope/default.nix diff --git a/hosts/merope/hardware-configuration.nix b/hosts/nixos/merope/hardware-configuration.nix similarity index 100% rename from hosts/merope/hardware-configuration.nix rename to hosts/nixos/merope/hardware-configuration.nix diff --git a/hosts/merope/secrets.yaml b/hosts/nixos/merope/secrets.yaml similarity index 100% rename from hosts/merope/secrets.yaml rename to hosts/nixos/merope/secrets.yaml diff --git a/hosts/merope/services/default.nix b/hosts/nixos/merope/services/default.nix similarity index 100% rename from hosts/merope/services/default.nix rename to hosts/nixos/merope/services/default.nix diff --git a/hosts/merope/services/immich.nix b/hosts/nixos/merope/services/immich.nix similarity index 100% rename from hosts/merope/services/immich.nix rename to hosts/nixos/merope/services/immich.nix diff --git a/hosts/merope/services/media/bazarr.nix b/hosts/nixos/merope/services/media/bazarr.nix similarity index 100% rename from hosts/merope/services/media/bazarr.nix rename to hosts/nixos/merope/services/media/bazarr.nix diff --git a/hosts/merope/services/media/default.nix b/hosts/nixos/merope/services/media/default.nix similarity index 100% rename from hosts/merope/services/media/default.nix rename to hosts/nixos/merope/services/media/default.nix diff --git a/hosts/merope/services/media/deluge.nix b/hosts/nixos/merope/services/media/deluge.nix similarity index 100% rename from hosts/merope/services/media/deluge.nix rename to hosts/nixos/merope/services/media/deluge.nix diff --git a/hosts/merope/services/media/flaresolverr.nix b/hosts/nixos/merope/services/media/flaresolverr.nix similarity index 100% rename from hosts/merope/services/media/flaresolverr.nix rename to hosts/nixos/merope/services/media/flaresolverr.nix diff --git a/hosts/merope/services/media/jellyfin.nix b/hosts/nixos/merope/services/media/jellyfin.nix similarity index 100% rename from hosts/merope/services/media/jellyfin.nix rename to hosts/nixos/merope/services/media/jellyfin.nix diff --git a/hosts/merope/services/media/jellysearch.nix b/hosts/nixos/merope/services/media/jellysearch.nix similarity index 100% rename from hosts/merope/services/media/jellysearch.nix rename to hosts/nixos/merope/services/media/jellysearch.nix diff --git a/hosts/merope/services/media/jellyseerr.nix b/hosts/nixos/merope/services/media/jellyseerr.nix similarity index 100% rename from hosts/merope/services/media/jellyseerr.nix rename to hosts/nixos/merope/services/media/jellyseerr.nix diff --git a/hosts/merope/services/media/lidarr.nix b/hosts/nixos/merope/services/media/lidarr.nix similarity index 100% rename from hosts/merope/services/media/lidarr.nix rename to hosts/nixos/merope/services/media/lidarr.nix diff --git a/hosts/merope/services/media/prowlarr.nix b/hosts/nixos/merope/services/media/prowlarr.nix similarity index 100% rename from hosts/merope/services/media/prowlarr.nix rename to hosts/nixos/merope/services/media/prowlarr.nix diff --git a/hosts/merope/services/media/radarr.nix b/hosts/nixos/merope/services/media/radarr.nix similarity index 100% rename from hosts/merope/services/media/radarr.nix rename to hosts/nixos/merope/services/media/radarr.nix diff --git a/hosts/merope/services/media/recyclarr.nix b/hosts/nixos/merope/services/media/recyclarr.nix similarity index 100% rename from hosts/merope/services/media/recyclarr.nix rename to hosts/nixos/merope/services/media/recyclarr.nix diff --git a/hosts/merope/services/media/sabnzbd.nix b/hosts/nixos/merope/services/media/sabnzbd.nix similarity index 100% rename from hosts/merope/services/media/sabnzbd.nix rename to hosts/nixos/merope/services/media/sabnzbd.nix diff --git a/hosts/merope/services/media/sonarr.nix b/hosts/nixos/merope/services/media/sonarr.nix similarity index 100% rename from hosts/merope/services/media/sonarr.nix rename to hosts/nixos/merope/services/media/sonarr.nix diff --git a/hosts/merope/ssh_host_ed25519_key.pub b/hosts/nixos/merope/ssh_host_ed25519_key.pub similarity index 100% rename from hosts/merope/ssh_host_ed25519_key.pub rename to hosts/nixos/merope/ssh_host_ed25519_key.pub diff --git a/hosts/pleione/default.nix b/hosts/nixos/pleione/default.nix similarity index 100% rename from hosts/pleione/default.nix rename to hosts/nixos/pleione/default.nix diff --git a/hosts/pleione/hardware-configuration.nix b/hosts/nixos/pleione/hardware-configuration.nix similarity index 100% rename from hosts/pleione/hardware-configuration.nix rename to hosts/nixos/pleione/hardware-configuration.nix diff --git a/hosts/pleione/media-user.nix b/hosts/nixos/pleione/media-user.nix similarity index 100% rename from hosts/pleione/media-user.nix rename to hosts/nixos/pleione/media-user.nix diff --git a/hosts/pleione/remote-control.nix b/hosts/nixos/pleione/remote-control.nix similarity index 100% rename from hosts/pleione/remote-control.nix rename to hosts/nixos/pleione/remote-control.nix diff --git a/hosts/pleione/ssh_host_ed25519_key.pub b/hosts/nixos/pleione/ssh_host_ed25519_key.pub similarity index 100% rename from hosts/pleione/ssh_host_ed25519_key.pub rename to hosts/nixos/pleione/ssh_host_ed25519_key.pub diff --git a/hosts/taygeta/default.nix b/hosts/nixos/taygeta/default.nix similarity index 100% rename from hosts/taygeta/default.nix rename to hosts/nixos/taygeta/default.nix diff --git a/hosts/taygeta/hardware-configuration.nix b/hosts/nixos/taygeta/hardware-configuration.nix similarity index 100% rename from hosts/taygeta/hardware-configuration.nix rename to hosts/nixos/taygeta/hardware-configuration.nix diff --git a/hosts/taygeta/secrets.yaml b/hosts/nixos/taygeta/secrets.yaml similarity index 100% rename from hosts/taygeta/secrets.yaml rename to hosts/nixos/taygeta/secrets.yaml diff --git a/hosts/taygeta/services/default.nix b/hosts/nixos/taygeta/services/default.nix similarity index 100% rename from hosts/taygeta/services/default.nix rename to hosts/nixos/taygeta/services/default.nix diff --git a/hosts/taygeta/services/factorio.nix b/hosts/nixos/taygeta/services/factorio.nix similarity index 100% rename from hosts/taygeta/services/factorio.nix rename to hosts/nixos/taygeta/services/factorio.nix diff --git a/hosts/taygeta/services/minecraft/aikar-flags.nix b/hosts/nixos/taygeta/services/minecraft/aikar-flags.nix similarity index 100% rename from hosts/taygeta/services/minecraft/aikar-flags.nix rename to hosts/nixos/taygeta/services/minecraft/aikar-flags.nix diff --git a/hosts/taygeta/services/minecraft/default.nix b/hosts/nixos/taygeta/services/minecraft/default.nix similarity index 100% rename from hosts/taygeta/services/minecraft/default.nix rename to hosts/nixos/taygeta/services/minecraft/default.nix diff --git a/hosts/taygeta/services/minecraft/ops.nix b/hosts/nixos/taygeta/services/minecraft/ops.nix similarity index 100% rename from hosts/taygeta/services/minecraft/ops.nix rename to hosts/nixos/taygeta/services/minecraft/ops.nix diff --git a/hosts/taygeta/services/minecraft/servers/gtnh/configs/SpecialMobs.cfg b/hosts/nixos/taygeta/services/minecraft/servers/gtnh/configs/SpecialMobs.cfg similarity index 100% rename from hosts/taygeta/services/minecraft/servers/gtnh/configs/SpecialMobs.cfg rename to hosts/nixos/taygeta/services/minecraft/servers/gtnh/configs/SpecialMobs.cfg diff --git a/hosts/taygeta/services/minecraft/servers/gtnh/configs/dynmap.default.nix b/hosts/nixos/taygeta/services/minecraft/servers/gtnh/configs/dynmap.default.nix similarity index 100% rename from hosts/taygeta/services/minecraft/servers/gtnh/configs/dynmap.default.nix rename to hosts/nixos/taygeta/services/minecraft/servers/gtnh/configs/dynmap.default.nix diff --git a/hosts/taygeta/services/minecraft/servers/gtnh/configs/journeymap-world.cfg b/hosts/nixos/taygeta/services/minecraft/servers/gtnh/configs/journeymap-world.cfg similarity index 100% rename from hosts/taygeta/services/minecraft/servers/gtnh/configs/journeymap-world.cfg rename to hosts/nixos/taygeta/services/minecraft/servers/gtnh/configs/journeymap-world.cfg diff --git a/hosts/taygeta/services/minecraft/servers/gtnh/configs/serverutilities.cfg b/hosts/nixos/taygeta/services/minecraft/servers/gtnh/configs/serverutilities.cfg similarity index 100% rename from hosts/taygeta/services/minecraft/servers/gtnh/configs/serverutilities.cfg rename to hosts/nixos/taygeta/services/minecraft/servers/gtnh/configs/serverutilities.cfg diff --git a/hosts/taygeta/services/minecraft/servers/gtnh/default.nix b/hosts/nixos/taygeta/services/minecraft/servers/gtnh/default.nix similarity index 100% rename from hosts/taygeta/services/minecraft/servers/gtnh/default.nix rename to hosts/nixos/taygeta/services/minecraft/servers/gtnh/default.nix diff --git a/hosts/taygeta/services/minecraft/servers/gtnh/gtnh.nix b/hosts/nixos/taygeta/services/minecraft/servers/gtnh/gtnh.nix similarity index 100% rename from hosts/taygeta/services/minecraft/servers/gtnh/gtnh.nix rename to hosts/nixos/taygeta/services/minecraft/servers/gtnh/gtnh.nix diff --git a/hosts/taygeta/services/minecraft/whitelist.nix b/hosts/nixos/taygeta/services/minecraft/whitelist.nix similarity index 100% rename from hosts/taygeta/services/minecraft/whitelist.nix rename to hosts/nixos/taygeta/services/minecraft/whitelist.nix diff --git a/hosts/taygeta/ssh_host_ed25519_key.pub b/hosts/nixos/taygeta/ssh_host_ed25519_key.pub similarity index 100% rename from hosts/taygeta/ssh_host_ed25519_key.pub rename to hosts/nixos/taygeta/ssh_host_ed25519_key.pub diff --git a/hosts/system-manager/.gitkeep b/hosts/system-manager/.gitkeep new file mode 100644 index 00000000..e69de29b