diff --git a/systems/x86_64-linux/dimondback/default.nix b/systems/x86_64-linux/dimondback/default.nix index dd453e2..132445b 100644 --- a/systems/x86_64-linux/dimondback/default.nix +++ b/systems/x86_64-linux/dimondback/default.nix @@ -24,6 +24,7 @@ in { then ./facter.json else null; imports = lib.snowfall.fs.get-non-default-nix-files ./. ++ [../stargate/services/adguardhome.nix]; + services.adguardhome.settings.dns.bind_hosts = [ "192.168.178.119" ]; environment.sessionVariables = { NIXOS_OZONE_WL = "1"; diff --git a/systems/x86_64-linux/stargate/default.nix b/systems/x86_64-linux/stargate/default.nix index c0c385c..40c5cf6 100644 --- a/systems/x86_64-linux/stargate/default.nix +++ b/systems/x86_64-linux/stargate/default.nix @@ -118,6 +118,8 @@ in { wget ]; + services.adguardhome.settings.dns.bind_hosts = [ "192.168.178.129" ]; + hardware.enableAllHardware = true; hardware.enableAllFirmware = true; boot.kernelModules = [ diff --git a/systems/x86_64-linux/stargate/services/adguardhome.nix b/systems/x86_64-linux/stargate/services/adguardhome.nix index 1dc8180..738b4f2 100644 --- a/systems/x86_64-linux/stargate/services/adguardhome.nix +++ b/systems/x86_64-linux/stargate/services/adguardhome.nix @@ -24,7 +24,6 @@ in { bind_hosts = [ "127.0.0.1" "::1" - localIp ]; upstream_dns = [ "94.140.14.14" @@ -46,6 +45,7 @@ in { safe_search = {enabled = false;}; rewrites = map (url: { + enabled = true; answer = localIp; domain = url; }) [ diff --git a/systems/x86_64-linux/stargate/services/nextcloud.nix b/systems/x86_64-linux/stargate/services/nextcloud.nix index f95a75d..10b8d94 100644 --- a/systems/x86_64-linux/stargate/services/nextcloud.nix +++ b/systems/x86_64-linux/stargate/services/nextcloud.nix @@ -15,13 +15,13 @@ with lib; with lib.custom; let # find link here: https://apps.nextcloud.com/ intros = pkgs.fetchNextcloudApp { - sha256 = "sha256-qcr81qUd3Sd7nTzoDoc63IXiVXlyZ/s+3RMCAxbMoTo="; - url = "https://packages.framasoft.org/projects/nextcloud-apps/intros/intros-1.2.0-frama.tar.gz"; + sha256 = "sha256-nWvzJ71axWNP9gFD2LaHIq/jS4OqvoceBJv57gDce+o="; + url = "https://packages.framasoft.org/projects/nextcloud-apps/intros/intros-1.2.1.tar.gz"; license = "gpl3"; }; external = pkgs.fetchNextcloudApp { - sha256 = "sha256-xVrnahqgXIXjk9gukrFgpwZiT2poUIDl83xV8hXPisw="; - url = "https://github.com/nextcloud-releases/external/releases/download/v6.0.2/external-v6.0.2.tar.gz"; + sha256 = "sha256-Z+Tt4KtNlHerTG8OyKFcS+lLOX7MIzKdtIX+OxidJGw="; + url = "https://github.com/nextcloud-releases/external/releases/download/v7.0.0/external-v7.0.0.tar.gz"; license = "gpl3"; }; welcome = pkgs.fetchNextcloudApp {