refactor(tazjin/nixos): zerotier out, tailscale in (again)
Tailscale just works better out of the box than Zerotier, and its clients aren't unfree. Change-Id: Ie35ef1adde0edbe923992b02e6b636269a96a81e Reviewed-on: https://cl.tvl.fyi/c/depot/+/8482 Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI
This commit is contained in:
parent
eadcfbbfab
commit
43d5658dad
4 changed files with 7 additions and 19 deletions
|
@ -1,14 +0,0 @@
|
|||
# Configuration for my Zerotier network.
|
||||
|
||||
{
|
||||
environment.persistence."/persist".directories = [
|
||||
"/var/lib/zerotier-one"
|
||||
];
|
||||
|
||||
services.zerotierone.enable = true;
|
||||
services.zerotierone.joinNetworks = [
|
||||
"35c192ce9bd4c8c7"
|
||||
];
|
||||
|
||||
networking.firewall.trustedInterfaces = [ "zt7nnembs4" ];
|
||||
}
|
|
@ -125,10 +125,11 @@ in
|
|||
programs.mosh.enable = true;
|
||||
services.openssh.enable = true;
|
||||
|
||||
services.zerotierone.enable = true;
|
||||
services.zerotierone.joinNetworks = [
|
||||
"35c192ce9bd4c8c7"
|
||||
];
|
||||
services.tailscale.enable = true;
|
||||
boot.kernel.sysctl = {
|
||||
"net.ipv4.ip_forward" = 1;
|
||||
"net.ipv6.conf.all.forwarding" = 1;
|
||||
};
|
||||
|
||||
system.stateVersion = "20.09";
|
||||
}
|
||||
|
|
|
@ -22,7 +22,6 @@ lib.fix (self: {
|
|||
(usermod "laptop.nix")
|
||||
(usermod "persistence.nix")
|
||||
(usermod "physical.nix")
|
||||
(usermod "zerotier.nix")
|
||||
|
||||
(pkgs.home-manager.src + "/nixos")
|
||||
] ++ lib.optional (builtins.pathExists ./local-config.nix) ./local-config.nix;
|
||||
|
@ -122,6 +121,7 @@ lib.fix (self: {
|
|||
security.rtkit.enable = true;
|
||||
|
||||
services = {
|
||||
tailscale.enable = true;
|
||||
printing.enable = true;
|
||||
|
||||
# expose i2c device as /dev/i2c-amdgpu-dm and make it user-accessible
|
||||
|
|
|
@ -81,6 +81,7 @@ in
|
|||
services.xserver.libinput.touchpad.clickMethod = "clickfinger";
|
||||
services.xserver.libinput.touchpad.tapping = false;
|
||||
services.avahi.enable = true;
|
||||
services.tailscale.enable = true;
|
||||
powerManagement.powertop.enable = true;
|
||||
|
||||
system.stateVersion = "21.11";
|
||||
|
|
Loading…
Reference in a new issue