From 69f60095ae271602b468466d693210db48231ce9 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 20 Sep 2026 20:25:39 +0800 Subject: [PATCH] fix(networking): drop shoukei static address shoukei is a laptop using DHCP and never consumes hostsAddr.shoukei. Its 192.168.5.108 collided with k3s-prod-1-master-1 and produced a wrong ssh Host shoukei entry. --- hosts/12kingdoms-shoukei/README.md | 3 +++ vars/networking.nix | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hosts/12kingdoms-shoukei/README.md b/hosts/12kingdoms-shoukei/README.md index 90a2ebc2..6f461f89 100644 --- a/hosts/12kingdoms-shoukei/README.md +++ b/hosts/12kingdoms-shoukei/README.md @@ -2,6 +2,9 @@ This is NixOS's configuration for my Macbook Pro 2022 M2, 16G RAM. +This laptop joins untrusted networks and uses DHCP instead of a static IP, so it has no entry in +`vars/networking.nix`. + Related: - [M2 Series Feature Support - Asahi Linux](https://asahilinux.org/docs/platform/feature-support/m2/) diff --git a/vars/networking.nix b/vars/networking.nix index 0edc1ef9..5466154c 100644 --- a/vars/networking.nix +++ b/vars/networking.nix @@ -84,13 +84,6 @@ rec { iface = "end1"; ipv4 = "192.168.5.107"; }; - shoukei = { - # Apple M2 + NixOS - # Used only when at home - iface = "wlan0"; - ipv4 = "192.168.5.108"; - ipv6 = "fe80::11"; # Link-local Address - }; rakushun = { # Orange Pi 5 - ARM # RJ45 port 1 - enP4p65s0