Format and do fixes

5 files changed, 12 insertions, 10 deletions

diff --git a/services/freshrss.nix b/services/freshrss.nix
index 2cabe68..2c28baa 100644
--- a/services/freshrss.nix
+++ b/services/freshrss.nix
@@ -54,7 +54,7 @@ in
         enableACME = cfg.doACME;
       };
 
-      systemd.services.freshrss.after = ["mysql.service"];
+      systemd.services.freshrss.after = [ "mysql.service" ];
       wilkuu.services.mysql = {
         enable = true;
         users."freshrss" = {
diff --git a/services/mysql.nix b/services/mysql.nix
index 445751a..83a5033 100644
--- a/services/mysql.nix
+++ b/services/mysql.nix
@@ -26,7 +26,7 @@ let
           ALTER USER IF EXISTS '${name}'@'%' IDENTIFIED BY '${ucfg.sopsPlaceholder}'; 
           CREATE USER IF NOT EXISTS '${name}'@'%' IDENTIFIED BY '${ucfg.sopsPlaceholder}';  
         ''
-        + (lib.concatMapAttrsStringSep "\n" (priviledge_clause name) (create_users_ensure name))
+        + (lib.concatMapAttrsStringSep "\n" (priviledge_clause "'name'@'%'") (create_users_ensure name))
       )
     else
       " -- Ommitted user ${name}";
@@ -38,7 +38,9 @@ let
       ALTER USER IF EXISTS '${name}'@'localhost' IDENTIFIED VIA unix_socket; 
       CREATE USER IF NOT EXISTS '${name}'@'localhost' IDENTIFIED VIA unix_socket;  
     ''
-    + (lib.concatMapAttrsStringSep "\n" (priviledge_clause "'${name}'@'localhost'") (create_users_ensure name));
+    + (lib.concatMapAttrsStringSep "\n" (priviledge_clause "'${name}'@'localhost'") (
+      create_users_ensure name
+    ));
 
 in
 {
@@ -99,14 +101,14 @@ in
   #     sopsFile = ../secrets/${config.networking.hostName}/secrets.yaml;
   #   };
   # };
-  config.sops.templates."init-mysql" = {
+  config.sops.templates."init-mysql" = lib.mkIf cfg.enable {
     owner = config.systemd.services.mysql.serviceConfig.User;
     content = (
       lib.concatLines (
         (builtins.attrValues (builtins.mapAttrs add-user-clauses cfg.users))
         ++ (map add-unix-user-clauses cfg.unix_users)
-        ++ ["FLUSH PRIVILEGES;"]
-      ) 
+        ++ [ "FLUSH PRIVILEGES;" ]
+      )
     );
   };
 
diff --git a/services/uptimekuma.nix b/services/uptimekuma.nix
index 32549c3..d98a0b3 100644
--- a/services/uptimekuma.nix
+++ b/services/uptimekuma.nix
@@ -33,7 +33,7 @@ in
     users.groups.uptimekuma = { };
 
     systemd.services.uptime-kuma.serviceConfig.User = "uptimekuma";
-    systemd.services.uptime-kuma.after = ["mysql.service"];
+    systemd.services.uptime-kuma.after = [ "mysql.service" ];
 
     # sops.secrets =
     #   (lib.genAttrs (map toSops secrets)
diff --git a/services/vaultwarden.nix b/services/vaultwarden.nix
index 90feace..ff3466d 100644
--- a/services/vaultwarden.nix
+++ b/services/vaultwarden.nix
@@ -61,9 +61,9 @@ in
 
       services.vaultwarden = {
         enable = cfg.enable;
-        backupDir = cfg.backupDir;
+        # backupDir = cfg.backupDir;
         config = {
-          DOMAIN = cfg.domain;
+          DOMAIN = "${if cfg.doACME then "https" else "http"}://${cfg.domain}";
           ROCKET_ADDRESS = "127.0.0.1";
           ROCKET_PORT = "3222";
           SIGNUPS_DOMAINS_WHITELIST = (lib.concatStringsSep "," cfg.signupWhitelist);
diff --git a/services/wakapi.nix b/services/wakapi.nix
index 69251d3..a350b6a 100644
--- a/services/wakapi.nix
+++ b/services/wakapi.nix
@@ -64,7 +64,7 @@ in
         };
       };
 
-      systemd.services.wakapi.after = ["mysql.service"];
+      systemd.services.wakapi.after = [ "mysql.service" ];
       services.wakapi = {
         enable = true;
         stateDir = cfg.dataDir;