bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove zerotier host aliases

Browse source
This commit is contained in:
Filippo Berto 2025-05-18 14:00:31 +02:00
parent 587cd2e583
commit c4768eb2fd
Signed by: bertof
GPG key ID: 9DBF7E6A1D2CE9ED
10 changed files with 33 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

44
hosts.nix
View file

@ -20,26 +20,26 @@
"thor.tsn" = "fd7a:115c:a1e0::7ecc:6224"; "thor.tsn" = "fd7a:115c:a1e0::7ecc:6224";
}; };
}; };
zerotier = { # zerotier = {
ipv4 = { # ipv4 = {
"baldur.zto" = "172.23.171.70"; # "baldur.zto" = "172.23.171.70";
"freya.zto" = "172.23.18.147"; # "freya.zto" = "172.23.18.147";
"heimdall.zto" = "172.23.128.245"; # "heimdall.zto" = "172.23.128.245";
"loki.zto" = "172.23.254.55"; # "loki.zto" = "172.23.254.55";
"odin.zto" = "172.23.219.133"; # "odin.zto" = "172.23.219.133";
"thor.zto" = "172.23.24.223"; # "thor.zto" = "172.23.24.223";
"tiziano.zto" = "172.23.110.109"; # "tiziano.zto" = "172.23.110.109";
"x3pro.zto" = "172.23.255.161"; # "x3pro.zto" = "172.23.255.161";
}; # };
ipv6 = { # ipv6 = {
"baldur.zto" = "fd80:56c2:e21c:f9c7:5399:933b:abd2:a7c9"; # "baldur.zto" = "fd80:56c2:e21c:f9c7:5399:933b:abd2:a7c9";
"freya.zto" = "fd80:56c2:e21c:f9c7:5399:93f3:ffbc:1355"; # "freya.zto" = "fd80:56c2:e21c:f9c7:5399:93f3:ffbc:1355";
"heimdall.zto" = "fd80:56c2:e21c:f9c7:5399:93b0:e66c:cda7"; # "heimdall.zto" = "fd80:56c2:e21c:f9c7:5399:93b0:e66c:cda7";
"loki.zto" = "fd80:56c2:e21c:f9c7:5399:93b3:aa75:fed1"; # "loki.zto" = "fd80:56c2:e21c:f9c7:5399:93b3:aa75:fed1";
"odin.zto" = "fd80:56c2:e21c:f9c7:5399:9379:ef39:0dd3"; # "odin.zto" = "fd80:56c2:e21c:f9c7:5399:9379:ef39:0dd3";
"thor.zto" = "fd80:56c2:e21c:f9c7:5399:9324:3c16:6499"; # "thor.zto" = "fd80:56c2:e21c:f9c7:5399:9324:3c16:6499";
"tiziano.zto" = "fd80:56c2:e21c:f9c7:5399:93f3:4bbb:8b38"; # "tiziano.zto" = "fd80:56c2:e21c:f9c7:5399:93f3:4bbb:8b38";
"x3pro.zto" = "fd80:56c2:e21c:f9c7:5399:9379:6b02:be97"; # "x3pro.zto" = "fd80:56c2:e21c:f9c7:5399:9379:6b02:be97";
}; # };
}; # };
} }

8
instances/baldur/configuration.nix
View file

