From 68d2af6dc47c95fb187536fe33f935667599be32 Mon Sep 17 00:00:00 2001 From: imnyang Date: Tue, 22 Sep 2026 22:54:41 +0900 Subject: [PATCH 1/3] wow --- hosts/server/natsu/services/caddy.nix | 4 + .../natsu/services/cfwithoutincident.nix | 81 ++++++++++++++++--- modules/mizukios/features/caddy/common.nix | 5 +- 3 files changed, 79 insertions(+), 11 deletions(-) diff --git a/hosts/server/natsu/services/caddy.nix b/hosts/server/natsu/services/caddy.nix index f49e73f..956849b 100644 --- a/hosts/server/natsu/services/caddy.nix +++ b/hosts/server/natsu/services/caddy.nix @@ -33,6 +33,10 @@ reverse_proxy localhost:9794 ''; + virtualHosts."wiki.icetang.xyz".extraConfig = '' + reverse_proxy localhost:51337 + ''; + virtualHosts."pve.hikari.icn.mizuki.guru".extraConfig = '' reverse_proxy https://10.11.8.100:8006 { header_up X-Real-Ip {remote_host} diff --git a/hosts/server/natsu/services/cfwithoutincident.nix b/hosts/server/natsu/services/cfwithoutincident.nix index 2602946..ddf322e 100644 --- a/hosts/server/natsu/services/cfwithoutincident.nix +++ b/hosts/server/natsu/services/cfwithoutincident.nix @@ -1,5 +1,75 @@ { inputs, pkgs, ... }: +let + nodeModules = pkgs.stdenvNoCC.mkDerivation { + pname = "cfwithoutincident-node-modules"; + version = "1.0.50"; + src = inputs.cfwithoutincident; + + nativeBuildInputs = [ pkgs.bun ]; + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + export HOME="$TMPDIR/home" + export BUN_INSTALL_CACHE_DIR="$TMPDIR/bun-cache" + mkdir -p "$HOME" "$BUN_INSTALL_CACHE_DIR" + + bun install \ + --frozen-lockfile \ + --ignore-scripts \ + --no-progress \ + --production + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + cp -R node_modules "$out/" + + runHook postInstall + ''; + + # Bun dependencies are fetched in this fixed-output derivation, so the + # regular build remains network-independent and reproducible. + dontFixup = true; + outputHash = "sha256-FrYyXCpzunrA92NQ9ffrmjJaPTFiTlCsW8OXdpt4m28="; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }; + + cfwithoutincident = pkgs.stdenvNoCC.mkDerivation { + pname = "cfwithoutincident"; + version = "1.0.50"; + src = inputs.cfwithoutincident; + + nativeBuildInputs = [ pkgs.bun ]; + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + cp -R ${nodeModules}/node_modules . + bun build --compile --minify src/index.ts --outfile cfwithoutincident + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 cfwithoutincident "$out/bin/cfwithoutincident" + + runHook postInstall + ''; + + dontFixup = true; + }; +in { systemd.services.cfwithoutincident = { description = "Cloudflare Status D-Day dashboard"; @@ -11,21 +81,12 @@ Type = "simple"; User = "imnyang"; Group = "users"; - WorkingDirectory = "/var/lib/cfwithoutincident"; Environment = [ "PORT=31774" ]; - ExecStartPre = [ - "${pkgs.coreutils}/bin/cp -r ${inputs.cfwithoutincident}/. /var/lib/cfwithoutincident/" - "${pkgs.bun}/bin/bun install --frozen-lockfile" - ]; - ExecStart = "${pkgs.bun}/bin/bun run src/index.ts"; + ExecStart = "${cfwithoutincident}/bin/cfwithoutincident"; Restart = "always"; RestartSec = 5; - StateDirectory = "cfwithoutincident"; - StateDirectoryMode = "0755"; }; - - path = [ pkgs.bun ]; }; } diff --git a/modules/mizukios/features/caddy/common.nix b/modules/mizukios/features/caddy/common.nix index 199d9ab..e55eb47 100644 --- a/modules/mizukios/features/caddy/common.nix +++ b/modules/mizukios/features/caddy/common.nix @@ -43,7 +43,10 @@ in "github.com/RussellLuo/caddy-ext/ratelimit@v0.3.0" "github.com/neodyme-labs/user_agent_parse@v0.0.1" ]; - hash = "sha256-r4MgRk8HpKYx7f8FmA3PKgD/5ZNTIHpQvlE+zRbP0lw="; + hash = { + "x86_64-linux" = "sha256-r4MgRk8HpKYx7f8FmA3PKgD/5ZNTIHpQvlE+zRbP0lw="; + "aarch64-linux" = "sha256-AfCiPSLCrZeKRJV6CRE6ps96lyinbgxaVnEpwLXPHMk="; + }.${pkgs.stdenv.hostPlatform.system}; }; globalConfig = '' admin unix//run/caddy/admin.socket From df1cfe6b97a0c50db7ac883b9ba1c5ca6d313bda Mon Sep 17 00:00:00 2001 From: imnyang Date: Tue, 13 Oct 2026 07:28:58 +0900 Subject: [PATCH 2/3] wow --- flake.lock | 185 ++++++++++++++++++----------------- modules/home/discord/mac.nix | 5 +- 2 files changed, 99 insertions(+), 91 deletions(-) diff --git a/flake.lock b/flake.lock index 42c72c1..f86cbc6 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1789553013, - "narHash": "sha256-W5dvgFOuVs24X3G5tUb8C2IHU7ICXNvyGPiWWFjfbuo=", + "lastModified": 1791212692, + "narHash": "sha256-oPAfsTRNqAFsycAirLU05uTVKo3MaZf7fz88ekCeoO8=", "owner": "catppuccin", "repo": "nix", - "rev": "89b3eacf59d6b5eefbc2d69c3a4eb5aaf66d63bc", + "rev": "0c0335a1a6d326adb5a5e116aae0d51c7041b2e5", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1791000063, - "narHash": "sha256-c31ri7SpsdKZoOimPbasl4hjoZlu8/bsI0TCfbJ60LU=", + "lastModified": 1791372183, + "narHash": "sha256-XPi47Kv3zro0gjRxuj1q+7Tdf6V2uSF+ALJq/eHbyAM=", "owner": "ilysenko", "repo": "codex-desktop-linux", - "rev": "d0936534b3269e9c5f509bf2aa32dc3746879286", + "rev": "20a27f51bf1618c4ba661b64512a9124117accd8", "type": "github" }, "original": { @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1790989254, - "narHash": "sha256-ZN+riaeFuE+DZ5zfqJiXlM12jLwZzeIXiNkU1YeHMXI=", + "lastModified": 1791306979, + "narHash": "sha256-KuLePuhwJM9NLt/gTLHzXaOoSZKGoB3m7NfXjiQ98HY=", "owner": "nix-community", "repo": "home-manager", - "rev": "acd21c5a3420a9d5fd0ed06299b10828267ef9ba", + "rev": "fae6e9e42c3b762ab47635cddcfaf6f52374a61b", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1790742243, - "narHash": "sha256-kaNo6xHiL31AbNNEreG0OTKf4j6Cxlo5bPawjX7lnbQ=", + "lastModified": 1790996401, + "narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=", "owner": "nix-community", "repo": "home-manager", - "rev": "e5fcd298a00f08b6e8390baf04aa8edb62203070", + "rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35", "type": "github" }, "original": { @@ -343,11 +343,11 @@ ] }, "locked": { - "lastModified": 1790793570, - "narHash": "sha256-iWz98a1jWYk6XGv38IWY9uA55gBwQZyDw2oN65ml9Rw=", + "lastModified": 1791400091, + "narHash": "sha256-ciQ03pwbhGTGo/stNmNM8sEIKYKpUp1cXyIihp9zi1M=", "owner": "BlueManCZ", "repo": "hyprmod", - "rev": "4fe54f2ee5f1943a2007959e0d67479879fb2c92", + "rev": "e148d221cc62edaa8d1b8ffac0f0a57edcb8e3c1", "type": "github" }, "original": { @@ -395,15 +395,16 @@ "millennium": { "inputs": { "millennium-src": "millennium-src", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_5", + "nixpkgs-bun": "nixpkgs-bun" }, "locked": { "dir": "packages/nix", - "lastModified": 1790954892, - "narHash": "sha256-7NVnbbP4g9sP7X56DUnvBeZY1/pRcQKn2IJMTnm5jls=", + "lastModified": 1791044936, + "narHash": "sha256-+mNY2lHscvVa4KntAxuRMMFYMYxju06avIKyHooM8EE=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "dd868c3c108780c4f63e9fb569a9d5a28a088a51", + "rev": "63c3928f0306edd83122c0f5b085a9b1a3d60f55", "type": "github" }, "original": { @@ -528,15 +529,15 @@ "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_8", "nixpkgs-ci": "nixpkgs-ci", - "nixpkgs-nixcord": "nixpkgs-nixcord", + "nixpkgs-packages": "nixpkgs-packages", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1791007510, - "narHash": "sha256-R7P+jKdK0iZwHv/V1jeTfBigqhLYwoIKc78mSHtfNAA=", + "lastModified": 1791432440, + "narHash": "sha256-RHcvphkbVMk/tCHHJTW313f3s+uoV4o1fyvPKA2/SOw=", "owner": "4evy", "repo": "nixcord", - "rev": "1c47afb71426fa2b97b562ff5e50527075dc0110", + "rev": "4886fc3737858f4817a79f9afefea6158f317f9b", "type": "github" }, "original": { @@ -567,11 +568,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1789044656, - "narHash": "sha256-sDGcZgdRVR58ceKz0RmkBtdUomBvu5vzbf6Aw5rUCo0=", - "rev": "1927682e0d808b4a695910f76562b11e2ddecab4", + "lastModified": 1790652569, + "narHash": "sha256-k8Fu4c9Z+4Nh7mUr0cfw++ITQiyEhlWxoJBOkI3tOcQ=", + "rev": "b6c8664de9b6cc07fe5666a29f91884ba81197c4", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1070934.1927682e0d80/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1082290.b6c8664de9b6/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -594,22 +595,35 @@ "type": "github" } }, - "nixpkgs-ci": { + "nixpkgs-bun": { "locked": { - "lastModified": 1790652569, - "narHash": "sha256-641r7xrlSOHYoktL9/aArPIYNgZJ9eM5URzSEOtPJDY=", - "owner": "NixOS", + "lastModified": 1790822859, + "narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "b6c8664de9b6cc07fe5666a29f91884ba81197c4", + "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", "repo": "nixpkgs", + "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa", "type": "github" } }, + "nixpkgs-ci": { + "locked": { + "lastModified": 1791130267, + "narHash": "sha256-NCFqY2YC3/5pwakzk7tXNUj3sG+VImjU4EkZMacxF1w=", + "rev": "9013764fcc0ea99fa16cf7aa7decf8a5c3889dd2", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1085518.9013764fcc0e/nixexprs.tar.zst" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" + } + }, "nixpkgs-libxml2": { "locked": { "lastModified": 1751274312, @@ -626,29 +640,26 @@ "type": "github" } }, - "nixpkgs-nixcord": { + "nixpkgs-packages": { "locked": { - "lastModified": 1790635395, - "narHash": "sha256-bNyvoIyOCu7lzoCpWKWGIsHpTtERUWzqYWFPlN++WTw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7fc6f2c20af09cdcaf48b92ec3121860139ec668", - "type": "github" + "lastModified": 1791130267, + "narHash": "sha256-NCFqY2YC3/5pwakzk7tXNUj3sG+VImjU4EkZMacxF1w=", + "rev": "9013764fcc0ea99fa16cf7aa7decf8a5c3889dd2", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1085518.9013764fcc0e/nixexprs.tar.zst" }, "original": { - "owner": "NixOS", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" } }, "nixpkgs_10": { "locked": { - "lastModified": 1790822859, - "narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=", + "lastModified": 1791260994, + "narHash": "sha256-Miqqk/ammqnTUxaoCyvtwoPeLbI1ksFyLxi/CazZpWY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa", + "rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4", "type": "github" }, "original": { @@ -676,11 +687,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1790463110, - "narHash": "sha256-VZHcT2wKLkApBCACQ2SH4P1jVZUbbOA7jWAGi1MIViw=", - "rev": "e158d9ed9b51c98974c5e66e1ba1c9e0255fecaa", + "lastModified": 1790822859, + "narHash": "sha256-VBA0QerzzmL+4wxgtwiCdiLwLpJg2/9xOxhgO3BRJQA=", + "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1080189.e158d9ed9b51/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1083223.c59305bab206/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -769,18 +780,15 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", - "type": "github" + "lastModified": 1790769526, + "narHash": "sha256-6j4yqqBUvIbBn29k0y/2jqlv/YJd8CRkTBYhfm5Z/8c=", + "rev": "c9fe7d12cd78d1adcd12dd15e24432dde5b155a0", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1082837.c9fe7d12cd78/nixexprs.tar.zst?lastModified=1790769526&rev=c9fe7d12cd78d1adcd12dd15e24432dde5b155a0" }, "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" } }, "nixpkgs_6": { @@ -817,18 +825,15 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1790635395, - "narHash": "sha256-bNyvoIyOCu7lzoCpWKWGIsHpTtERUWzqYWFPlN++WTw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7fc6f2c20af09cdcaf48b92ec3121860139ec668", - "type": "github" + "lastModified": 1791143449, + "narHash": "sha256-XvTu5S/TUsH4Jn9WRXSJfSxD7kHN4OzM/y+sKEzN8rU=", + "rev": "0d9e9b832d03ac387417e16ce1febf73b2e631e1", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.11216.0d9e9b832d03/nixexprs.tar.zst" }, "original": { - "owner": "NixOS", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixos-26.05/nixexprs.tar.zst" } }, "nixpkgs_9": { @@ -1027,11 +1032,11 @@ ] }, "locked": { - "lastModified": 1790182695, - "narHash": "sha256-Qkh5MyD52JtzcHh/ooTLFIpmAwl8du6j472+uKpq3s4=", + "lastModified": 1791042015, + "narHash": "sha256-FqDKwfZF9HopiOwNI0aDk12HP4kn6ScY8QybAkvfHG0=", "owner": "rustfs", "repo": "rustfs-flake", - "rev": "2e8e0e5a45d918ffa15f8a743988b36bdc8268f8", + "rev": "c3a5e7737c0e283a3b421681472aa8668c3cc813", "type": "github" }, "original": { @@ -1047,11 +1052,11 @@ ] }, "locked": { - "lastModified": 1790498116, - "narHash": "sha256-rs9meAYxW3zzrh43yaW7htrqCD+X9+pupDPHN86fumI=", + "lastModified": 1791103873, + "narHash": "sha256-nFxM+pKoZ8LJAEnUXARyCaOAloWgaW9kZQOSjWzKcTE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5efb5a6f4f5ab192817d28557dd4d650fa14d866", + "rev": "dcd241ba97088c22569d1573286e1b9daad340c0", "type": "github" }, "original": { @@ -1088,11 +1093,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1790502898, - "narHash": "sha256-eR6P8ZCyYqrdvuOANIOE78t4qqm6wSTBKLP/aW8nwJE=", + "lastModified": 1791109926, + "narHash": "sha256-N4ZWEoceF9U+np24Pzi8OjJwqjoe36zHUR31pEhUKng=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "d508ccfa23820d032589bd65345bf5b6d9ea842f", + "rev": "32d97b6b3c3401e5d0e474c82e764f8f9bf35b86", "type": "github" }, "original": { @@ -1214,11 +1219,11 @@ ] }, "locked": { - "lastModified": 1786901030, - "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", + "lastModified": 1791198660, + "narHash": "sha256-f8Pye933T60vreB9u9pqfAXDyBqO13U7H0LvPsOxCIA=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", + "rev": "8b367b728be38d1bb7206f037c9df9989df3353a", "type": "github" }, "original": { @@ -1235,11 +1240,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1790972264, - "narHash": "sha256-JAi32uRoi5NxQAbLAJPF1m/ixqGbNs9e6ja3meHLvZw=", + "lastModified": 1791309532, + "narHash": "sha256-pYorP5iwAlMTkyutP7P3i40B/VLFO9VUD0BjcmSGsvM=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "7733e952e88ec2b44340f35b93846d1158e3fd24", + "rev": "b66cc7241a33bf1b1181cbac6de4f9e00042d9cb", "type": "github" }, "original": { @@ -1258,11 +1263,11 @@ "vicinae": "vicinae_2" }, "locked": { - "lastModified": 1790242820, - "narHash": "sha256-xG2Nvdhl+lcguYzkAHf6RkHQpM8c3rbN0NDHUiwT4CA=", + "lastModified": 1791201649, + "narHash": "sha256-/wl3XkJ/1kyE3X9IYwkSC2Eatlnez4z28eqnFgOaG+o=", "owner": "vicinaehq", "repo": "extensions", - "rev": "def646b3655e13759d2b0a7b9d605f55fe83a5f7", + "rev": "413154812ffce610218c523b9c479febe46c5327", "type": "github" }, "original": { diff --git a/modules/home/discord/mac.nix b/modules/home/discord/mac.nix index 34c6fd7..870d6a1 100644 --- a/modules/home/discord/mac.nix +++ b/modules/home/discord/mac.nix @@ -1,5 +1,8 @@ # darwin-configuration.nix { inputs, pkgs, ... }: +let + nixcordPackages = inputs.nixcord.packages.${pkgs.stdenv.hostPlatform.system}; +in { imports = [ inputs.nixcord.darwinModules.nixcord ]; @@ -8,7 +11,7 @@ user = "imnyang"; # Needed for system-level config discord = { - package = pkgs.discord-canary; + package = nixcordPackages.discord-canary; equicord.enable = true; branches = [ "canary" ]; }; From fab8ec8fc3b4742987dbd6d7bcfb8216bb84ff2e Mon Sep 17 00:00:00 2001 From: imnyang Date: Tue, 13 Oct 2026 07:29:18 +0900 Subject: [PATCH 3/3] wow --- hosts/server/natsu/services/caddy.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hosts/server/natsu/services/caddy.nix b/hosts/server/natsu/services/caddy.nix index 956849b..1930d65 100644 --- a/hosts/server/natsu/services/caddy.nix +++ b/hosts/server/natsu/services/caddy.nix @@ -25,6 +25,10 @@ reverse_proxy 10.11.8.102:9080 ''; + virtualHosts."orbitrender-exp.mizuki.guru".extraConfig = '' + reverse_proxy 10.20.30.192:3000 + ''; + virtualHosts."plutos.dazzle.st".extraConfig = '' reverse_proxy localhost:13000 ''; @@ -34,7 +38,10 @@ ''; virtualHosts."wiki.icetang.xyz".extraConfig = '' - reverse_proxy localhost:51337 + reverse_proxy localhost:51337 { + header_up X-Real-IP {client_ip} + header_up X-Forwarded-For {client_ip} + } ''; virtualHosts."pve.hikari.icn.mizuki.guru".extraConfig = ''