1
Fork 0

Bump shimmeringmoon

This commit is contained in:
prescientmoon 2025-03-03 14:32:42 +01:00
parent b1fca53412
commit dbf9324df9
Signed by: prescientmoon
SSH key fingerprint: SHA256:UUF9JT2s8Xfyv76b8ZuVL7XrmimH4o49p4b+iexbVH4
7 changed files with 154 additions and 46 deletions
hosts/nixos
common/optional/services/iwd
lapetus/services
tethys

View file

@ -11,7 +11,6 @@
environment.persistence."/persist/state".directories = [ "/var/lib/iwd" ];
sops.templates."eduroam.8021x".path = "/var/lib/iwd/eduroam.8021x";
sops.secrets.eduroam_pass.sopsFile = ../../../secrets.yaml;
sops.templates."eduroam.8021x".content = ''
[Security]
@ -26,4 +25,8 @@
[Settings]
AutoConnect=true
'';
systemd.tmpfiles.rules = [
"L+ /persist/state/var/lib/iwd/eduroam.8021x - - - - ${config.sops.templates."eduroam.8021x".path}"
];
}

View file

@ -25,7 +25,7 @@
owner = config.services.glass-server.user;
group = config.services.glass-server.user;
content = builtins.toJSON {
CONTENT_BUNDLE_FOLDER_PATH = "${inputs.shimmeringdarkness}/bundles";
CONTENT_BUNDLE_FOLDER_PATH = "${inputs.shimmeringvoid}/bundles";
SECRET_KEY = "${config.sops.placeholder.glass_server_secret_key}";
PASSWORD = "${config.sops.placeholder.glass_server_admin_password}";
API_TOKEN = "${config.sops.placeholder.glass_server_admin_token}";

View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ config, ... }:
let
port = config.satellite.ports.grafana;
secret = name: "$__file{${config.sops.secrets.${name}.path}}";
@ -44,42 +44,48 @@ in
# https://grafana.com/docs/grafana/latest/alerting/set-up/provision-alerting-resources/file-provisioning/
alerting.contactPoints.settings = {
apiVersion = 1;
contactPoints = [{
name = "main";
receivers = [
{
uid = "main_discord";
type = "discord";
settings.url = secret "grafana_discord_webhook";
settings.message = ''
@everyone An issue occured :O
{{ template "default.message" . }}
'';
}
{
uid = "main_email";
type = "email";
settings.addresses = "colimit@moonythm.dev";
}
];
}];
contactPoints = [
{
name = "main";
receivers = [
{
uid = "main_discord";
type = "discord";
settings.url = secret "grafana_discord_webhook";
settings.message = ''
@everyone An issue occured :O
{{ template "default.message" . }}
'';
}
{
uid = "main_email";
type = "email";
settings.addresses = "colimit@moonythm.dev";
}
];
}
];
};
alerting.policies.settings = {
apiVersion = 1;
policies = [{
receiver = "main";
}];
policies = [
{
receiver = "main";
}
];
};
datasources.settings = {
apiVersion = 1;
datasources = [{
name = "Prometheus";
type = "prometheus";
access = "proxy";
url = "https://prometheus.moonythm.dev";
}];
datasources = [
{
name = "Prometheus";
type = "prometheus";
access = "proxy";
url = "https://prometheus.moonythm.dev";
}
];
};
};
# }}}
@ -88,10 +94,12 @@ in
# {{{ Networking & storage
satellite.nginx.at.grafana.port = port;
environment.persistence."/persist/state".directories = [{
directory = config.services.grafana.dataDir;
user = "grafana";
group = "grafana";
}];
environment.persistence."/persist/state".directories = [
{
directory = config.services.grafana.dataDir;
user = "grafana";
group = "grafana";
}
];
# }}}
}

View file

@ -17,7 +17,8 @@
../common/optional/desktop/steam.nix
../common/optional/wayland/hyprland.nix
../common/optional/services/wpa_supplicant.nix
# ../common/optional/services/wpa_supplicant.nix
../common/optional/services/iwd
../common/optional/services/tailscale.nix
../common/optional/services/kanata.nix
../common/optional/services/restic