file cleanup, conditional motd

modules/homelab/services/vaultwarden/default.nix

@@ -1,13 +1,15 @@
-{ pkgs, config, lib, unstable_pkgs, ... }:
-
-let
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
   service = "vaultwarden";
   cfg = config.homelab.${service};
   sec = config.sops.secrets;
   homelab = config.homelab;
   domain = "https://pass.blakedheld.xyz";
-in
-{
+in {
   options.homelab.${service} = {
     enable = lib.mkEnableOption "enables ${service}";
 
@@ -39,14 +41,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} = {
@@ -68,30 +72,20 @@ in
         ROCKET_ADDRESS = "0.0.0.0";
         ROCKET_PORT = cfg.port;
         SIGNUPS_ALLOWED = true;
-#        ADMIN_TOKEN = "yuh";
-        ADMIN_TOKEN = "${toString config.sops.secrets."vaultwarden_admin_token".path}";
+        ADMIN_TOKEN = "${toString sec."vaultwarden_admin_token".path}";
         EXPERIMENTAL_CLIENT_FEATURE_FLAGS = "fido2-vault-credentials,autofill-overlay,autofill-v2,inline-menu-positioning-improvements,ssh-key-vault-item";
-          # The following flags are available:
-          # - "autofill-overlay": Add an overlay menu to form fields for quick access to credentials.
-          # - "autofill-v2": Use the new autofill implementation.
-          # - "browser-fileless-import": Directly import credentials from other providers without a file.
-          # - "extension-refresh": Temporarily enable the new extension design until general availability (should be used with the beta Chrome extension)
-          # - "fido2-vault-credentials": Enable the use of FIDO2 security keys as second factor.
-          # - "inline-menu-positioning-improvements": Enable the use of inline menu password generator and identity suggestions in the browser extension.
-          # - "ssh-key-vault-item": Enable the creation and use of SSH key vault items. (Needs clients >=2024.12.0)
-          # - "ssh-agent": Enable SSH agent support on Desktop. (Needs desktop >=2024.12.0)
       };
     };
 
     # override umask to make permissions work out
-    systemd.services.${service}.serviceConfig = { UMask = lib.mkForce "0007"; };
+    systemd.services.${service}.serviceConfig = {UMask = lib.mkForce "0007";};
 
     # open firewall
-    networking.firewall.allowedTCPPorts = [ cfg.port ];
+    networking.firewall.allowedTCPPorts = [cfg.port];
 
     # add to caddy for reverse proxy
     services.caddy.virtualHosts."${cfg.url}" = {
-      serverAliases = [ "pass.${homelab.public_domain}" ];
+      serverAliases = ["pass.${homelab.public_domain}"];
       extraConfig = ''
         tls internal
         reverse_proxy 127.0.0.1:${toString cfg.port}
@@ -99,12 +93,15 @@ in
     };
 
     # add to glance
-    homelab.glance.links.services = [{
-      title = service;
-      url = "https://pass.${homelab.public_domain}";
-      error-url = "http://${homelab.host_ip}:${toString cfg.port}";
-      check-url = "http://${homelab.host_ip}:${toString cfg.port}";
-      icon = "di:${service}"; }];
+    homelab.glance.links.services = [
+      {
+        title = service;
+        url = "https://pass.${homelab.public_domain}";
+        error-url = "http://${homelab.host_ip}:${toString cfg.port}";
+        check-url = "http://${homelab.host_ip}:${toString cfg.port}";
+        icon = "di:${service}";
+      }
+    ];
 
     sops.secrets = {
       "${service}_admin_token" = {
@@ -113,9 +110,9 @@ in
       };
     };
 
-     # add to backups
+    # add to backups
     homelab.backups.baks = {
-      ${service} = { paths = [ cfg.data_dir ]; };
+      ${service} = {paths = [cfg.data_dir];};
     };
   };
 }