diff --git a/Justfile b/Justfile index 8446f76e..1b5278b7 100644 --- a/Justfile +++ b/Justfile @@ -230,15 +230,9 @@ youko mode="switch": upload-idols verbosity="normal": #!/usr/bin/env nu use {{utils_nu}} *; - upload-vm aquamarine 80Gi {{verbosity}} upload-vm ruby 100Gi {{verbosity}} upload-vm kana 100Gi {{verbosity}} -[linux] -[group('homelab')] -aqua mode="switch": - colmena apply {{mode}} --on '@aqua' --verbose --show-trace - [linux] [group('homelab')] ruby mode="switch": diff --git a/flake.lock b/flake.lock index d7d8f9a7..171f32ed 100644 --- a/flake.lock +++ b/flake.lock @@ -503,10 +503,10 @@ "mysecrets": { "flake": false, "locked": { - "lastModified": 1789875389, - "narHash": "sha256-aHBxNh96dBsOzKqNcLdo4H4XzE0IAD1KVFXMNdV3W+s=", + "lastModified": 1789975872, + "narHash": "sha256-DQrX1au7BWEzXJqR2FBiSYdF0DWd5NMh12y6ovtn41o=", "ref": "refs/heads/main", - "rev": "8cd11a98a258410e3af03a2bf3bfeff2201fa5f8", + "rev": "4def15deec5c0538df16ad2d49028298ee81d7ab", "shallow": true, "type": "git", "url": "ssh://git@github.com/ryan4yin/nix-secrets.git" diff --git a/home/hosts/linux/idols-aquamarine.nix b/home/hosts/linux/idols-aquamarine.nix deleted file mode 100644 index a67103bf..00000000 --- a/home/hosts/linux/idols-aquamarine.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - imports = [ ../../linux/core.nix ]; -} diff --git a/hosts/idols-aquamarine/default.nix b/hosts/idols-aquamarine/default.nix deleted file mode 100644 index ea023bb1..00000000 --- a/hosts/idols-aquamarine/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - lib, - mylib, - myvars, - pkgs, - disko, - ... -}: -############################################################# -# -# Aquamarine - A NixOS VM running on Proxmox/KubeVirt -# -############################################################# -let - hostName = "aquamarine"; # Define your hostname. - - inherit (myvars.networking) proxyGateway proxyGateway6 nameservers; - inherit (myvars.networking.hostsAddr.${hostName}) iface ipv4; - ipv4WithMask = "${ipv4}/24"; -in -{ - imports = (mylib.scanPaths ./.) ++ [ - disko.nixosModules.default - ]; - - # supported file systems, so we can mount any removable disks with these filesystems - boot.supportedFilesystems = [ - "ext4" - "btrfs" - "xfs" - #"zfs" - "ntfs" - "fat" - "vfat" - "exfat" - ]; - - # Maximum total amount of memory that can be stored in the zram swap devices (as a percentage of your total memory). - # Defaults to 1/2 of your total RAM. Run zramctl to check how good memory is compressed. - # This doesn’t define how much memory will be used by the zram swap devices. - zramSwap.memoryPercent = lib.mkForce 100; - - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModprobeConfig = "options kvm_amd nested=1"; # for amd cpu - - networking = { - inherit hostName; - - # we use networkd instead - networkmanager.enable = false; - useDHCP = false; - }; - - networking.useNetworkd = true; - systemd.network.enable = true; - - systemd.network.networks."10-${iface}" = { - matchConfig.Name = [ iface ]; - networkConfig = { - Address = [ ipv4WithMask ]; - # DNS = nameservers; - DNS = [ proxyGateway ]; - DHCP = "ipv6"; # enable DHCPv6 only, so we can get a GUA. - IPv6AcceptRA = true; # for Stateless IPv6 Autoconfiguraton (SLAAC) - LinkLocalAddressing = "ipv6"; - }; - routes = [ - { - Destination = "0.0.0.0/0"; - Gateway = proxyGateway; - } - { - Destination = "::/0"; - Gateway = proxyGateway6; - GatewayOnLink = true; # it's a gateway on local link. - } - ]; - linkConfig.RequiredForOnline = "routable"; - }; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.11"; # Did you read the comment? -} diff --git a/hosts/idols-aquamarine/journald.nix b/hosts/idols-aquamarine/journald.nix deleted file mode 100644 index a8b4ebfd..00000000 --- a/hosts/idols-aquamarine/journald.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - # systemd-journal - reduce disk usage - # https://www.freedesktop.org/software/systemd/man/latest/journald.conf.html - services.journald.settings.Journal = { - SystemMaxUse = "2G"; - RuntimeMaxUse = "256M"; - }; -} diff --git a/hosts/k8s/kubevirt-youko/homelab-services.nix b/hosts/k8s/kubevirt-youko/homelab-services.nix new file mode 100644 index 00000000..d1dd8681 --- /dev/null +++ b/hosts/k8s/kubevirt-youko/homelab-services.nix @@ -0,0 +1,21 @@ +{ ... }: +{ + # The homelab service modules (caddy, gitea, grafana, monitoring, oci + # containers, postgresql, restic, sftpgo, transmission, and the HDD disko + # config) live in ./homelab-services/ and are auto-imported by this host's + # scanPaths. Its HDD disko config only defines the two data disks (no root + # disk), so it is imported as-is -- disko's NixOS module only generates the + # fileSystems/mounts, it never reformats. + # + # keep aquamarine's IP on this host's bridge so its services and DNS keep + # resolving after the migration (the NixOS list option merges with the .183) + systemd.network.networks."10-br0".networkConfig.Address = [ "192.168.5.101/24" ]; + + # the same secret groups the aqua VM enabled + modules.secrets.server = { + application.enable = true; + operation.enable = true; + webserver.enable = true; + storage.enable = true; + }; +} diff --git a/hosts/idols-aquamarine/README.md b/hosts/k8s/kubevirt-youko/homelab-services/README.md similarity index 100% rename from hosts/idols-aquamarine/README.md rename to hosts/k8s/kubevirt-youko/homelab-services/README.md diff --git a/hosts/idols-aquamarine/caddy.nix b/hosts/k8s/kubevirt-youko/homelab-services/caddy.nix similarity index 96% rename from hosts/idols-aquamarine/caddy.nix rename to hosts/k8s/kubevirt-youko/homelab-services/caddy.nix index b00f8950..cab95e33 100644 --- a/hosts/idols-aquamarine/caddy.nix +++ b/hosts/k8s/kubevirt-youko/homelab-services/caddy.nix @@ -1,4 +1,5 @@ { + mylib, pkgs, config, wallpapers, @@ -7,7 +8,9 @@ let hostCommonConfig = '' encode zstd gzip - tls ${../../certs/ecc-server.crt} ${config.age.secrets."caddy-ecc-server.key".path} { + tls ${mylib.relativeToRoot "certs/ecc-server.crt"} ${ + config.age.secrets."caddy-ecc-server.key".path + } { protocols tls1.3 tls1.3 curves x25519 secp384r1 secp521r1 } diff --git a/hosts/k8s/kubevirt-youko/homelab-services/default.nix b/hosts/k8s/kubevirt-youko/homelab-services/default.nix new file mode 100644 index 00000000..a7a924da --- /dev/null +++ b/hosts/k8s/kubevirt-youko/homelab-services/default.nix @@ -0,0 +1,6 @@ +{ mylib, ... }: +{ + # The homelab service modules, migrated here from the retired + # `hosts/idols-aquamarine` guest, now running directly on this host. + imports = mylib.scanPaths ./.; +} diff --git a/hosts/idols-aquamarine/disko-fs.nix b/hosts/k8s/kubevirt-youko/homelab-services/disko-fs.nix similarity index 97% rename from hosts/idols-aquamarine/disko-fs.nix rename to hosts/k8s/kubevirt-youko/homelab-services/disko-fs.nix index 724ec30d..d242a67f 100644 --- a/hosts/idols-aquamarine/disko-fs.nix +++ b/hosts/k8s/kubevirt-youko/homelab-services/disko-fs.nix @@ -1,7 +1,7 @@ # Auto disk partitioning (from repo root: nix-config): -# nix run github:nix-community/disko -- --mode destroy,format,mount hosts/idols-aquamarine/disko-fs.nix +# nix run github:nix-community/disko -- --mode destroy,format,mount hosts/k8s/kubevirt-youko/homelab-services/disko-fs.nix # Mount only (after first format): -# nix run github:nix-community/disko -- --mode mount hosts/idols-aquamarine/disko-fs.nix +# nix run github:nix-community/disko -- --mode mount hosts/k8s/kubevirt-youko/homelab-services/disko-fs.nix let cryptKeyFile = "/etc/agenix/hdd-luks-crypt-key"; unlockDisk = "data-encrypted"; diff --git a/hosts/idols-aquamarine/exporters/default.nix b/hosts/k8s/kubevirt-youko/homelab-services/exporters/default.nix similarity index 100% rename from hosts/idols-aquamarine/exporters/default.nix rename to hosts/k8s/kubevirt-youko/homelab-services/exporters/default.nix diff --git a/hosts/idols-aquamarine/gitea.nix b/hosts/k8s/kubevirt-youko/homelab-services/gitea.nix similarity index 100% rename from hosts/idols-aquamarine/gitea.nix rename to hosts/k8s/kubevirt-youko/homelab-services/gitea.nix diff --git a/hosts/idols-aquamarine/grafana/dashboards.nix b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards.nix similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards.nix rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards.nix diff --git a/hosts/idols-aquamarine/grafana/dashboards/README.md b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/README.md similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/README.md rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/README.md diff --git a/hosts/idols-aquamarine/grafana/dashboards/databases/cloudnative-pg.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/databases/cloudnative-pg.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/databases/cloudnative-pg.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/databases/cloudnative-pg.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/databases/postgresql-database.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/databases/postgresql-database.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/databases/postgresql-database.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/databases/postgresql-database.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/homelab/alertmanager-9578_rev4.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/homelab/alertmanager-9578_rev4.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/homelab/alertmanager-9578_rev4.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/homelab/alertmanager-9578_rev4.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/homelab/node-exporter-full-1860_rev33.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/homelab/node-exporter-full-1860_rev33.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/homelab/node-exporter-full-1860_rev33.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/homelab/node-exporter-full-1860_rev33.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/homelab/nut-exporter.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/homelab/nut-exporter.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/homelab/nut-exporter.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/homelab/nut-exporter.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/istio/istio-extension-dashboard.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-extension-dashboard.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/istio/istio-extension-dashboard.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-extension-dashboard.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/istio/istio-mesh-dashboard.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-mesh-dashboard.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/istio/istio-mesh-dashboard.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-mesh-dashboard.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/istio/istio-performance-dashboard.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-performance-dashboard.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/istio/istio-performance-dashboard.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-performance-dashboard.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/istio/istio-service-dashboard.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-service-dashboard.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/istio/istio-service-dashboard.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-service-dashboard.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/istio/istio-workload-dashboard.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-workload-dashboard.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/istio/istio-workload-dashboard.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-workload-dashboard.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/istio/pilot-dashboard.gen.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/pilot-dashboard.gen.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/istio/pilot-dashboard.gen.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/pilot-dashboard.gen.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/istio/ztunnel-dashboard.gen.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/ztunnel-dashboard.gen.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/istio/ztunnel-dashboard.gen.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/ztunnel-dashboard.gen.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-addons-trivy-operator.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-addons-trivy-operator.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-addons-trivy-operator.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-addons-trivy-operator.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-system-api-server.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-system-api-server.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-system-api-server.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-system-api-server.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-system-coredns.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-system-coredns.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-system-coredns.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-system-coredns.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-global.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-global.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-global.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-global.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-namespaces.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-namespaces.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-namespaces.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-namespaces.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-nodes.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-nodes.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-nodes.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-nodes.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-pods.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-pods.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-pods.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-pods.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-service.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-service.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-service.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-service.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/kubernetes/kubernetes-persistent-volumes.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/kubernetes-persistent-volumes.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/kubernetes/kubernetes-persistent-volumes.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/kubernetes-persistent-volumes.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/kubevirt/kubevirt-control-plane.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubevirt/kubevirt-control-plane.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/kubevirt/kubevirt-control-plane.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubevirt/kubevirt-control-plane.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/loki-mixin/loki-chunks.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-chunks.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/loki-mixin/loki-chunks.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-chunks.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/loki-mixin/loki-deletion.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-deletion.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/loki-mixin/loki-deletion.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-deletion.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/loki-mixin/loki-logs.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-logs.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/loki-mixin/loki-logs.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-logs.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/loki-mixin/loki-operational.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-operational.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/loki-mixin/loki-operational.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-operational.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/loki-mixin/loki-retention.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-retention.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/loki-mixin/loki-retention.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-retention.json diff --git a/hosts/idols-aquamarine/grafana/dashboards/victoriametrics/victoria-metrics-single.json b/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/victoriametrics/victoria-metrics-single.json similarity index 100% rename from hosts/idols-aquamarine/grafana/dashboards/victoriametrics/victoria-metrics-single.json rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/victoriametrics/victoria-metrics-single.json diff --git a/hosts/idols-aquamarine/grafana/datasources.nix b/hosts/k8s/kubevirt-youko/homelab-services/grafana/datasources.nix similarity index 97% rename from hosts/idols-aquamarine/grafana/datasources.nix rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/datasources.nix index 0451baf7..626dc7c0 100644 --- a/hosts/idols-aquamarine/grafana/datasources.nix +++ b/hosts/k8s/kubevirt-youko/homelab-services/grafana/datasources.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, mylib, ... }: { # Declaratively provision Grafana's data sources, dashboards, and alerting rules. @@ -114,7 +114,7 @@ postgresVersion = 1500; # 15.xx # tls tlsConfigurationMethod = "file-path"; - sslRootCertFile = ../../../certs/ecc-ca.crt; + sslRootCertFile = mylib.relativeToRoot "certs/ecc-ca.crt"; }; editable = false; } diff --git a/hosts/idols-aquamarine/grafana/default.nix b/hosts/k8s/kubevirt-youko/homelab-services/grafana/default.nix similarity index 100% rename from hosts/idols-aquamarine/grafana/default.nix rename to hosts/k8s/kubevirt-youko/homelab-services/grafana/default.nix diff --git a/hosts/idols-aquamarine/monitoring/README.md b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/README.md similarity index 100% rename from hosts/idols-aquamarine/monitoring/README.md rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/README.md diff --git a/hosts/idols-aquamarine/monitoring/alert.nix b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert.nix similarity index 100% rename from hosts/idols-aquamarine/monitoring/alert.nix rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert.nix diff --git a/hosts/idols-aquamarine/monitoring/alert_rules/README.md b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/README.md similarity index 100% rename from hosts/idols-aquamarine/monitoring/alert_rules/README.md rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/README.md diff --git a/hosts/idols-aquamarine/monitoring/alert_rules/argocd-exporter.yml b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/argocd-exporter.yml similarity index 100% rename from hosts/idols-aquamarine/monitoring/alert_rules/argocd-exporter.yml rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/argocd-exporter.yml diff --git a/hosts/idols-aquamarine/monitoring/alert_rules/coredns-exporter.yml b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/coredns-exporter.yml similarity index 100% rename from hosts/idols-aquamarine/monitoring/alert_rules/coredns-exporter.yml rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/coredns-exporter.yml diff --git a/hosts/idols-aquamarine/monitoring/alert_rules/etcd-exporter.yml b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/etcd-exporter.yml similarity index 100% rename from hosts/idols-aquamarine/monitoring/alert_rules/etcd-exporter.yml rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/etcd-exporter.yml diff --git a/hosts/idols-aquamarine/monitoring/alert_rules/fluxcd-exporter.yml b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/fluxcd-exporter.yml similarity index 100% rename from hosts/idols-aquamarine/monitoring/alert_rules/fluxcd-exporter.yml rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/fluxcd-exporter.yml diff --git a/hosts/idols-aquamarine/monitoring/alert_rules/general.yml b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/general.yml similarity index 100% rename from hosts/idols-aquamarine/monitoring/alert_rules/general.yml rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/general.yml diff --git a/hosts/idols-aquamarine/monitoring/alert_rules/istio-exporter.yml b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/istio-exporter.yml similarity index 100% rename from hosts/idols-aquamarine/monitoring/alert_rules/istio-exporter.yml rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/istio-exporter.yml diff --git a/hosts/idols-aquamarine/monitoring/alert_rules/kube-state-metrics-exporter.yml b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/kube-state-metrics-exporter.yml similarity index 100% rename from hosts/idols-aquamarine/monitoring/alert_rules/kube-state-metrics-exporter.yml rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/kube-state-metrics-exporter.yml diff --git a/hosts/idols-aquamarine/monitoring/alert_rules/kubernetes.yml b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/kubernetes.yml similarity index 100% rename from hosts/idols-aquamarine/monitoring/alert_rules/kubernetes.yml rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/kubernetes.yml diff --git a/hosts/idols-aquamarine/monitoring/alert_rules/loki-exporter.yaml b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/loki-exporter.yaml similarity index 100% rename from hosts/idols-aquamarine/monitoring/alert_rules/loki-exporter.yaml rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/loki-exporter.yaml diff --git a/hosts/idols-aquamarine/monitoring/alert_rules/node-exporter.yml b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/node-exporter.yml similarity index 100% rename from hosts/idols-aquamarine/monitoring/alert_rules/node-exporter.yml rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/node-exporter.yml diff --git a/hosts/idols-aquamarine/monitoring/alert_rules/nut-exporter.yml b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/nut-exporter.yml similarity index 100% rename from hosts/idols-aquamarine/monitoring/alert_rules/nut-exporter.yml rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/nut-exporter.yml diff --git a/hosts/idols-aquamarine/monitoring/alert_rules/postgres-exporter.yml b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/postgres-exporter.yml similarity index 100% rename from hosts/idols-aquamarine/monitoring/alert_rules/postgres-exporter.yml rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/postgres-exporter.yml diff --git a/hosts/idols-aquamarine/monitoring/default.nix b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/default.nix similarity index 100% rename from hosts/idols-aquamarine/monitoring/default.nix rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/default.nix diff --git a/hosts/idols-aquamarine/monitoring/recoding_rules/README.md b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/recoding_rules/README.md similarity index 100% rename from hosts/idols-aquamarine/monitoring/recoding_rules/README.md rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/recoding_rules/README.md diff --git a/hosts/idols-aquamarine/monitoring/recoding_rules/k8s.yml b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/recoding_rules/k8s.yml similarity index 100% rename from hosts/idols-aquamarine/monitoring/recoding_rules/k8s.yml rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/recoding_rules/k8s.yml diff --git a/hosts/idols-aquamarine/monitoring/recoding_rules/node-exporter.yml b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/recoding_rules/node-exporter.yml similarity index 100% rename from hosts/idols-aquamarine/monitoring/recoding_rules/node-exporter.yml rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/recoding_rules/node-exporter.yml diff --git a/hosts/idols-aquamarine/monitoring/victoriametrics.nix b/hosts/k8s/kubevirt-youko/homelab-services/monitoring/victoriametrics.nix similarity index 100% rename from hosts/idols-aquamarine/monitoring/victoriametrics.nix rename to hosts/k8s/kubevirt-youko/homelab-services/monitoring/victoriametrics.nix diff --git a/hosts/idols-aquamarine/oci-containers/default.nix b/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/default.nix similarity index 100% rename from hosts/idols-aquamarine/oci-containers/default.nix rename to hosts/k8s/kubevirt-youko/homelab-services/oci-containers/default.nix diff --git a/hosts/idols-aquamarine/oci-containers/homepage/config/bookmarks.yaml b/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/bookmarks.yaml similarity index 100% rename from hosts/idols-aquamarine/oci-containers/homepage/config/bookmarks.yaml rename to hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/bookmarks.yaml diff --git a/hosts/idols-aquamarine/oci-containers/homepage/config/custom.css b/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/custom.css similarity index 100% rename from hosts/idols-aquamarine/oci-containers/homepage/config/custom.css rename to hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/custom.css diff --git a/hosts/idols-aquamarine/oci-containers/homepage/config/custom.js b/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/custom.js similarity index 100% rename from hosts/idols-aquamarine/oci-containers/homepage/config/custom.js rename to hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/custom.js diff --git a/hosts/idols-aquamarine/oci-containers/homepage/config/docker.yaml b/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/docker.yaml similarity index 100% rename from hosts/idols-aquamarine/oci-containers/homepage/config/docker.yaml rename to hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/docker.yaml diff --git a/hosts/idols-aquamarine/oci-containers/homepage/config/kubernetes.yaml b/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/kubernetes.yaml similarity index 100% rename from hosts/idols-aquamarine/oci-containers/homepage/config/kubernetes.yaml rename to hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/kubernetes.yaml diff --git a/hosts/idols-aquamarine/oci-containers/homepage/config/services.yaml b/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/services.yaml similarity index 100% rename from hosts/idols-aquamarine/oci-containers/homepage/config/services.yaml rename to hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/services.yaml diff --git a/hosts/idols-aquamarine/oci-containers/homepage/config/settings.yaml b/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/settings.yaml similarity index 100% rename from hosts/idols-aquamarine/oci-containers/homepage/config/settings.yaml rename to hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/settings.yaml diff --git a/hosts/idols-aquamarine/oci-containers/homepage/config/widgets.yaml b/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/widgets.yaml similarity index 100% rename from hosts/idols-aquamarine/oci-containers/homepage/config/widgets.yaml rename to hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/widgets.yaml diff --git a/hosts/idols-aquamarine/oci-containers/homepage/default.nix b/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/default.nix similarity index 100% rename from hosts/idols-aquamarine/oci-containers/homepage/default.nix rename to hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/default.nix diff --git a/hosts/idols-aquamarine/oci-containers/uptime-kuma/default.nix b/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/uptime-kuma/default.nix similarity index 95% rename from hosts/idols-aquamarine/oci-containers/uptime-kuma/default.nix rename to hosts/k8s/kubevirt-youko/homelab-services/oci-containers/uptime-kuma/default.nix index 0de5a953..095c12f5 100644 --- a/hosts/idols-aquamarine/oci-containers/uptime-kuma/default.nix +++ b/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/uptime-kuma/default.nix @@ -22,7 +22,7 @@ in # check its logs via `journalctl -u podman-homepage` uptime-kuma = { hostname = "uptime-kuma"; - image = "louislam/uptime-kuma:1"; + image = "docker.io/louislam/uptime-kuma:1"; ports = [ "127.0.0.1:53350:3001" ]; # https://github.com/louislam/uptime-kuma/wiki/Environment-Variables environment = { diff --git a/hosts/idols-aquamarine/postgresql.nix b/hosts/k8s/kubevirt-youko/homelab-services/postgresql.nix similarity index 98% rename from hosts/idols-aquamarine/postgresql.nix rename to hosts/k8s/kubevirt-youko/homelab-services/postgresql.nix index 400e6f9c..ac35aa28 100644 --- a/hosts/idols-aquamarine/postgresql.nix +++ b/hosts/k8s/kubevirt-youko/homelab-services/postgresql.nix @@ -1,5 +1,6 @@ { config, + mylib, pkgs, lib, myvars, @@ -69,7 +70,7 @@ in # ssl ssl = true; - ssl_cert_file = "${../../certs/ecc-server.crt}"; + ssl_cert_file = "${mylib.relativeToRoot "certs/ecc-server.crt"}"; ssl_key_file = config.age.secrets."postgres-ecc-server.key".path; ssl_min_protocol_version = "TLSv1.3"; ssl_ecdh_curve = "secp384r1"; diff --git a/hosts/idols-aquamarine/proxy.nix b/hosts/k8s/kubevirt-youko/homelab-services/proxy.nix similarity index 100% rename from hosts/idols-aquamarine/proxy.nix rename to hosts/k8s/kubevirt-youko/homelab-services/proxy.nix diff --git a/hosts/idols-aquamarine/restic.nix b/hosts/k8s/kubevirt-youko/homelab-services/restic.nix similarity index 100% rename from hosts/idols-aquamarine/restic.nix rename to hosts/k8s/kubevirt-youko/homelab-services/restic.nix diff --git a/hosts/idols-aquamarine/sftpgo.nix b/hosts/k8s/kubevirt-youko/homelab-services/sftpgo.nix similarity index 100% rename from hosts/idols-aquamarine/sftpgo.nix rename to hosts/k8s/kubevirt-youko/homelab-services/sftpgo.nix diff --git a/hosts/idols-aquamarine/transmission.nix b/hosts/k8s/kubevirt-youko/homelab-services/transmission.nix similarity index 94% rename from hosts/idols-aquamarine/transmission.nix rename to hosts/k8s/kubevirt-youko/homelab-services/transmission.nix index 11823b9c..144c74a8 100644 --- a/hosts/idols-aquamarine/transmission.nix +++ b/hosts/k8s/kubevirt-youko/homelab-services/transmission.nix @@ -136,4 +136,9 @@ in seed-queue-size = 10; }; }; + + # The /data mounts are `nofail`, so nothing orders transmission after them; + # without this the unit can start before /data/fileshare/public is mounted and + # fail its mount-namespace setup (seen on the host, where the tasks race). + systemd.services.transmission.unitConfig.RequiresMountsFor = "/data/fileshare/public"; } diff --git a/outputs/x86_64-linux/src/idols-aquamarine.nix b/outputs/x86_64-linux/src/idols-aquamarine.nix deleted file mode 100644 index 7dcd1456..00000000 --- a/outputs/x86_64-linux/src/idols-aquamarine.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - # NOTE: the args not used in this file CAN NOT be removed! - # because haumea pass argument lazily, - # and these arguments are used in the functions like `mylib.nixosSystem`, `mylib.colmenaSystem`, etc. - inputs, - lib, - mylib, - myvars, - system, - genSpecialArgs, - ... -}@args: -let - # 星野 愛久愛海, Hoshino Akuamarin - name = "aquamarine"; - tags = [ - "aqua" - "homelab-network" - ]; - ssh-user = "root"; - - modules = { - nixos-modules = - (map mylib.relativeToRoot [ - # common - "secrets/nixos.nix" - "modules/nixos/server/server.nix" - "modules/nixos/server/kubevirt-hardware-configuration.nix" - # host specific - "hosts/idols-${name}" - ]) - ++ [ - { modules.secrets.server.application.enable = true; } - { modules.secrets.server.operation.enable = true; } - { modules.secrets.server.webserver.enable = true; } - { modules.secrets.server.storage.enable = true; } - ]; - home-modules = map mylib.relativeToRoot [ - "home/hosts/linux/idols-${name}.nix" - ]; - }; - - systemArgs = modules // args; -in -{ - nixosConfigurations.${name} = mylib.nixosSystem systemArgs; - - colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); - - packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.kubevirt; -} diff --git a/outputs/x86_64-linux/tests/home-manager-xdg/expected.nix b/outputs/x86_64-linux/tests/home-manager-xdg/expected.nix index da2ff8d3..0e1251fb 100644 --- a/outputs/x86_64-linux/tests/home-manager-xdg/expected.nix +++ b/outputs/x86_64-linux/tests/home-manager-xdg/expected.nix @@ -5,7 +5,6 @@ in lib.genAttrs [ "ai-niri" - "aquamarine" "ruby" ] (_: { diff --git a/outputs/x86_64-linux/tests/home-manager-xdg/expr.nix b/outputs/x86_64-linux/tests/home-manager-xdg/expr.nix index eccf05c2..d0fea51f 100644 --- a/outputs/x86_64-linux/tests/home-manager-xdg/expr.nix +++ b/outputs/x86_64-linux/tests/home-manager-xdg/expr.nix @@ -7,7 +7,6 @@ let username = myvars.username; hosts = [ "ai-niri" - "aquamarine" "ruby" ]; in diff --git a/outputs/x86_64-linux/tests/security-aquamarine-metrics/expr.nix b/outputs/x86_64-linux/tests/security-aquamarine-metrics/expr.nix index 3d99fe60..e982827b 100644 --- a/outputs/x86_64-linux/tests/security-aquamarine-metrics/expr.nix +++ b/outputs/x86_64-linux/tests/security-aquamarine-metrics/expr.nix @@ -3,7 +3,7 @@ outputs, }: let - aqua = outputs.nixosConfigurations.aquamarine.config; + aqua = outputs.nixosConfigurations.kubevirt-youko.config; in { v2rayExporter = aqua.services.prometheus.exporters.v2ray.listenAddress; diff --git a/outputs/x86_64-linux/tests/ups-metrics/expr.nix b/outputs/x86_64-linux/tests/ups-metrics/expr.nix index 0decca95..7457f11b 100644 --- a/outputs/x86_64-linux/tests/ups-metrics/expr.nix +++ b/outputs/x86_64-linux/tests/ups-metrics/expr.nix @@ -5,7 +5,7 @@ }: let shushou = outputs.nixosConfigurations.kubevirt-shushou.config; - aquamarine = outputs.nixosConfigurations.aquamarine.config; + aquamarine = outputs.nixosConfigurations.kubevirt-youko.config; ups = shushou.power.ups.ups.homelab or { }; exporter = shushou.services.prometheus.exporters.nut; exporterService =