mirror of
https://github.com/genebean/dots.git
synced 2026-05-30 23:35:22 -04:00
Replace hardcoded tailnet name and WiFi SSIDs with private-flake options
Tailnet name (atlas-snares.ts.net) is now sourced from config.private-flake.tailnetDomain, defined in private-flake's shared/tailnet.nix and imported by the hetznix01 and nixnuc modules. WiFi SSIDs for kiosk-* hosts are now set by private-flake's shared/kiosk.nix via nixosModules.private.kiosk; the hardcoded network blocks are removed from the kiosk dots configs. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
840f7b90e6
commit
9298bc7caf
7 changed files with 10 additions and 20 deletions
6
flake.lock
generated
6
flake.lock
generated
|
|
@ -740,11 +740,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779934676,
|
"lastModified": 1780005533,
|
||||||
"narHash": "sha256-wp/K//HuAPN0TureyV342zjoee+vSq64+guX35X7DMU=",
|
"narHash": "sha256-6JsTRjhMgaFZTOuJDVmqys/nEKez6Ud/jOU3LoqfCw4=",
|
||||||
"owner": "genebean",
|
"owner": "genebean",
|
||||||
"repo": "private-flake",
|
"repo": "private-flake",
|
||||||
"rev": "7ad20ffceb1b6e48af13b2207241441a2cafa97e",
|
"rev": "aeba0ca58ef1280b311f1a1d12fc6e389ac9fefb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -161,12 +161,16 @@
|
||||||
kiosk-entryway = localLib.mkNixosHost {
|
kiosk-entryway = localLib.mkNixosHost {
|
||||||
# Lenovo IdeaCentre Q190
|
# Lenovo IdeaCentre Q190
|
||||||
hostname = "kiosk-entryway";
|
hostname = "kiosk-entryway";
|
||||||
|
additionalModules = [
|
||||||
|
inputs.private-flake.nixosModules.private.kiosk
|
||||||
|
];
|
||||||
};
|
};
|
||||||
kiosk-gene-desk = localLib.mkNixosHost {
|
kiosk-gene-desk = localLib.mkNixosHost {
|
||||||
system = "aarch64-linux";
|
system = "aarch64-linux";
|
||||||
hostname = "kiosk-gene-desk";
|
hostname = "kiosk-gene-desk";
|
||||||
additionalModules = [
|
additionalModules = [
|
||||||
inputs.nixos-hardware.nixosModules.raspberry-pi-4
|
inputs.nixos-hardware.nixosModules.raspberry-pi-4
|
||||||
|
inputs.private-flake.nixosModules.private.kiosk
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
nixnas1 = localLib.mkNixosHost {
|
nixnas1 = localLib.mkNixosHost {
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
configureNginx = true;
|
configureNginx = true;
|
||||||
environment = {
|
environment = {
|
||||||
PHOTON_API_HOST = "nixnuc.atlas-snares.ts.net:2322";
|
PHOTON_API_HOST = "nixnuc.${config.private-flake.tailnetDomain}:2322";
|
||||||
PHOTON_API_USE_HTTPS = "false";
|
PHOTON_API_USE_HTTPS = "false";
|
||||||
};
|
};
|
||||||
extraEnvFiles = [
|
extraEnvFiles = [
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ in
|
||||||
homeassistant = {
|
homeassistant = {
|
||||||
addresses = [
|
addresses = [
|
||||||
{
|
{
|
||||||
address = "homeasistant-lc.atlas-snares.ts.net";
|
address = "homeasistant-lc.${config.private-flake.tailnetDomain}";
|
||||||
port = 1883;
|
port = 1883;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ let
|
||||||
domain = "technicalissues.us";
|
domain = "technicalissues.us";
|
||||||
http_port = 80;
|
http_port = 80;
|
||||||
https_port = 443;
|
https_port = 443;
|
||||||
private_btc = "umbrel.atlas-snares.ts.net";
|
private_btc = "umbrel.${config.private-flake.tailnetDomain}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,13 +45,6 @@
|
||||||
useNetworkd = true;
|
useNetworkd = true;
|
||||||
wireless = {
|
wireless = {
|
||||||
enable = true;
|
enable = true;
|
||||||
networks = {
|
|
||||||
# Home
|
|
||||||
"Diagon Alley".pskRaw = "ext:psk_diagon_alley";
|
|
||||||
# Public networks
|
|
||||||
"Gallery Row-GuestWiFi" = { };
|
|
||||||
"LocalTies Guest".pskRaw = "ext:psk_local_ties";
|
|
||||||
};
|
|
||||||
secretsFile = "${config.sops.secrets.wifi_creds.path}";
|
secretsFile = "${config.sops.secrets.wifi_creds.path}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -39,13 +39,6 @@
|
||||||
useNetworkd = true;
|
useNetworkd = true;
|
||||||
wireless = {
|
wireless = {
|
||||||
enable = true;
|
enable = true;
|
||||||
networks = {
|
|
||||||
# Home
|
|
||||||
"Diagon Alley".pskRaw = "ext:psk_diagon_alley";
|
|
||||||
# Public networks
|
|
||||||
"Gallery Row-GuestWiFi" = { };
|
|
||||||
"LocalTies Guest".pskRaw = "ext:psk_local_ties";
|
|
||||||
};
|
|
||||||
secretsFile = "${config.sops.secrets.wifi_creds.path}";
|
secretsFile = "${config.sops.secrets.wifi_creds.path}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue