diff --git a/hosts/sisko/default.nix b/hosts/sisko/default.nix index 3d3fd83..0beb993 100644 --- a/hosts/sisko/default.nix +++ b/hosts/sisko/default.nix @@ -21,6 +21,7 @@ "grafana" "prometheus-exporters" "loki" + "promtail" "restic" "atuin" "immich" diff --git a/modules/adguard-home/default.nix b/modules/adguard-home/default.nix index 4a472a2..8c4451e 100644 --- a/modules/adguard-home/default.nix +++ b/modules/adguard-home/default.nix @@ -1,7 +1,4 @@ { config, lib, ... }: -let - interface = "enP4p65s0"; -in { services.adguardhome = { enable = true; @@ -9,7 +6,7 @@ in settings = { dhcp = { enabled = true; - interface_name = interface; + interface_name = "enP4p65s0"; dhcpv4 = { gateway_ip = "10.1.1.1"; @@ -31,7 +28,6 @@ in }; }; - # otherwise it creates a directory in /var/lib/private which can't be easily persisted systemd.services.adguardhome.serviceConfig.DynamicUser = lib.mkForce false; networking.firewall.allowedUDPPorts = [ @@ -39,21 +35,6 @@ in 67 ]; networking.firewall.allowedTCPPorts = [ 53 ]; - - networking.interfaces.${interface} = { - ipv4.addresses = [ - { - address = "10.1.1.2"; - prefixLength = 24; - } - ]; - useDHCP = false; - }; - - networking.defaultGateway = "10.1.1.1"; - - networking.nameservers = [ "127.0.0.1" ]; - environment.persistence."/persist".directories = [ "/var/lib/AdGuardHome" ];