From 8aec107872e73c0efdbd5c2626a97b5df601efdc Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Mon, 13 Oct 2025 11:47:37 -0700 Subject: [PATCH] feat: awrawRAWARAWRWAR --- .github/workflows/flake-update.yml | 3 +- .github/workflows/nodes.yml | 13 ++++++++- ci/flake-cron.nix | 2 +- ci/nodes.nix | 3 +- systems/mai.nix | 3 +- systems/mei.nix | 3 +- tf/kw-git.tf | 8 ------ tf/kw-irc.tf | 8 ------ tf/kw-mon.tf | 8 ------ tf/kw-rss.tf | 8 ------ tf/services.tf | 44 ++++++++++++++++++++++++++++++ 11 files changed, 63 insertions(+), 40 deletions(-) delete mode 100644 tf/kw-git.tf delete mode 100644 tf/kw-irc.tf delete mode 100644 tf/kw-mon.tf delete mode 100644 tf/kw-rss.tf create mode 100644 tf/services.tf diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index 65c20eb6..838190e4 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -6,7 +6,6 @@ env: CI_PLATFORM: gh-actions DISCORD_WEBHOOK_LINK: ${{ secrets.DISCORD_WEBHOOK_LINK }} NIX_CONFIG: ${{ secrets.NIX_CONFIG }} - NIX_INSTALLER: --daemon jobs: ci-check: name: flake-update check @@ -47,6 +46,8 @@ jobs: - id: nix-install name: nix install uses: arcnmx/ci/actions/nix/install@v0.7 + with: + daemon: true - env: NF_CONFIG_ROOT: ${{ github.workspace }} NF_UPDATE_CACHIX_PUSH: '1' diff --git a/.github/workflows/nodes.yml b/.github/workflows/nodes.yml index 44a3f6e0..186b1453 100644 --- a/.github/workflows/nodes.yml +++ b/.github/workflows/nodes.yml @@ -6,7 +6,6 @@ env: CI_PLATFORM: gh-actions DISCORD_WEBHOOK_LINK: ${{ secrets.DISCORD_WEBHOOK_LINK }} NIX_CONFIG: ${{ secrets.NIX_CONFIG }} - NIX_INSTALLER: --daemon jobs: ci-check: name: nodes check @@ -47,6 +46,8 @@ jobs: - id: nix-install name: nix install uses: arcnmx/ci/actions/nix/install@v0.7 + with: + daemon: true - env: NF_CONFIG_ROOT: ${{ github.workspace }} NF_UPDATE_CACHIX_PUSH: '1' @@ -106,6 +107,8 @@ jobs: - id: nix-install name: nix install uses: arcnmx/ci/actions/nix/install@v0.7 + with: + daemon: true - env: NF_CONFIG_ROOT: ${{ github.workspace }} NF_UPDATE_CACHIX_PUSH: '1' @@ -165,6 +168,8 @@ jobs: - id: nix-install name: nix install uses: arcnmx/ci/actions/nix/install@v0.7 + with: + daemon: true - env: NF_CONFIG_ROOT: ${{ github.workspace }} NF_UPDATE_CACHIX_PUSH: '1' @@ -224,6 +229,8 @@ jobs: - id: nix-install name: nix install uses: arcnmx/ci/actions/nix/install@v0.7 + with: + daemon: true - env: NF_CONFIG_ROOT: ${{ github.workspace }} NF_UPDATE_CACHIX_PUSH: '1' @@ -283,6 +290,8 @@ jobs: - id: nix-install name: nix install uses: arcnmx/ci/actions/nix/install@v0.7 + with: + daemon: true - env: NF_CONFIG_ROOT: ${{ github.workspace }} NF_UPDATE_CACHIX_PUSH: '1' @@ -342,6 +351,8 @@ jobs: - id: nix-install name: nix install uses: arcnmx/ci/actions/nix/install@v0.7 + with: + daemon: true - env: NF_CONFIG_ROOT: ${{ github.workspace }} NF_UPDATE_CACHIX_PUSH: '1' diff --git a/ci/flake-cron.nix b/ci/flake-cron.nix index 5150f7c9..be878e68 100644 --- a/ci/flake-cron.nix +++ b/ci/flake-cron.nix @@ -13,7 +13,6 @@ with lib; { CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; - NIX_INSTALLER = "--daemon"; NIX_CONFIG = "\${{ secrets.NIX_CONFIG }}"; }; on = let @@ -37,6 +36,7 @@ with lib; { workflow_dispatch = {}; }; jobs.flake-update = { + step.nix-install."with".daemon = true; step.flake-update = { name = "flake update build"; order = 500; diff --git a/ci/nodes.nix b/ci/nodes.nix index e5e942b9..983dc421 100644 --- a/ci/nodes.nix +++ b/ci/nodes.nix @@ -18,7 +18,6 @@ in { CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; NIX_CONFIG = "\${{ secrets.NIX_CONFIG }}"; - NIX_INSTALLER = "--daemon"; }; on = let paths = [ @@ -38,6 +37,7 @@ in { jobs = let genericNixosBuildJob = name: _system: nameValuePair "nixos-${name}" { + step.nix-install."with".daemon = true; step.${name} = { name = "build system closure for ${name}"; order = 500; @@ -50,6 +50,7 @@ in { }; genericHomeBuildJob = name: _system: nameValuePair "home-${name}" { + step.nix-install."with".daemon = true; step.${name} = { name = "build home closure for ${name}"; order = 500; diff --git a/systems/mai.nix b/systems/mai.nix index 939bd7f5..7af95708 100644 --- a/systems/mai.nix +++ b/systems/mai.nix @@ -15,8 +15,7 @@ _: let oracle_micro ]) ++ (with tree.nixos.servers; [ - forgejo-runner - ]); + ]); system.stateVersion = "23.11"; }; diff --git a/systems/mei.nix b/systems/mei.nix index 939bd7f5..7af95708 100644 --- a/systems/mei.nix +++ b/systems/mei.nix @@ -15,8 +15,7 @@ _: let oracle_micro ]) ++ (with tree.nixos.servers; [ - forgejo-runner - ]); + ]); system.stateVersion = "23.11"; }; diff --git a/tf/kw-git.tf b/tf/kw-git.tf deleted file mode 100644 index 366086f4..00000000 --- a/tf/kw-git.tf +++ /dev/null @@ -1,8 +0,0 @@ -resource "cloudflare_record" "git" { - name = "git" - proxied = false - ttl = 3600 - type = "CNAME" - value = "daiyousei.inskip.me" - zone_id = local.zone_ids.kittywitch -} diff --git a/tf/kw-irc.tf b/tf/kw-irc.tf deleted file mode 100644 index 58867f54..00000000 --- a/tf/kw-irc.tf +++ /dev/null @@ -1,8 +0,0 @@ -resource "cloudflare_record" "irc" { - name = "irc" - proxied = false - ttl = 3600 - type = "CNAME" - value = "daiyousei.inskip.me" - zone_id = local.zone_ids.kittywitch -} \ No newline at end of file diff --git a/tf/kw-mon.tf b/tf/kw-mon.tf deleted file mode 100644 index 50bf588e..00000000 --- a/tf/kw-mon.tf +++ /dev/null @@ -1,8 +0,0 @@ -resource "cloudflare_record" "mon" { - name = "mon" - proxied = false - ttl = 3600 - type = "CNAME" - value = "yukari.gensokyo.zone" - zone_id = local.zone_ids.kittywitch -} \ No newline at end of file diff --git a/tf/kw-rss.tf b/tf/kw-rss.tf deleted file mode 100644 index 5b94237d..00000000 --- a/tf/kw-rss.tf +++ /dev/null @@ -1,8 +0,0 @@ -resource "cloudflare_record" "rss" { - name = "rss" - proxied = false - ttl = 3600 - type = "CNAME" - value = "daiyousei.inskip.me" - zone_id = local.zone_ids.kittywitch -} diff --git a/tf/services.tf b/tf/services.tf new file mode 100644 index 00000000..1aba1534 --- /dev/null +++ b/tf/services.tf @@ -0,0 +1,44 @@ +resource "cloudflare_record" "bluesky_did" { + name = "_atproto" + proxied = false + ttl = 1 + type = "TXT" + value = "did=did:plc:4rkjqsakfq3chmepfcd3al6e" + zone_id = local.zone_ids.kittywitch +} + +resource "cloudflare_record" "git" { + name = "git" + proxied = false + ttl = 3600 + type = "CNAME" + value = "daiyousei.inskip.me" + zone_id = local.zone_ids.kittywitch +} + +resource "cloudflare_record" "irc" { + name = "irc" + proxied = false + ttl = 3600 + type = "CNAME" + value = "daiyousei.inskip.me" + zone_id = local.zone_ids.kittywitch +} + +resource "cloudflare_record" "rss" { + name = "rss" + proxied = false + ttl = 3600 + type = "CNAME" + value = "daiyousei.inskip.me" + zone_id = local.zone_ids.kittywitch +} + +resource "cloudflare_record" "ntfy" { + name = "ntfy" + proxied = false + ttl = 3600 + type = "CNAME" + value = "daiyousei.inskip.me" + zone_id = local.zone_ids.kittywitch +}