Remove zerotier host aliases
This commit is contained in:
parent
587cd2e583
commit
c4768eb2fd
10 changed files with 33 additions and 50 deletions
|
|
@ -113,6 +113,7 @@ in
|
|||
# "hwmon-path"= "/sys/class/hwmon/hwmon2/temp1_input";
|
||||
"critical-threshold" = 90;
|
||||
"format" = "{temperatureC}°C {icon}";
|
||||
"format-critical" = "!{temperatureC}⁰C {icon}";
|
||||
"format-icons" = [ "" ];
|
||||
} // (if hostName == "sif" then {
|
||||
"hwmon-path" = "/sys/class/hwmon/hwmon7/temp1_input";
|
||||
|
|
|
|||
|
|
@ -27,10 +27,5 @@
|
|||
];
|
||||
extraConfig = "";
|
||||
};
|
||||
|
||||
# prezto = {
|
||||
# enable = true;
|
||||
# };
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,16 @@
|
|||
{ lib, ... }:
|
||||
let
|
||||
hosts = import ../../../hosts.nix;
|
||||
zerotier_hosts = lib.attrsets.mapAttrs'
|
||||
(
|
||||
k: v: lib.attrsets.nameValuePair v [ k ]
|
||||
)
|
||||
hosts.zerotier.ipv4;
|
||||
in
|
||||
# let
|
||||
# hosts = import ../../../hosts.nix;
|
||||
# zerotier_hosts = lib.attrsets.mapAttrs'
|
||||
# (
|
||||
# k: v: lib.attrsets.nameValuePair v [ k ]
|
||||
# )
|
||||
# hosts.zerotier.ipv4;
|
||||
# in
|
||||
{
|
||||
services.zerotierone = {
|
||||
enable = true;
|
||||
joinNetworks = [ "8056c2e21cf9c753" ];
|
||||
};
|
||||
|
||||
networking.hosts = zerotier_hosts;
|
||||
# networking.hosts = zerotier_hosts;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,8 +62,6 @@ in
|
|||
"OC\\Preview\\EMF"
|
||||
];
|
||||
trusted_proxies = [
|
||||
# hosts.zerotier.ipv4."baldur.zto"
|
||||
# hosts.zerotier.ipv6."baldur.zto"
|
||||
hosts.tailscale.ipv4."baldur.tsn"
|
||||
hosts.tailscale.ipv6."baldur.tsn"
|
||||
];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue