file cleanup, conditional motd

modules/homelab/system/default.nix

@@ -1,11 +1,14 @@
-{ pkgs, config, lib, ... }:
 {
+  pkgs,
+  config,
+  lib,
+  ...
+}: {
   # the order determines the order in glance :3
   imports = [
     ./motd
     ./backups
     ./uptime-kuma
-    ./postfix
+    #./postfix
   ];
-
 }

modules/homelab/system/uptime-kuma/default.nix

@@ -1,12 +1,14 @@
-{ pkgs, config, lib, ... }:
-
-let
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
   service = "uptime-kuma";
   cfg = config.homelab.${service};
   sec = config.sops.secrets;
   homelab = config.homelab;
-in
-{
+in {
   options.homelab.${service} = {
     enable = lib.mkEnableOption "enables ${service}";
 
@@ -38,14 +40,16 @@ in
     };
     motd = lib.mkOption {
       type = lib.types.nullOr lib.types.str;
-      default = service;
+      default =
+        if cfg.enable
+        then service
+        else null;
     };
   };
 
   config = lib.mkIf cfg.enable {
-    
     # declare ${service} group
-    users.groups.${service} = { gid = lib.mkForce cfg.ids; };
+    users.groups.${service} = {gid = lib.mkForce cfg.ids;};
 
     # declare ${service} user
     users.users.${service} = {
@@ -61,8 +65,7 @@ in
     # enable the ${service} service
     services.${service} = {
       enable = true;
-      settings = 
-      {
+      settings = {
         PORT = toString cfg.port;
         HOST = "0.0.0.0";
       };
@@ -73,12 +76,9 @@ in
       UMask = lib.mkForce "0007";
     };
 
-#    # open firewall
-#    networking.firewall.allowedTCPPorts = [ cfg.port ];
-
     # add to caddy for reverse proxy
     services.caddy.virtualHosts."${cfg.url}" = {
-        serverAliases = [ "up.${homelab.public_domain}" ];
+      serverAliases = ["up.${homelab.public_domain}"];
       extraConfig = ''
         tls internal
         reverse_proxy 127.0.0.1:${toString cfg.port}
@@ -86,16 +86,21 @@ in
     };
 
     # add to glance
-    homelab.glance.links.system = [{
-      title = service;
-      url = "https://${cfg.url}";
-      error-url = "http://${homelab.host_ip}:${toString cfg.port}";
-      check-url = "http://${homelab.host_ip}:${toString cfg.port}";
-      icon = "di:${service}"; }];
+    homelab.glance.links.system = [
+      {
+        title = service;
+        url = "https://${cfg.url}";
+        error-url = "http://${homelab.host_ip}:${toString cfg.port}";
+        check-url = "http://${homelab.host_ip}:${toString cfg.port}";
+        icon = "di:${service}";
+      }
+    ];
 
-     # add to backups
+    # add to backups
     homelab.backups.baks = {
-      ${service} = { paths = [ cfg.data_dir ]; };
+      ${service} = {
+        paths = [cfg.data_dir "/var/lib/private"];
+      };
     };
   };
 }