@ -1,10 +1,4 @@
{ pkgs, ... }: { pkgs, ... }: {
# let
# heimdall_hosts = lib.attrsets.filterAttrs (k: v: builtins.elem "heimdall.zto" v) config.networking.hosts;
# heimdall_ipv4 = builtins.elemAt 0 (builtins.attrNames heimdall_hosts);
# in
{
boot = { boot = {
growPartition = true; growPartition = true;
kernelParams = [ kernelParams = [

1
instances/freya/configuration.nix
View file

@ -134,7 +134,6 @@ in
http = { http = {
use_x_forwarded_for = true; use_x_forwarded_for = true;
trusted_proxies = [ trusted_proxies = [
# hosts.zerotier.ipv4."baldur.zto"
hosts.tailscale.ipv4."baldur.tsn" hosts.tailscale.ipv4."baldur.tsn"
"::1" "::1"
"127.0.0.1" "127.0.0.1"

1
instances/heimdall/configuration.nix
View file

@ -187,7 +187,6 @@ in
http = { http = {
use_x_forwarded_for = true; use_x_forwarded_for = true;
trusted_proxies = [ trusted_proxies = [
# hosts.zerotier.ipv4."baldur.zto"
hosts.tailscale.ipv4."baldur.tsn" hosts.tailscale.ipv4."baldur.tsn"
"::1" "::1"
"127.0.0.1" "127.0.0.1"

1
instances/loki/configuration.nix
View file

@ -274,7 +274,6 @@ in
http = { http = {
use_x_forwarded_for = true; use_x_forwarded_for = true;
trusted_proxies = [ trusted_proxies = [
hosts.zerotier.ipv4."baldur.zto"
hosts.tailscale.ipv4."baldur.tsn" hosts.tailscale.ipv4."baldur.tsn"
"::1" "::1"
"127.0.0.1" "127.0.0.1"

1
instances/odin/configuration.nix
View file

@ -173,7 +173,6 @@ in
http = { http = {
use_x_forwarded_for = true; use_x_forwarded_for = true;
trusted_proxies = [ trusted_proxies = [
hosts.zerotier.ipv4."baldur.zto"
hosts.tailscale.ipv4."baldur.tsn" hosts.tailscale.ipv4."baldur.tsn"
"::1" "::1"
"127.0.0.1" "127.0.0.1"

1
modules/hm/waybar.nix
View file

@ -113,6 +113,7 @@ in
# "hwmon-path"= "/sys/class/hwmon/hwmon2/temp1_input"; # "hwmon-path"= "/sys/class/hwmon/hwmon2/temp1_input";
"critical-threshold" = 90; "critical-threshold" = 90;
"format" = "{temperatureC}°C {icon}"; "format" = "{temperatureC}°C {icon}";
"format-critical" = "!{temperatureC}⁰C {icon}";
"format-icons" = [ "" ]; "format-icons" = [ "" ];
} // (if hostName == "sif" then { } // (if hostName == "sif" then {
"hwmon-path" = "/sys/class/hwmon/hwmon7/temp1_input"; "hwmon-path" = "/sys/class/hwmon/hwmon7/temp1_input";

5
modules/hm/zsh.nix
View file

@ -27,10 +27,5 @@
]; ];
extraConfig = ""; extraConfig = "";
}; };
# prezto = {
# enable = true;
# };
}; };
} }

19
modules/nixos/basics/zerotier.nix
View file

@ -1,17 +1,16 @@
{ lib, ... }: # let
let # hosts = import ../../../hosts.nix;
hosts = import ../../../hosts.nix; # zerotier_hosts = lib.attrsets.mapAttrs'
zerotier_hosts = lib.attrsets.mapAttrs' # (
( # k: v: lib.attrsets.nameValuePair v [ k ]
k: v: lib.attrsets.nameValuePair v [ k ] # )
) # hosts.zerotier.ipv4;
hosts.zerotier.ipv4; # in
in
{ {
services.zerotierone = { services.zerotierone = {
enable = true; enable = true;
joinNetworks = [ "8056c2e21cf9c753" ]; joinNetworks = [ "8056c2e21cf9c753" ];
}; };
networking.hosts = zerotier_hosts; # networking.hosts = zerotier_hosts;
} }

2
modules/nixos/nextcloud.nix
View file

@ -62,8 +62,6 @@ in
"OC\\Preview\\EMF" "OC\\Preview\\EMF"
]; ];
trusted_proxies = [ trusted_proxies = [
# hosts.zerotier.ipv4."baldur.zto"
# hosts.zerotier.ipv6."baldur.zto"
hosts.tailscale.ipv4."baldur.tsn" hosts.tailscale.ipv4."baldur.tsn"
hosts.tailscale.ipv6."baldur.tsn" hosts.tailscale.ipv6."baldur.tsn"
]; ];