From 728176d27ba4d691af62595178fa2a8dcef61a76 Mon Sep 17 00:00:00 2001 From: blake Date: Sat, 11 Oct 2025 18:54:41 -0500 Subject: [PATCH] 314 current 2025-10-11 18:09:02 25.05.20251006.20c4598 6.12.50 * --- flake.nix | 2 +- modules/homelab/services/default.nix | 16 +++++++++++++--- modules/homelab/services/glance/default.nix | 1 + .../homeassistant/default.nix | 0 .../{smarthome => home}/mosquitto/default.nix | 0 .../{smarthome => home}/zigbee2mqtt/default.nix | 0 6 files changed, 15 insertions(+), 4 deletions(-) rename modules/homelab/services/{smarthome => home}/homeassistant/default.nix (100%) rename modules/homelab/services/{smarthome => home}/mosquitto/default.nix (100%) rename modules/homelab/services/{smarthome => home}/zigbee2mqtt/default.nix (100%) diff --git a/flake.nix b/flake.nix index 2b1c05d..7a47188 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ # flake for blakes nixos config # define new devices in outputs -# generation: 313 current 2025-10-11 18:01:55 25.05.20251006.20c4598 6.12.50 * +# generation: 314 current 2025-10-11 18:09:02 25.05.20251006.20c4598 6.12.50 * { description = "blakes nix config"; inputs = { diff --git a/modules/homelab/services/default.nix b/modules/homelab/services/default.nix index b287d9b..a9928eb 100644 --- a/modules/homelab/services/default.nix +++ b/modules/homelab/services/default.nix @@ -5,10 +5,10 @@ # services show up in glance in reverse import order lmao imports = [ - ./smarthome/zigbee2mqtt + ./home/zigbee2mqtt ./vaultwarden ./gitea - ./smarthome/homeassistant + ./home/homeassistant ./immich ./arr/bazarr ./arr/prowlarr @@ -18,9 +18,19 @@ ./jellyfin ./nginx-proxy ./arr/flaresolverr - ./smarthome/mosquitto + ./home/mosquitto ./uptime-kuma ./glance ]; + # add to udr to glance + modules.services.glance.links. = [{ + title = service; + url = "https://10.10.0.1"; + error-url = "https://10.10.0.1"; + check-url = "https://10.10.0.1"; + icon = "di:unifi"; }]; + + + } diff --git a/modules/homelab/services/glance/default.nix b/modules/homelab/services/glance/default.nix index 1e5056a..dc5f6d0 100644 --- a/modules/homelab/services/glance/default.nix +++ b/modules/homelab/services/glance/default.nix @@ -73,6 +73,7 @@ in config = lib.mkIf cfg.enable { + # declare ${service} group users.groups.${service} = { gid = lib.mkForce cfg.ids; }; diff --git a/modules/homelab/services/smarthome/homeassistant/default.nix b/modules/homelab/services/home/homeassistant/default.nix similarity index 100% rename from modules/homelab/services/smarthome/homeassistant/default.nix rename to modules/homelab/services/home/homeassistant/default.nix diff --git a/modules/homelab/services/smarthome/mosquitto/default.nix b/modules/homelab/services/home/mosquitto/default.nix similarity index 100% rename from modules/homelab/services/smarthome/mosquitto/default.nix rename to modules/homelab/services/home/mosquitto/default.nix diff --git a/modules/homelab/services/smarthome/zigbee2mqtt/default.nix b/modules/homelab/services/home/zigbee2mqtt/default.nix similarity index 100% rename from modules/homelab/services/smarthome/zigbee2mqtt/default.nix rename to modules/homelab/services/home/zigbee2mqtt/default.nix