From 417f88fe0c1db8c9556bdf4611fdf1219ceefd85 Mon Sep 17 00:00:00 2001 From: iFargle Date: Tue, 4 Jul 2023 20:06:45 +0900 Subject: [PATCH] tset --- configuration.nix | 2 +- flake.nix | 4 ---- services/promtail.nix | 6 +++--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/configuration.nix b/configuration.nix index 6dc9df4c..704e593f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -57,7 +57,7 @@ # Password set via wpa_supplicant command # https://nixos.org/manual/nixos/unstable/index.html#sec-wireless wireless.networks = { # Use nix-sops for this - copeland-5g.psk = "5b43054e4c927ecd94cf19103fa80a7ce99ca69f27cdd75026be3c261d7f78cb"; + copeland-5g.psk = config.sops.secrets.wireless.copeland-5g.psk.path; }; enableIPv6 = false; diff --git a/flake.nix b/flake.nix index 32cb660b..5d4a5c04 100644 --- a/flake.nix +++ b/flake.nix @@ -16,9 +16,6 @@ lanzaboote.url = "github:nix-community/lanzaboote"; lanzaboote.inputs.nixpkgs.follows = "stable-nixpkgs"; - # Firefox Overlay - # moz_overlay.url = "github:mozilla/nixpkgs-mozilla"; - # Nix User Repository nur.url = "github:nix-community/NUR"; @@ -69,7 +66,6 @@ home-manager.users.albert = import ./users/albert/home.nix; home-manager.users.root = import ./users/root/home.nix; nixpkgs.overlays = [ - # moz_overlay.overlay nur.overlay ]; } diff --git a/services/promtail.nix b/services/promtail.nix index be56dd13..9ff1ad22 100644 --- a/services/promtail.nix +++ b/services/promtail.nix @@ -27,10 +27,10 @@ filename = "/tmp/positions.yaml"; }; clients = [{ - url = "https://loki.sysctl.io/loki/api/v1/push"; + url = config.sops.secrets.promtail.url.path; basic_auth = { - username = "loki-sa"; - password = null; # https://nixos.wiki/wiki/Comparison_of_secret_managing_schemes; + username = config.sops.secrets.promtail.user.path; + password = config.sops.secrets.promtail.pass.path; }; }]; scrape_configs = [{