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:
parent
f933a38b7d
commit
d40bbc417c
2 changed files with 10 additions and 13 deletions
|
@ -12,7 +12,11 @@
|
|||
|
||||
services = {
|
||||
gnome.gnome-keyring.enable = lib.mkForce false;
|
||||
tailscale.enable = true;
|
||||
|
||||
tailscale = {
|
||||
enable = true;
|
||||
useRoutingFeatures = "client";
|
||||
};
|
||||
|
||||
xserver = {
|
||||
enable = true;
|
||||
|
@ -143,7 +147,7 @@
|
|||
privateKeyFile = config.sops.secrets."wireguard/home/privateKey".path;
|
||||
address = [ "10.225.191.4/24" ];
|
||||
dns = [ "192.168.30.131" ];
|
||||
autostart = true;
|
||||
autostart = false;
|
||||
mtu = 1412;
|
||||
peers = [{
|
||||
presharedKeyFile = config.sops.secrets."wireguard/home/presharedKey".path;
|
||||
|
|
9
home.nix
9
home.nix
|
@ -213,19 +213,12 @@
|
|||
enable = true;
|
||||
extraConfig = "User root";
|
||||
|
||||
matchBlocks = {
|
||||
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 [ "*" ] {
|
||||
matchBlocks.github = lib.hm.dag.entryBefore [ "*" ] {
|
||||
hostname = "github.com";
|
||||
user = "pizzapim";
|
||||
identitiesOnly = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
git = {
|
||||
enable = true;
|
||||
|
|
Loading…
Reference in a new issue