diff --git a/machines/Everest/configuration.nix b/machines/Everest/configuration.nix index 6cd78cb..9e3c081 100755 --- a/machines/Everest/configuration.nix +++ b/machines/Everest/configuration.nix @@ -22,14 +22,14 @@ wakeOnLan.enable = true; ipv4.addresses = [ { - address = "10.0.0.2"; + address = "192.168.1.160"; prefixLength = 8; } ]; }; # I use networkd, so I need to declare the interface for the default gateway defaultGateway = { - address = "10.0.0.1"; + address = "192.168.1.1"; interface = "eno1"; }; nameservers = ["9.9.9.9"]; diff --git a/roles/server/adguard.nix b/roles/server/adguard.nix index 59e4f94..8a57525 100644 --- a/roles/server/adguard.nix +++ b/roles/server/adguard.nix @@ -1,4 +1,8 @@ -{lib, ...}: let +{ + lib, + config, + ... +}: let domain = "adguard.everest.tailscale"; port = 3001; in { @@ -10,7 +14,7 @@ in { settings = { dns = { bind_hosts = [ - "10.0.0.2" + ((lib.lists.last config.networking.interfaces.eno1.ipv4.addresses).address) "100.100.0.1" ]; bootstrap_dns = ["9.9.9.9"]; diff --git a/roles/server/ssh.nix b/roles/server/ssh.nix index b9b7860..e4d0da1 100755 --- a/roles/server/ssh.nix +++ b/roles/server/ssh.nix @@ -16,8 +16,6 @@ if os.environ["PAM_TYPE"] != "open_session": raise SystemExit - print("User logging in") - secretPath = "${config.age.secrets.discord-webhook.path}" webhookUrl: str