feat(dashy): broken

This commit is contained in:
2025-09-15 08:18:35 +02:00
parent cc43567fc9
commit 1e675d1c81
4 changed files with 172 additions and 136 deletions

View File

@@ -1,11 +1,15 @@
{ config, lib, ... }:
let
{
pkgs,
config,
lib,
...
}: let
unit = "dashy";
cfg = config.server.${unit};
srv = config.server;
hl = config.server;
mergedServices = hl // (hl.podman or { });
mergedServices = hl // (hl.podman or {});
dashyCategories = [
"Arr"
@@ -15,42 +19,70 @@ let
"Smart Home"
];
getServicesByCategory =
cat:
getServicesByCategory = cat:
lib.attrsets.filterAttrs (name: value: (value ? category && value.category == cat)) mergedServices;
mkItems =
services:
# This function was missing its 'services' argument at the end of the call.
mkItems = services:
lib.attrsets.mapAttrsToList (name: value: {
title = value.name or name;
description = value.description or "";
url =
if value ? href then
value.href
else
(if value ? url then "https://${value.url}${value.path or ""}" else "");
if value ? href
then value.href
else if value ? url
then "https://${value.url}${value.path or ""}"
else "";
icon = value.icon or "";
}) services;
in
{
})
services; # <-- FIX: Added the 'services' argument here.
esc = s: lib.replaceStrings ["\""] ["\\\""] (toString s);
renderSection = {
name,
icon,
items,
}: ''
- name: "${esc name}"
icon: "${esc icon}"
items:
${lib.concatStringsSep "\n" (
lib.lists.map (item: ''
- title: "${esc item.title}"
description: "${esc item.description}"
url: "${esc item.url}"
icon: "${esc item.icon}"
'')
items
)}
'';
in {
options.server.${unit} = {
enable = lib.mkEnableOption {
description = "Enable ${unit}";
};
configFile = lib.mkOption {
type = lib.types.path;
readOnly = true;
internal = true;
description = "Path to the generated Dashy config file.";
};
misc = lib.mkOption {
default = [ ];
default = [];
type = lib.types.listOf (
lib.types.attrsOf (
lib.types.submodule {
options = {
name = lib.mkOption { type = lib.types.str; };
name = lib.mkOption {type = lib.types.str;};
description = lib.mkOption {
type = lib.types.str;
default = "";
};
href = lib.mkOption { type = lib.types.str; };
icon = lib.mkOption { type = lib.types.str; };
href = lib.mkOption {type = lib.types.str;};
icon = lib.mkOption {type = lib.types.str;};
};
}
)
@@ -61,72 +93,59 @@ in
config = lib.mkIf cfg.enable {
services.glances.enable = true;
services.${unit} = {
enable = true;
port = cfg.port or 8081;
extraOptions = [
"-p"
"${toString config.services.${unit}.port}:80"
];
server.dashy.configFile = pkgs.writeText "conf.yml" ''
pageInfo:
title: "${esc "${srv.domain} Homelab"}"
description: "${esc "Homelab made with NixOS"}"
navLinks:
- title: "GitHub"
path: "https://github.com/cnsta/cnix"
settings = {
pageInfo = {
title = "${srv.domain} Homelab";
description = "Homelab made with NixOS";
navLinks = [
{
title = "GitHub";
path = "https://github.com/cnsta/cnix";
appConfig:
theme: "material-dark"
layout: "auto"
iconSize: "medium"
language: "en"
statusCheck: true
hideComponents:
hideSettings: false
sections:
${lib.concatStringsSep "\n" (
lib.lists.map (
cat:
renderSection {
name = cat;
icon = "fas fa-box";
items = mkItems (getServicesByCategory cat);
}
];
};
appConfig = {
theme = "material-dark";
layout = "auto";
iconSize = "medium";
language = "en";
statusCheck = true;
hideComponents.hideSettings = false;
};
sections =
(lib.lists.forEach dashyCategories (cat: {
name = cat;
icon = "fas fa-box"; # adjust per category
items = mkItems (getServicesByCategory cat);
}))
++ [
{
name = "Misc";
icon = "fas fa-ellipsis-h";
items = lib.lists.map (x: {
title = x.name;
description = x.description or "";
url = x.href or "";
icon = x.icon or "";
}) cfg.misc;
}
{
name = "Monitoring";
icon = "fas fa-monitor-heart-rate";
items = [
{
title = "Glances";
url = "http://localhost:${toString config.services.glances.port}";
icon = "hl-glances";
}
];
}
];
};
};
services.caddy.virtualHosts."${srv.domain}" = {
useACMEHost = srv.domain;
extraConfig = ''
reverse_proxy http://127.0.0.1:${toString config.services.${unit}.port}
'';
};
)
dashyCategories
)}
${renderSection {
name = "Misc";
icon = "fas fa-ellipsis-h";
items =
lib.lists.map (x: {
title = x.name;
description = x.description or "";
url = x.href or "";
icon = x.icon or "";
})
cfg.misc;
}}
${renderSection {
name = "Monitoring";
icon = "fas fa-monitor-heart-rate";
items = [
{
title = "Glances";
description = "System Monitoring";
url = "http://localhost:${toString config.services.glances.port}";
icon = "hl-glances";
}
];
}}
'';
};
}