Merge pull request #64 from cnsta/dashy

feat(dashy): broken

hosts/sobotka/server.nix

@@ -1,5 +1,4 @@
-{ config, ... }:
+{config, ...}: {
-{
   server = {
     enable = true;
     email = "adam@cnst.dev";
@@ -9,11 +8,6 @@
     uid = 994;
     gid = 993;
 
-    mounts = {
-      fast = "/mnt/user";
-      config = "/persist/opt/services";
-    };
-
     unbound = {
       enable = true;
     };
@@ -73,6 +67,7 @@
     podman = {
       enable = true;
       gluetun.enable = true;
+      dashy.enable = true;
       qbittorrent = {
         enable = true;
         port = 8080;

modules/server/caddy/default.nix

@@ -2,33 +2,27 @@
   config,
   lib,
   ...
-}:
+}: let
-let
   inherit (lib) mkIf mkEnableOption;
   cfg = config.server.caddy;
 
-  getCloudflareCredentials =
+  getCloudflareCredentials = hostname:
-    hostname:
+    if hostname == "ziggy"
-    if hostname == "ziggy" then
+    then config.age.secrets.cloudflareDnsCredentialsZiggy.path
-      config.age.secrets.cloudflareDnsCredentialsZiggy.path
+    else if hostname == "sobotka"
-    else if hostname == "sobotka" then
+    then config.age.secrets.cloudflareDnsCredentials.path
-      config.age.secrets.cloudflareDnsCredentials.path
+    else throw "Unknown hostname: ${hostname}";
-    else
+in {
-      throw "Unknown hostname: ${hostname}";
-  in      
-{
   options = {
     server.caddy.enable = mkEnableOption "Enables caddy";
   };
   config = mkIf cfg.enable {
-    networking.firewall =
+    networking.firewall = let
-      let
       ports = [
         80
         443
       ];
-      in
+    in {
-      {
       allowedTCPPorts = ports;
     };
 

modules/server/dashy/default.nix

@@ -1,5 +1,9 @@
-{ config, lib, ... }:
+{
-let
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
   unit = "dashy";
   cfg = config.server.${unit};
   srv = config.server;
@@ -15,29 +19,57 @@ let
     "Smart Home"
   ];
 
-  getServicesByCategory =
+  getServicesByCategory = cat:
-    cat:
     lib.attrsets.filterAttrs (name: value: (value ? category && value.category == cat)) mergedServices;
 
-  mkItems =
+  # This function was missing its 'services' argument at the end of the call.
-    services:
+  mkItems = services:
     lib.attrsets.mapAttrsToList (name: value: {
       title = value.name or name;
       description = value.description or "";
       url =
-        if value ? href then
+        if value ? href
-          value.href
+        then value.href
-        else
+        else if value ? url
-          (if value ? url then "https://${value.url}${value.path or ""}" else "");
+        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 = [];
       type = lib.types.listOf (
@@ -61,72 +93,59 @@ in
   config = lib.mkIf cfg.enable {
     services.glances.enable = true;
 
-    services.${unit} = {
+    server.dashy.configFile = pkgs.writeText "conf.yml" ''
-      enable = true;
+      pageInfo:
-      port = cfg.port or 8081;
+        title: "${esc "${srv.domain} Homelab"}"
-      extraOptions = [
+        description: "${esc "Homelab made with NixOS"}"
-        "-p"
+        navLinks:
-        "${toString config.services.${unit}.port}:80"
+          - title: "GitHub"
-      ];
+            path: "https://github.com/cnsta/cnix"
 
-      settings = {
+      appConfig:
-        pageInfo = {
+        theme: "material-dark"
-          title = "${srv.domain} Homelab";
+        layout: "auto"
-          description = "Homelab made with NixOS";
+        iconSize: "medium"
-          navLinks = [
+        language: "en"
-            {
+        statusCheck: true
-              title = "GitHub";
+        hideComponents:
-              path = "https://github.com/cnsta/cnix";
+          hideSettings: false
-            }
-          ];
-        };
 
-        appConfig = {
+      sections:
-          theme = "material-dark";
+      ${lib.concatStringsSep "\n" (
-          layout = "auto";
+        lib.lists.map (
-          iconSize = "medium";
+          cat:
-          language = "en";
+            renderSection {
-          statusCheck = true;
-          hideComponents.hideSettings = false;
-        };
-
-        sections =
-          (lib.lists.forEach dashyCategories (cat: {
               name = cat;
-            icon = "fas fa-box"; # adjust per category
+              icon = "fas fa-box";
               items = mkItems (getServicesByCategory cat);
-          }))
+            }
-          ++ [
+        )
-            {
+        dashyCategories
+      )}
+      ${renderSection {
         name = "Misc";
         icon = "fas fa-ellipsis-h";
-              items = lib.lists.map (x: {
+        items =
+          lib.lists.map (x: {
             title = x.name;
             description = x.description or "";
             url = x.href or "";
             icon = x.icon or "";
-              }) cfg.misc;
+          })
-            }
+          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";
           }
         ];
-            }
+      }}
-          ];
-      };
-    };
-
-    services.caddy.virtualHosts."${srv.domain}" = {
-      useACMEHost = srv.domain;
-      extraConfig = ''
-        reverse_proxy http://127.0.0.1:${toString config.services.${unit}.port}
     '';
   };
-  };
 }

modules/server/podman/default.nix

@@ -2,32 +2,40 @@
   config,
   lib,
   ...
-}:
+}: let
-let
   srv = config.server;
   cfg = config.server.podman;
 
   piholeUrl =
-    if config.networking.hostName == "sobotka" then
+    if config.networking.hostName == "sobotka"
-      "pihole0"
+    then "pihole0"
-    else if config.networking.hostName == "ziggy" then
+    else if config.networking.hostName == "ziggy"
-      "pihole1"
+    then "pihole1"
-    else
+    else throw "Unknown hostname";
-      throw "Unknown hostname";
 
-  getPiholeSecret =
+  getPiholeSecret = hostname:
-    hostname:
+    if hostname == "ziggy"
-    if hostname == "ziggy" then
+    then [config.age.secrets.piholeZiggy.path]
-      [ config.age.secrets.piholeZiggy.path ]
+    else if hostname == "sobotka"
-    else if hostname == "sobotka" then
+    then [config.age.secrets.pihole.path]
-      [ config.age.secrets.pihole.path ]
+    else throw "Unknown hostname: ${hostname}";
-    else
+in {
-      throw "Unknown hostname: ${hostname}";
-in
-{
   options.server.podman = {
     enable = lib.mkEnableOption "Enables Podman";
     gluetun.enable = lib.mkEnableOption "Enables gluetun";
+    dashy = {
+      enable = lib.mkEnableOption "Enable dashy";
+      port = lib.mkOption {
+        type = lib.types.int;
+        default = 8081;
+        description = "The port to host Dashy on.";
+      };
+      url = lib.mkOption {
+        type = lib.types.str;
+        default = "dashy.${srv.domain}";
+      };
+    };
+
     qbittorrent = {
       enable = lib.mkEnableOption "Enable qBittorrent";
       url = lib.mkOption {
@@ -141,6 +149,15 @@ in
     };
 
     services.caddy.virtualHosts = lib.mkMerge [
+      (lib.mkIf cfg.dashy.enable {
+        "${cfg.dashy.url}" = {
+          useACMEHost = srv.domain;
+          extraConfig = ''
+            reverse_proxy http://127.0.0.1:${toString cfg.dashy.port}
+          '';
+        };
+      })
+
       (lib.mkIf cfg.qbittorrent.enable {
         "${cfg.qbittorrent.url}" = {
           useACMEHost = srv.domain;
@@ -199,6 +216,17 @@ in
         };
       })
 
+      (lib.mkIf cfg.dashy.enable {
+        dashy = {
+          image = "lissy93/dashy:latest";
+          autoStart = true;
+          ports = ["${toString cfg.dashy.port}:80"];
+          volumes = [
+            "${srv.dashy.configFile}:/app/user-data/conf.yml"
+          ];
+        };
+      })
+
       (lib.mkIf cfg.qbittorrent.enable {
         qbittorrent = {
           image = "ghcr.io/hotio/qbittorrent:latest";