diff --git a/hosts/kirk/default.nix b/hosts/kirk/default.nix index 72cebd5..f08b669 100644 --- a/hosts/kirk/default.nix +++ b/hosts/kirk/default.nix @@ -33,7 +33,7 @@ "adb" "binfmt" "prometheus-exporters" - "alloy" + "promtail" "syncthing" "zerotier" ] diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 3cbb5d2..92783d6 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -40,8 +40,8 @@ "mount-sisko" "adb" "prometheus-exporters" + # "promtail" "zerotier" - "alloy" ] ++ [ ./disko.nix ]; diff --git a/hosts/pike/default.nix b/hosts/pike/default.nix index e5e6ca6..d699e49 100644 --- a/hosts/pike/default.nix +++ b/hosts/pike/default.nix @@ -35,7 +35,7 @@ "mount-sisko" "adb" "prometheus-exporters" - "alloy" + # "promtail" "zerotier" ]; diff --git a/hosts/sisko/default.nix b/hosts/sisko/default.nix index 9faac29..3d3fd83 100644 --- a/hosts/sisko/default.nix +++ b/hosts/sisko/default.nix @@ -21,7 +21,6 @@ "grafana" "prometheus-exporters" "loki" - "alloy" "restic" "atuin" "immich" diff --git a/hosts/tpol/default.nix b/hosts/tpol/default.nix index a586bc0..d73b62b 100644 --- a/hosts/tpol/default.nix +++ b/hosts/tpol/default.nix @@ -24,7 +24,6 @@ "battery" "printing" "wireguard-client" - "alloy" ]; boot.initrd.availableKernelModules = [ diff --git a/modules/adguard-home/default.nix b/modules/adguard-home/default.nix index cd9cec3..4a472a2 100644 --- a/modules/adguard-home/default.nix +++ b/modules/adguard-home/default.nix @@ -52,6 +52,8 @@ in networking.defaultGateway = "10.1.1.1"; + networking.nameservers = [ "127.0.0.1" ]; + environment.persistence."/persist".directories = [ "/var/lib/AdGuardHome" ]; diff --git a/modules/alloy/default.nix b/modules/alloy/default.nix deleted file mode 100644 index 728ca28..0000000 --- a/modules/alloy/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ config, ... }: -{ - services.alloy = { - enable = true; - }; - environment.etc."alloy/config.alloy".text = '' - local.file_match "local_files" { - path_targets = [{ - __path__ = "/var/log/*.log", - }] - sync_period = "5s" - } - - loki.source.journal "systemd" { - max_age = "24h" - forward_to = [loki.write.default.receiver] - } - - loki.source.journal "kernel" { - max_age = "24h" - forward_to = [loki.write.default.receiver] - } - - loki.relabel "nixfleet_journal" { - forward_to = [] - rule { - source_labels = ["__journal__systemd_unit"] - target_label = "systemd_unit" - } - rule { - source_labels = ["__journal_syslog_identifier"] - target_label = "syslog_identifier" - } - } - - loki.source.journal "nixfleet_journal" { - forward_to = [loki.write.default.receiver] - relabel_rules = loki.relabel.nixfleet_journal.rules - format_as_json = true - } - - loki.write "default" { - endpoint { - url = "http://sisko.wg.aciceri.dev:${ - builtins.toString config.services.loki.configuration.server.http_listen_port or 3100 - }/loki/api/v1/push" - } - external_labels = { - host = "${config.networking.hostName}", - } - } - ''; -}