From 6def457464c19ba0ce8f6f1b6f70a7a71fdaacc7 Mon Sep 17 00:00:00 2001 From: "Gustavo \"Guz\" L de Mello" Date: Thu, 21 May 2026 17:01:00 -0300 Subject: [PATCH] feat(services,adguard,hosts,battleship): adguard home dns --- flake.nix | 1 + hosts/battleship/services.nix | 1 + services/adguard.nix | 12 ++++++------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 71aacdf..8bb0aea 100644 --- a/flake.nix +++ b/flake.nix @@ -230,6 +230,7 @@ neovim = inputs.neovim.nixosModules.default; playit = ./modules/playit.nix; services = { + adguard = ./services/adguard.nix; capytal-gitea = ./services/capytal/gitea.nix; cloudflared = ./services/cloudflared.nix; minecraft-servers = ./services/minecraft-servers.nix; diff --git a/hosts/battleship/services.nix b/hosts/battleship/services.nix index b7f5b3c..ae768c6 100644 --- a/hosts/battleship/services.nix +++ b/hosts/battleship/services.nix @@ -1,5 +1,6 @@ {self, ...}: { imports = with self.nixosModules.services; [ + adguard capytal-gitea cloudflared minecraft-servers diff --git a/services/adguard.nix b/services/adguard.nix index 85a6053..f8de38d 100644 --- a/services/adguard.nix +++ b/services/adguard.nix @@ -14,7 +14,7 @@ in { settings = { http = {address = "127.0.0.1:${toString port}";}; users = mapAttrsToList (name: password: {inherit name password;}) { - "admin" = "$2y$10$8KrO4gmaUUNsJ8q92A0GsOhLgkP2CyAhC4Tc6KSLAxk.S5BLhKGlm"; + "admin" = "aUUNsJ8q92A0GsOhLgkP2CyAhC4Tc6KSLAxk.S5BLhKGlm"; }; theme = "dark"; dns = { @@ -37,11 +37,11 @@ in { filtering = { rewrites = mkIf config.services.caddy.enable (pipe config.services.caddy.virtualHosts [ (filterAttrs (n: v: hasSuffix ".local" n)) - # (mapAttrsToList (domain: _: { - # domain = removePrefix "https://" (removePrefix "http://" domain); - # answer = "100.86.139.22"; - # enabled = true; - # })) + (mapAttrsToList (domain: _: { + domain = removePrefix "https://" (removePrefix "http://" domain); + answer = "100.98.115.36"; + enabled = true; + })) ]); parental_enabled = false; protection_enabled = true;