From e32816dcf6200dfd3b1d5ef17574704cf2aed94a Mon Sep 17 00:00:00 2001 From: Don Harper Date: Wed, 6 Aug 2025 23:33:17 -0500 Subject: [PATCH] clean up networking on tailnet --- home/common/default.nix | 4 +++- hosts/book/default.nix | 1 + hosts/loki/default.nix | 1 + hosts/workstation/default.nix | 29 ++++++++++++++++------------- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/home/common/default.nix b/home/common/default.nix index 3710337..2ec1520 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -100,7 +100,9 @@ services = { syncthing = { enable = true; - guiAddress = "${osConfig.networking.hostName}:8384"; + guiAddress = "${osConfig.variables.addresses}:8384"; + overrideDevices = false; + overrideFolders = false; tray.enable = true; }; gpg-agent = { diff --git a/hosts/book/default.nix b/hosts/book/default.nix index 5859467..bf3ceba 100644 --- a/hosts/book/default.nix +++ b/hosts/book/default.nix @@ -6,6 +6,7 @@ ../workstation ]; networking.hostName = "book"; + variables.addresses = "100.72.121.75"; variables.swayScale = "1.5"; roles = { diff --git a/hosts/loki/default.nix b/hosts/loki/default.nix index cac84aa..009920d 100644 --- a/hosts/loki/default.nix +++ b/hosts/loki/default.nix @@ -7,6 +7,7 @@ ]; networking.hostName = "loki"; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + variables.addresses = "100.72.0.1"; variables.swayScale = "1.1"; roles = { diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix index 272baa8..d6392e9 100644 --- a/hosts/workstation/default.nix +++ b/hosts/workstation/default.nix @@ -67,19 +67,19 @@ in { to = 1764; }]; allowedTCPPorts = [ 22 ]; - interfaces = { - "tailscale0" = { - allowedTCPPorts = [ 22 8080 8443 8384 ]; - allowedTCPPortRanges = [{ - from = 1714; - to = 1764; - }]; - allowedUDPPortRanges = [{ - from = 1714; - to = 1764; - }]; - }; - }; + # interfaces = { + # "tailscale0" = { + # allowedTCPPorts = [ 22 8080 8443 8384 ]; + # allowedTCPPortRanges = [{ + # from = 1714; + # to = 1764; + # }]; + # allowedUDPPortRanges = [{ + # from = 1714; + # to = 1764; + # }]; + # }; + # }; }; }; @@ -133,7 +133,10 @@ in { }; }; + powerManagement.powertop.enable = true; + services = { + power-profiles-daemon.enable = false; avahi = { enable = true; nssmdns4 = true;