From afa03e6f6ea66f5568805ebd73b8c38f008c3c8b Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 10 Mar 2024 15:24:58 +0300 Subject: 2024-03-10 --- modules/nixos/loki.nix | 16 +--------------- modules/nixos/monitoring/default.nix | 36 ++++++++++++++++++++++++------------ modules/nixos/thunderbird.nix | 6 ++++-- 3 files changed, 29 insertions(+), 29 deletions(-) (limited to 'modules/nixos') diff --git a/modules/nixos/loki.nix b/modules/nixos/loki.nix index 4b17256..ce19004 100644 --- a/modules/nixos/loki.nix +++ b/modules/nixos/loki.nix @@ -94,21 +94,7 @@ in { schema_config.configs = [ { - from = "2020-01-01"; - store = "boltdb-shipper"; - object_store = "filesystem"; - schema = "v11"; - index = { - prefix = "index_"; - period = "24h"; - }; - chunks = { - prefix = "chunks_"; - period = "24h"; - }; - } - { - from = "2023-12-01"; + from = "2024-01-01"; store = "tsdb"; object_store = "filesystem"; schema = "v12"; diff --git a/modules/nixos/monitoring/default.nix b/modules/nixos/monitoring/default.nix index fbc0e60..5aed215 100644 --- a/modules/nixos/monitoring/default.nix +++ b/modules/nixos/monitoring/default.nix @@ -32,27 +32,27 @@ in { # https://grafana.com/docs/grafana/latest/administration/provisioning/#data-sources datasources.settings.datasources = with config.nixfiles.modules; [ - { + (mkIf alertmanager.enable { name = "Alertmanager"; type = "alertmanager"; access = "proxy"; - jsonData.implementation = "prometheus"; url = "https://${alertmanager.domain}"; - } - { + jsonData.implementation = "prometheus"; + }) + (mkIf loki.enable { name = "Loki"; type = "loki"; access = "proxy"; url = "https://${loki.domain}"; isDefault = true; - } - { + }) + (mkIf prometheus.enable { name = "Prometheus"; type = "prometheus"; access = "proxy"; url = "https://${prometheus.domain}"; - } - (mkIf config.nixfiles.modules.redis.enable { + }) + (mkIf redis.enable { name = "Redis"; type = "redis-datasource"; access = "proxy"; @@ -60,11 +60,23 @@ in { jsonData.client = "standalone"; }) ]; - datasources.settings.deleteDatasources = [ - { - name = "PostgreSQL"; + datasources.settings.deleteDatasources = with config.nixfiles.modules; [ + (mkIf (!alertmanager.enable) { + name = "Alertmanager"; orgId = 1; - } + }) + (mkIf (!loki.enable) { + name = "Loki"; + orgId = 1; + }) + (mkIf (!prometheus.enable) { + name = "Prometheus"; + orgId = 1; + }) + (mkIf (!redis.enable) { + name = "Redis"; + orgId = 1; + }) ]; # https://grafana.com/docs/grafana/latest/administration/provisioning/#dashboards diff --git a/modules/nixos/thunderbird.nix b/modules/nixos/thunderbird.nix index c534271..29ea9c9 100644 --- a/modules/nixos/thunderbird.nix +++ b/modules/nixos/thunderbird.nix @@ -26,10 +26,12 @@ in { "app.donation.eoy.version.viewed" = 999; "browser.display.background_color" = base00; "browser.display.background_color.dark" = base00; - "browser.display.document_color_use" = 2; + "browser.display.document_color_use" = 1; # Corresponds to "Never". "browser.display.foreground_color" = base05; "browser.display.foreground_color.dark" = base05; - "browser.display.use_system_colors" = false; + "browser.display.use_system_colors" = true; + "browser.visited_color" = base0E; + "browser.visited_color.dark" = base0E; "editor.background_color" = base00; "editor.editor.active_link_color" = base16; "editor.followed_link_color" = base0E; -- cgit 1.4.1