diff --git a/flake.nix b/flake.nix index 9540586..c49f1af 100644 --- a/flake.nix +++ b/flake.nix @@ -104,9 +104,7 @@ ### nix develop devShells.default = pkgs.mkShell { packages = with pkgs; [ - alejandra colmena - git sops ]; }; @@ -135,7 +133,6 @@ ### NixOS nixosConfigurations = { - "blacksteel" = mkNixOS "x86_64-linux" [./hosts/blacksteel]; "dust" = mkNixOS "x86_64-linux" [./hosts/dust]; }; @@ -157,8 +154,8 @@ ./nixos/profiles/core ]; - "lightsail-tokyo" = { - imports = [./hosts/lightsail-tokyo]; + "tyo0" = { + imports = [./hosts/tyo0]; deployment.targetHost = "tyo0.ny4.dev"; }; diff --git a/hosts/blacksteel/default.nix b/hosts/blacksteel/default.nix index 4d0e484..287ac77 100644 --- a/hosts/blacksteel/default.nix +++ b/hosts/blacksteel/default.nix @@ -74,7 +74,7 @@ enable = true; configFile = pkgs.substituteAll { src = ./Caddyfile; - robots = toString ../lightsail-tokyo/robots.txt; + robots = toString ../tyo0/robots.txt; inherit (pkgs) mastodon; }; }; diff --git a/hosts/lightsail-tokyo/Caddyfile b/hosts/tyo0/Caddyfile similarity index 100% rename from hosts/lightsail-tokyo/Caddyfile rename to hosts/tyo0/Caddyfile diff --git a/hosts/lightsail-tokyo/anti-feature.nix b/hosts/tyo0/anti-feature.nix similarity index 100% rename from hosts/lightsail-tokyo/anti-feature.nix rename to hosts/tyo0/anti-feature.nix diff --git a/hosts/lightsail-tokyo/default.nix b/hosts/tyo0/default.nix similarity index 100% rename from hosts/lightsail-tokyo/default.nix rename to hosts/tyo0/default.nix diff --git a/hosts/lightsail-tokyo/matrix-client.json b/hosts/tyo0/matrix-client.json similarity index 100% rename from hosts/lightsail-tokyo/matrix-client.json rename to hosts/tyo0/matrix-client.json diff --git a/hosts/lightsail-tokyo/matrix-server.json b/hosts/tyo0/matrix-server.json similarity index 100% rename from hosts/lightsail-tokyo/matrix-server.json rename to hosts/tyo0/matrix-server.json diff --git a/hosts/lightsail-tokyo/robots.txt b/hosts/tyo0/robots.txt similarity index 100% rename from hosts/lightsail-tokyo/robots.txt rename to hosts/tyo0/robots.txt diff --git a/hosts/lightsail-tokyo/secrets.yaml b/hosts/tyo0/secrets.yaml similarity index 100% rename from hosts/lightsail-tokyo/secrets.yaml rename to hosts/tyo0/secrets.yaml diff --git a/hosts/lightsail-tokyo/services/forgejo.nix b/hosts/tyo0/services/forgejo.nix similarity index 100% rename from hosts/lightsail-tokyo/services/forgejo.nix rename to hosts/tyo0/services/forgejo.nix diff --git a/hosts/lightsail-tokyo/services/hysteria.nix b/hosts/tyo0/services/hysteria.nix similarity index 100% rename from hosts/lightsail-tokyo/services/hysteria.nix rename to hosts/tyo0/services/hysteria.nix diff --git a/hosts/lightsail-tokyo/services/keycloak.nix b/hosts/tyo0/services/keycloak.nix similarity index 100% rename from hosts/lightsail-tokyo/services/keycloak.nix rename to hosts/tyo0/services/keycloak.nix diff --git a/hosts/lightsail-tokyo/services/miniflux.nix b/hosts/tyo0/services/miniflux.nix similarity index 100% rename from hosts/lightsail-tokyo/services/miniflux.nix rename to hosts/tyo0/services/miniflux.nix diff --git a/hosts/lightsail-tokyo/services/murmur.nix b/hosts/tyo0/services/murmur.nix similarity index 100% rename from hosts/lightsail-tokyo/services/murmur.nix rename to hosts/tyo0/services/murmur.nix diff --git a/hosts/lightsail-tokyo/services/ntfy.nix b/hosts/tyo0/services/ntfy.nix similarity index 100% rename from hosts/lightsail-tokyo/services/ntfy.nix rename to hosts/tyo0/services/ntfy.nix diff --git a/hosts/lightsail-tokyo/services/pixivfe.nix b/hosts/tyo0/services/pixivfe.nix similarity index 100% rename from hosts/lightsail-tokyo/services/pixivfe.nix rename to hosts/tyo0/services/pixivfe.nix diff --git a/hosts/lightsail-tokyo/services/searx.nix b/hosts/tyo0/services/searx.nix similarity index 100% rename from hosts/lightsail-tokyo/services/searx.nix rename to hosts/tyo0/services/searx.nix diff --git a/treefmt.nix b/treefmt.nix index 8e64a8a..ebdb572 100644 --- a/treefmt.nix +++ b/treefmt.nix @@ -2,15 +2,15 @@ projectRootFile = "flake.nix"; ### nix + programs.alejandra.enable = true; programs.deadnix.enable = true; programs.statix.enable = true; - programs.alejandra.enable = true; ### misc programs.prettier.enable = true; settings.formatter.prettier.excludes = [ "hosts/blacksteel/secrets.yaml" - "hosts/lightsail-tokyo/secrets.yaml" + "hosts/tyo0/secrets.yaml" "nixos/profiles/opt-in/mihomo/secrets.yaml" "nixos/profiles/opt-in/wireless/secrets.yaml" "secrets.yaml"