feat(tailscale): Enable routing features

fix(wireguard): Disable autoconnect to prevent clashing with tailscale
fix(ssh): Remove aliases that clash with tailscale magicDNS
This commit is contained in:
Pim Kunis 2024-07-23 22:52:04 +02:00
parent f933a38b7d
commit d40bbc417c
2 changed files with 10 additions and 13 deletions

View file

@ -12,7 +12,11 @@
services = { services = {
gnome.gnome-keyring.enable = lib.mkForce false; gnome.gnome-keyring.enable = lib.mkForce false;
tailscale.enable = true;
tailscale = {
enable = true;
useRoutingFeatures = "client";
};
xserver = { xserver = {
enable = true; enable = true;
@ -143,7 +147,7 @@
privateKeyFile = config.sops.secrets."wireguard/home/privateKey".path; privateKeyFile = config.sops.secrets."wireguard/home/privateKey".path;
address = [ "10.225.191.4/24" ]; address = [ "10.225.191.4/24" ];
dns = [ "192.168.30.131" ]; dns = [ "192.168.30.131" ];
autostart = true; autostart = false;
mtu = 1412; mtu = 1412;
peers = [{ peers = [{
presharedKeyFile = config.sops.secrets."wireguard/home/presharedKey".path; presharedKeyFile = config.sops.secrets."wireguard/home/presharedKey".path;

View file

@ -213,19 +213,12 @@
enable = true; enable = true;
extraConfig = "User root"; extraConfig = "User root";
matchBlocks = { matchBlocks.github = lib.hm.dag.entryBefore [ "*" ] {
lewis = lib.hm.dag.entryBefore [ "*" ] { hostname = "lewis.dmz"; };
atlas = lib.hm.dag.entryBefore [ "*" ] { hostname = "atlas.dmz"; };
jefke = lib.hm.dag.entryBefore [ "*" ] { hostname = "jefke.dmz"; };
warwick = lib.hm.dag.entryBefore [ "*" ] { hostname = "warwick.dmz"; };
github = lib.hm.dag.entryBefore [ "*" ] {
hostname = "github.com"; hostname = "github.com";
user = "pizzapim"; user = "pizzapim";
identitiesOnly = true; identitiesOnly = true;
}; };
}; };
};
git = { git = {
enable = true; enable = true;