file cleanup, conditional motd

modules/homelab/mediastack/qbittorrent/default.nix

@@ -1,12 +1,13 @@
-{ pkgs, config, lib, ... }:
-
-let
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
   service = "qbittorrent";
   cfg = config.homelab.${service};
-  sec = config.sops.secrets;
   homelab = config.homelab;
-in
-{
+in {
   options.homelab.${service} = {
     enable = lib.mkEnableOption "enables ${service}";
 
@@ -16,11 +17,11 @@ in
       default = 7103;
       description = "set port for ${service} (default: ${toString cfg.port}";
     };
-#    torrenting_port = lib.mkOption {
-#      type = lib.types.int;
-#      default = ;
-#      description = "set port for ${service} (default: ${toString cfg.port}";
-#    };
+    #    torrenting_port = lib.mkOption {
+    #      type = lib.types.int;
+    #      default = ;
+    #      description = "set port for ${service} (default: ${toString cfg.port}";
+    #    };
     url = lib.mkOption {
       type = lib.types.str;
       default = "qbit.${homelab.base_domain}";
@@ -48,16 +49,18 @@ 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 {
-
     # ensure media dirs existence
     systemd.tmpfiles.rules = [
       "d /holocron/media/downloads 2775 qbittorrent media -"
-  ];
+    ];
 
     # declare ${service} user
     users.users.${service} = {
@@ -74,10 +77,10 @@ in
       enable = true;
       openFirewall = true;
       user = service;
-      group = lib.mkForce "media";  # override for permissions
+      group = lib.mkForce "media"; # override for permissions
       profileDir = cfg.data_dir;
       webuiPort = cfg.port;
-#      torrentingPort = cfg.torrenting_port;
+      #      torrentingPort = cfg.torrenting_port;
     };
 
     # override umask to make permissions work out
@@ -102,18 +105,6 @@ in
       iptables -A QBIT -j DROP
     '';
 
-# boilerplate for if you ever want to try to get this working again
-# ------------------------------------------------------------------------------
-#      # add systemd service to VPN network namespace
-#      vpnConfinement = {
-#        enable = true;
-#        vpnNamespace = "wgmex";
-#      };
-# ------------------------------------------------------------------------------
-
-#    # open firewall
-#    networking.firewall.allowedTCPPorts = [ cfg.port ];
-
     # add to caddy for reverse proxy
     services.caddy.virtualHosts."${cfg.url}" = {
       extraConfig = ''
@@ -123,16 +114,19 @@ in
     };
 
     # add to glance
-    homelab.glance.links.mediastack = [{
-      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.mediastack = [
+      {
+        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
     homelab.backups.baks = {
-      ${service} = { paths = [ cfg.data_dir ]; };
+      ${service} = {paths = [cfg.data_dir];};
     };
   };
 }