Nix fmt

6 files changed, 426 insertions, 385 deletions

diff --git a/services/email.nix b/services/email.nix
index d3f60ab..5fbd04a 100644
--- a/services/email.nix
+++ b/services/email.nix
@@ -1,142 +1,164 @@
-{config, pkgs, lib, ...}: 
+{ config, lib, ... }:
 let
- cfg = config.wilkuu.services.stalwart; 
- hostname = config.networking.hostName; 
-in 
+  cfg = config.wilkuu.services.stalwart;
+  hostname = config.networking.hostName;
+in
 {
   options.wilkuu.services.stalwart = with lib; {
     domain = mkOption {
-      type = types.str; 
-      default = "mail.${hostname}.local"; 
-      example = "mail.wilkuu.xyz"; 
-      description = "Domain for http connections.";  
-    };  
+      type = types.str;
+      default = "mail.${hostname}.local";
+      example = "mail.wilkuu.xyz";
+      description = "Domain for http connections.";
+    };
     wellKnownDomains = mkOption {
-      type = types.listOf types.str; 
-      default = [ "${hostname}.local" ]; 
-      example = [ "wilkuu.xyz"] ; 
+      type = types.listOf types.str;
+      default = [ "${hostname}.local" ];
+      example = [ "wilkuu.xyz" ];
       description = "Domain for well-known items";
     };
     doACME = mkEnableOption "Enable ACME for stalwart here";
-    enable = mkEnableOption "Enable the email service"; 
-    dataDir = mkOption { 
-     type = types.path; 
-     description = "Storage localtion for Stalwart user data";
-     default = "/srv/data/stalwart";
-     example = "/srv/data/stalwart";
-    }; 
-  }; 
+    enable = mkEnableOption "Enable the email service";
+    dataDir = mkOption {
+      type = types.path;
+      description = "Storage localtion for Stalwart user data";
+      default = "/srv/data/stalwart";
+      example = "/srv/data/stalwart";
+    };
+  };
 
-  config = lib.mkIf cfg.enable (let 
-      sopsPath = ../secrets/${hostname}/stalwart.yaml; 
-      secrets = ["user_admin_password"]; 
-      toSops  = (sname: "stalwart/${sname}");
-      toCredfilePath = (name: config.sops.secrets.${toSops name}.path); 
+  config = lib.mkIf cfg.enable (
+    let
+      sopsPath = ../secrets/${hostname}/stalwart.yaml;
+      secrets = [ "user_admin_password" ];
+      toSops = (sname: "stalwart/${sname}");
+      toCredfilePath = (name: config.sops.secrets.${toSops name}.path);
       toStalwartCred = name: "%{file:/run/credentials/stalwart-mail.service/${name}}%";
-      
-      basicListener = proto: port: tls:  { 
-        bind = ["[::]:${toString port}"];
-        protocol = proto; 
-        tls.implicit = tls; 
-      }; 
 
-      proxyWellKnown = names: let 
-        uris = map (n: "/.well-known/${n}") names;
-      in (lib.genAttrs uris (uri: {
-          proxyPass = "http://localhost:3080${uri}"; 
-          recommendedProxySettings = true;  
-      })); 
+      basicListener = proto: port: tls: {
+        bind = [ "[::]:${toString port}" ];
+        protocol = proto;
+        tls.implicit = tls;
+      };
+
+      proxyWellKnown =
+        names:
+        let
+          uris = map (n: "/.well-known/${n}") names;
+        in
+        (lib.genAttrs uris (uri: {
+          proxyPass = "http://localhost:3080${uri}";
+          recommendedProxySettings = true;
+        }));
 
-      makeHttpRedirect = target: https: { return = "302 ${if https then "https" else "http"}://${target}";};   
+      makeHttpRedirect = target: https: {
+        return = "302 ${if https then "https" else "http"}://${target}";
+      };
 
-  in {
-     networking.hosts = {
-      "127.0.0.1" = [cfg.domain];
-     };
+    in
+    {
+      networking.hosts = {
+        "127.0.0.1" = [ cfg.domain ];
+      };
 
-     # Need this bc otherwise sops will complain for some reason
-     users = {
+      # Need this bc otherwise sops will complain for some reason
+      users = {
         groups.stalwart-mail = { };
         users.stalwart-mail = {
           isSystemUser = true;
           group = "stalwart-mail";
         };
-     };
- 
-    
-    # TODO: Move this into a util function or option; 
-    sops.secrets = 
-      (lib.genAttrs (map toSops secrets) 
-        (name: {
-          sopsFile = sopsPath; 
-          mode = "0440"; 
-          owner = "stalwart-mail";  
-        }));   
+      };
 
+      # TODO: Move this into a util function or option;
+      sops.secrets = (
+        lib.genAttrs (map toSops secrets) (_name: {
+          sopsFile = sopsPath;
+          mode = "0440";
+          owner = "stalwart-mail";
+        })
+      );
 
-    services.nginx.virtualHosts = (lib.genAttrs cfg.wellKnownDomains ( 
-      (wdomain: { 
-        locations = (proxyWellKnown ["jmap" "mta-sts.txt" "mail-v1.xml" "autoconfig/mail"])
-        // (lib.genAttrs ["/.well_known/caldav" "/.well_known/webdav" ] (uri: (makeHttpRedirect "${cfg.domain}${uri}") cfg.doACME ));
-      })))
-    // 
+      services.nginx.virtualHosts =
+        (lib.genAttrs cfg.wellKnownDomains (
+          (_wdomain: {
+            locations =
+              (proxyWellKnown [
+                "jmap"
+                "mta-sts.txt"
+                "mail-v1.xml"
+                "autoconfig/mail"
+              ])
+              // (lib.genAttrs [ "/.well_known/caldav" "/.well_known/webdav" ] (
+                uri: (makeHttpRedirect "${cfg.domain}${uri}") cfg.doACME
+              ));
+          })
+        ))
+        //
 
-    (lib.genAttrs (map (x: "${x}${cfg.domain}") ["" "autodiscover." "autoconfig."]) (domain: {
-      addSSL = cfg.doACME; 
-      enableACME = cfg.doACME;
-      serverName = "${domain}";
-      locations."/" = {
-        proxyPass = "http://localhost:3080"; 
-        recommendedProxySettings = true;  
-      };  
-    }));
+          (lib.genAttrs
+            (map (x: "${x}${cfg.domain}") [
+              ""
+              "autodiscover."
+              "autoconfig."
+            ])
+            (domain: {
+              addSSL = cfg.doACME;
+              enableACME = cfg.doACME;
+              serverName = "${domain}";
+              locations."/" = {
+                proxyPass = "http://localhost:3080";
+                recommendedProxySettings = true;
+              };
+            })
+          );
 
-      
-    services.stalwart-mail = {
-      enable = true; 
-      dataDir = cfg.dataDir;  
-      openFirewall = false; 
-      credentials  = lib.genAttrs secrets toCredfilePath;   
-      settings = {
-        server.listener = {
-          smtp       = basicListener "smtp" 25  false;  
-          submission = basicListener "smtp" 465 true;  
-          imaptls    = basicListener "imap" 993 true;  
-          imap       = basicListener "imap" 143 true;  
-          webdav     = basicListener "http" 3080 false; 
-          jmap       = basicListener "http" 3080 false; 
-          http       = basicListener "http" 3080 false; 
-        };
+      services.stalwart-mail = {
+        enable = true;
+        dataDir = cfg.dataDir;
+        openFirewall = false;
+        credentials = lib.genAttrs secrets toCredfilePath;
+        settings = {
+          server.listener = {
+            smtp = basicListener "smtp" 25 false;
+            submission = basicListener "smtp" 465 true;
+            imaptls = basicListener "imap" 993 true;
+            imap = basicListener "imap" 143 true;
+            webdav = basicListener "http" 3080 false;
+            jmap = basicListener "http" 3080 false;
+            http = basicListener "http" 3080 false;
+          };
 
-        store.rocksdb = {
-          type = "rocksdb"; 
-          path = cfg.dataDir;
-          compression = "lz4";
-        };
+          store.rocksdb = {
+            type = "rocksdb";
+            path = cfg.dataDir;
+            compression = "lz4";
+          };
 
-        directory.internal = {
-          type = "internal"; 
-          store = "rocksdb"; 
-        }; 
+          directory.internal = {
+            type = "internal";
+            store = "rocksdb";
+          };
 
-        storage = {
-          data = "rocksdb"; 
-          fts = "rocksdb";
-          blob = "rocksdb";
-          lookup = "rocksdb";
-          directory = "internal";
-        };
+          storage = {
+            data = "rocksdb";
+            fts = "rocksdb";
+            blob = "rocksdb";
+            lookup = "rocksdb";
+            directory = "internal";
+          };
 
-        authentication.fallback-admin = {
-          user = "admin"; 
-          secret = toStalwartCred "user_admin_password"; 
-        };
+          authentication.fallback-admin = {
+            user = "admin";
+            secret = toStalwartCred "user_admin_password";
+          };
 
-        http = {
-          use-x-forwarded = true; 
-          url = "protocol + \"${cfg.domain}\"";
-        }; 
+          http = {
+            use-x-forwarded = true;
+            url = "protocol + \"${cfg.domain}\"";
+          };
+        };
       };
-    }; 
-  }); 
+    }
+  );
 }
diff --git a/services/freshrss.nix b/services/freshrss.nix
index 0b66755..acb1770 100644
--- a/services/freshrss.nix
+++ b/services/freshrss.nix
@@ -1,81 +1,92 @@
-{config, lib, pkgs, ...}: 
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
-  cfg = config.wilkuu.services.freshrss; 
-  hostname = config.networking.hostName; 
-in 
+  cfg = config.wilkuu.services.freshrss;
+  hostname = config.networking.hostName;
+in
 {
 
   options.wilkuu.services.freshrss = with lib; {
     domain = mkOption {
-      type = types.str; 
-      default = "rss.${hostname}.local"; 
-      example = "rss.wilkuu.xyz"; 
-      description = "Domain for http connections.";  
-    };  
+      type = types.str;
+      default = "rss.${hostname}.local";
+      example = "rss.wilkuu.xyz";
+      description = "Domain for http connections.";
+    };
     doACME = mkEnableOption "Enable ACME for fresh-rss here";
-    enable = mkEnableOption "Enable the fresh-rss service"; 
-    dataDir = mkOption { 
-     type = types.path; 
-     description = "Storage localtion for fresh-rss data";
-     default = "/srv/data/freshrss";
-     example = "/srv/data/freshrss";
-    }; 
+    enable = mkEnableOption "Enable the fresh-rss service";
+    dataDir = mkOption {
+      type = types.path;
+      description = "Storage localtion for fresh-rss data";
+      default = "/srv/data/freshrss";
+      example = "/srv/data/freshrss";
+    };
   };
 
-  config = lib.mkIf cfg.enable (let 
-    sopsPath = ../secrets/${hostname}/freshrss.yaml;
-    secrets = ["admin_password"  "db_pass"]; 
-    toSops  = (sname: "fresh-rss/${sname}");
-  in {
-     networking.hosts = {
-      "127.0.0.1" = [cfg.domain];
-     };
+  config = lib.mkIf cfg.enable (
+    let
+      sopsPath = ../secrets/${hostname}/freshrss.yaml;
+      secrets = [
+        "admin_password"
+        "db_pass"
+      ];
+      toSops = (sname: "fresh-rss/${sname}");
+    in
+    {
+      networking.hosts = {
+        "127.0.0.1" = [ cfg.domain ];
+      };
 
-    sops.secrets = 
-      (lib.genAttrs (map toSops secrets) 
-        (name: {
-          sopsFile = sopsPath; 
-          mode = "0440"; 
-          owner = config.services.freshrss.user;  
-        }));   
+      sops.secrets = (
+        lib.genAttrs (map toSops secrets) (_name: {
+          sopsFile = sopsPath;
+          mode = "0440";
+          owner = config.services.freshrss.user;
+        })
+      );
 
-    services.nginx.virtualHosts."${cfg.domain}" = {
-      addSSL = cfg.doACME; 
-      enableACME = cfg.doACME;
-    };
-
-    wilkuu.services.mysql = {
-      enable = true; 
-      users."freshrss" = {
-        sopsPlaceholder = config.sops.placeholder."fresh-rss/db_pass";
+      services.nginx.virtualHosts."${cfg.domain}" = {
+        addSSL = cfg.doACME;
+        enableACME = cfg.doACME;
       };
-      databases."freshrss" = {
-        enable = true; 
-        allowedUsers = ["freshrss"];
+
+      wilkuu.services.mysql = {
+        enable = true;
+        users."freshrss" = {
+          sopsPlaceholder = config.sops.placeholder."fresh-rss/db_pass";
+        };
+        databases."freshrss" = {
+          enable = true;
+          allowedUsers = [ "freshrss" ];
+        };
       };
-    };
 
-    services.freshrss = {
-      enable = true;
-      # api.enable = true;
-      dataDir = cfg.dataDir;
-      baseUrl = "https://${cfg.domain}";
-      extensions = with pkgs.freshrss-extensions; [
-        youtube
-        title-wrap
-        auto-ttl
-        reading-time
-      ];
-      passwordFile = config.sops.secrets."fresh-rss/admin_password".path;
-      virtualHost = cfg.domain;
-      database = {
-         passFile = config.sops.secrets."fresh-rss/db_pass".path; 
-         host = "localhost"; 
-         port = config.wilkuu.services.mysql.port;
-         name = "freshrss";
-         user = "freshrss"; 
-         type = "mysql";
+      services.freshrss = {
+        enable = true;
+        # api.enable = true;
+        dataDir = cfg.dataDir;
+        baseUrl = "https://${cfg.domain}";
+        extensions = with pkgs.freshrss-extensions; [
+          youtube
+          title-wrap
+          auto-ttl
+          reading-time
+        ];
+        passwordFile = config.sops.secrets."fresh-rss/admin_password".path;
+        virtualHost = cfg.domain;
+        database = {
+          passFile = config.sops.secrets."fresh-rss/db_pass".path;
+          host = "localhost";
+          port = config.wilkuu.services.mysql.port;
+          name = "freshrss";
+          user = "freshrss";
+          type = "mysql";
+        };
       };
-    };
-  }); 
+    }
+  );
 }
diff --git a/services/mysql.nix b/services/mysql.nix
index 8a7b5e2..92db5f7 100644
--- a/services/mysql.nix
+++ b/services/mysql.nix
@@ -30,14 +30,15 @@ let
       )
     else
       " -- Ommitted user ${name}";
-  
+
   add-unix-user-clauses =
-    name: ''
-          -- Clauses for user ${name}
-          ALTER USER IF EXISTS '${name}'@'localhost' IDENTIFIED BY unix_socket'; 
-          CREATE USER IF NOT EXISTS '${name}'@'localhost' IDENTIFIED BY unix_socket';  
-        ''
-        + (lib.concatMapAttrsStringSep "\n" (priviledge_clause name) (create_users_ensure name));
+    name:
+    ''
+      -- Clauses for user ${name}
+      ALTER USER IF EXISTS '${name}'@'localhost' IDENTIFIED BY unix_socket'; 
+      CREATE USER IF NOT EXISTS '${name}'@'localhost' IDENTIFIED BY unix_socket';  
+    ''
+    + (lib.concatMapAttrsStringSep "\n" (priviledge_clause name) (create_users_ensure name));
 
 in
 {
@@ -87,10 +88,10 @@ in
         default = { };
       };
     unix_users = lib.mkOption {
-      type = lib.types.listOf lib.types.str; 
+      type = lib.types.listOf lib.types.str;
       description = "Users that can identify using the unix socket";
-      default = []; 
-      example = ["wakapi"];
+      default = [ ];
+      example = [ "wakapi" ];
     };
   };
   # config.sops.secrets = lib.mkIf cfg.enable {
@@ -100,7 +101,12 @@ in
   # };
   config.sops.templates."init-mysql" = {
     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)));
+    content = (
+      lib.concatLines (
+        (builtins.attrValues (builtins.mapAttrs add-user-clauses cfg.users))
+        ++ (map add-unix-user-clauses cfg.unix_users)
+      )
+    );
   };
 
   config.services.mysql = {
diff --git a/services/uptimekuma.nix b/services/uptimekuma.nix
index 4cdd5f2..1ac6006 100644
--- a/services/uptimekuma.nix
+++ b/services/uptimekuma.nix
@@ -1,78 +1,76 @@
-{config, lib, pkgs, ...}: 
+{ config, lib, ... }:
 let
-  cfg = config.wilkuu.services.uptimekuma; 
-  hostname = config.networking.hostName; 
-in 
+  cfg = config.wilkuu.services.uptimekuma;
+  hostname = config.networking.hostName;
+in
 {
   options.wilkuu.services.uptimekuma = with lib; {
     domain = mkOption {
-      type = types.str; 
-      default = "uptime.${hostname}.local"; 
-      example = "uptime.wilkuu.xyz"; 
-      description = "Domain for http connections.";  
-    };  
+      type = types.str;
+      default = "uptime.${hostname}.local";
+      example = "uptime.wilkuu.xyz";
+      description = "Domain for http connections.";
+    };
     doACME = mkEnableOption "Enable ACME for uptime kuma here";
-    enable = mkEnableOption "Enable the uptime-kuma service"; 
-    dataDir = mkOption { 
-     type = types.path; 
-     description = "Storage localtion for uptime kuma data, currently ignored, because nixpkgs sucks";
-     default = "/srv/data/uptimekuma";
-     example = "/srv/data/uptimekuma";
-    }; 
+    enable = mkEnableOption "Enable the uptime-kuma service";
+    dataDir = mkOption {
+      type = types.path;
+      description = "Storage localtion for uptime kuma data, currently ignored, because nixpkgs sucks";
+      default = "/srv/data/uptimekuma";
+      example = "/srv/data/uptimekuma";
+    };
   };
 
-  config = lib.mkIf cfg.enable (let 
-    # sopsPath = ../secrets/${hostname}/vaultwarden.yaml;
-    # secrets = []; 
-    # toSops  = (sname: "uptime-kuma/${sname}");
-  in {
-     networking.hosts = {
-      "127.0.0.1" = [cfg.domain];
-     };
+  config = lib.mkIf cfg.enable ({
+    networking.hosts = {
+      "127.0.0.1" = [ cfg.domain ];
+    };
 
     users.users.uptimekuma = {
       isSystemUser = true;
       group = "uptimekuma";
     };
-    users.groups.uptimekuma = {};
+    users.groups.uptimekuma = { };
 
     systemd.services.uptime-kuma.serviceConfig.User = "uptimekuma";
 
-    # sops.secrets = 
-    #   (lib.genAttrs (map toSops secrets) 
+    # sops.secrets =
+    #   (lib.genAttrs (map toSops secrets)
     #     (name: {
-    #       sopsFile = sopsPath; 
-    #       mode = "0440"; 
-    #       owner = "uptime-kuma";  
-    #     }));   
+    #       sopsFile = sopsPath;
+    #       mode = "0440";
+    #       owner = "uptime-kuma";
+    #     }));
 
     services.nginx.virtualHosts."${cfg.domain}" = {
-      addSSL = cfg.doACME; 
+      addSSL = cfg.doACME;
       enableACME = cfg.doACME;
       locations."/" = {
-        proxyPass = "http://localhost:3111"; 
+        proxyPass = "http://localhost:3111";
         recommendedProxySettings = true;
       };
     };
 
-    wilkuu.services.mysql = let 
-      user =  config.systemd.services.uptime-kuma.serviceConfig.User;
-    in  {
-      unix_users = [user]; 
-      databases.uptimekuma = {
-        enable = true; 
-        allowedUsers = [user];
+    wilkuu.services.mysql =
+      let
+        user = config.systemd.services.uptime-kuma.serviceConfig.User;
+      in
+      {
+        unix_users = [ user ];
+        databases.uptimekuma = {
+          enable = true;
+          allowedUsers = [ user ];
+        };
       };
-    };
 
     services.uptime-kuma = {
       enable = true;
       settings = {
         UPTIME_KUMA_PORT = "3111";
-        UPTIME_KUMA_HOST="127.0.0.1";
+        UPTIME_KUMA_HOST = "127.0.0.1";
         UPTIME_KUMA_DB_TYPE = "sqlite";
         UPTIME_KUMA_DB_SOCKET = "/var/lib/mysql/mysql.sock";
       };
     };
-  }); 
+  });
 }
diff --git a/services/vaultwarden.nix b/services/vaultwarden.nix
index f68a2fa..4aa24ba 100644
--- a/services/vaultwarden.nix
+++ b/services/vaultwarden.nix
@@ -1,76 +1,78 @@
-{config, pkgs, lib, ...}: 
+{ config, lib, ... }:
 let
-  cfg = config.wilkuu.services.vaultwarden; 
-  hostname = config.networking.hostName; 
-in 
+  cfg = config.wilkuu.services.vaultwarden;
+  hostname = config.networking.hostName;
+in
 {
   options.wilkuu.services.vaultwarden = with lib; {
     domain = mkOption {
-      type = types.str; 
-      default = "bitwarden.${hostname}.local"; 
-      example = "bitwarden.wilkuu.xyz"; 
-      description = "Domain for http connections.";  
-    };  
+      type = types.str;
+      default = "bitwarden.${hostname}.local";
+      example = "bitwarden.wilkuu.xyz";
+      description = "Domain for http connections.";
+    };
     doACME = mkEnableOption "Enable ACME for vaultwarden here";
-    enable = mkEnableOption "Enable the vaultwarden service"; 
-    backupDir = mkOption { 
-     type = types.path; 
-     description = "Storage localtion for Vaultwarden user data backup";
-     default = "/srv/data/vaultwarden";
-     example = "/srv/data/vaultwarden";
-    }; 
+    enable = mkEnableOption "Enable the vaultwarden service";
+    backupDir = mkOption {
+      type = types.path;
+      description = "Storage localtion for Vaultwarden user data backup";
+      default = "/srv/data/vaultwarden";
+      example = "/srv/data/vaultwarden";
+    };
     signupWhitelist = mkOption {
-      type = types.listOf types.str; 
-      default = []; 
-      example = ["wilkuu.xyz"]; 
+      type = types.listOf types.str;
+      default = [ ];
+      example = [ "wilkuu.xyz" ];
       description = "Domains that can sign up on vaultwarden";
-    }; 
+    };
   };
 
-  config = lib.mkIf cfg.enable (let 
-    sopsPath = ../secrets/${hostname}/vaultwarden.yaml;
-    secrets = ["admin_token"]; 
-    toSops  = (sname: "vaultwarden/${sname}");
-    toCredfilePath = (name: config.sops.secrets.${toSops name}.path); 
-  in {
-     networking.hosts = {
-      "127.0.0.1" = [cfg.domain];
-     };
+  config = lib.mkIf cfg.enable (
+    let
+      sopsPath = ../secrets/${hostname}/vaultwarden.yaml;
+      secrets = [ "admin_token" ];
+      toSops = (sname: "vaultwarden/${sname}");
+    in
+    {
+      networking.hosts = {
+        "127.0.0.1" = [ cfg.domain ];
+      };
+
+      sops.secrets = (
+        lib.genAttrs (map toSops secrets) (_name: {
+          sopsFile = sopsPath;
+          mode = "0440";
+          owner = "vaultwarden";
+        })
+      );
 
-    sops.secrets = 
-      (lib.genAttrs (map toSops secrets) 
-        (name: {
-          sopsFile = sopsPath; 
-          mode = "0440"; 
-          owner = "vaultwarden";  
-        }));   
+      sops.templates.vaultwardenEnvFile.content = ''
+        ADMIN_TOKEN=${config.sops.placeholder."vaultwarden/admin_token"}
+      '';
 
-    sops.templates.vaultwardenEnvFile.content = ''
-      ADMIN_TOKEN=${config.sops.placeholder."vaultwarden/admin_token"}
-    '';
-    
-    services.nginx.virtualHosts."${cfg.domain}" = {
-      enableACME = cfg.doACME;
-      addSSL = cfg.doACME; 
-      locations."/" = {
-        proxyPass = "http://localhost:3222"; 
-        recommendedProxySettings = true;
+      services.nginx.virtualHosts."${cfg.domain}" = {
+        enableACME = cfg.doACME;
+        addSSL = cfg.doACME;
+        locations."/" = {
+          proxyPass = "http://localhost:3222";
+          recommendedProxySettings = true;
+        };
       };
-    };
 
-    services.vaultwarden = {
-      enable = cfg.enable; 
-      backupDir = "/srv/data/vaultwarden";
-      config = {
-        DOMAIN=cfg.domain;
-        ROCKET_ADDRESS = "127.0.0.1";
-        ROCKET_PORT ="3222";
-        SIGNUPS_DOMAINS_WHITELIST=(lib.concatStringsSep "," cfg.signupWhitelist);
-        SIGNUPS_ALLOWED="false";
-        IP_HEADER="X-Forwarded-For";
-      }; 
-      environmentFile = config.sops.templates.vaultwardenEnvFile.path;
-    };
-    
-  }); 
+      services.vaultwarden = {
+        enable = cfg.enable;
+        backupDir = "/srv/data/vaultwarden";
+        config = {
+          DOMAIN = cfg.domain;
+          ROCKET_ADDRESS = "127.0.0.1";
+          ROCKET_PORT = "3222";
+          SIGNUPS_DOMAINS_WHITELIST = (lib.concatStringsSep "," cfg.signupWhitelist);
+          SIGNUPS_ALLOWED = "false";
+          IP_HEADER = "X-Forwarded-For";
+        };
+        environmentFile = config.sops.templates.vaultwardenEnvFile.path;
+      };
+
+    }
+  );
 }
diff --git a/services/wakapi.nix b/services/wakapi.nix
index 1b1e312..c89a46a 100644
--- a/services/wakapi.nix
+++ b/services/wakapi.nix
@@ -1,110 +1,112 @@
-{config, lib, pkgs, ...}: 
+{ config, lib, ... }:
 let
-  cfg = config.wilkuu.services.wakapi; 
-  hostname = config.networking.hostName; 
+  cfg = config.wilkuu.services.wakapi;
+  hostname = config.networking.hostName;
   service_user = config.systemd.services.wakapi.serviceConfig.User;
-in 
+in
 {
   options.wilkuu.services.wakapi = with lib; {
     domain = mkOption {
-      type = types.str; 
-      default = "wakapi.${hostname}.local"; 
-      example = "wakapi.wilkuu.xyz"; 
-      description = "Domain for http connections.";  
-    };  
+      type = types.str;
+      default = "wakapi.${hostname}.local";
+      example = "wakapi.wilkuu.xyz";
+      description = "Domain for http connections.";
+    };
     email = mkOption {
-      type = types.str; 
-      default = "wakapi@${hostname}.local"; 
-      example = "noreply@wilkuu.xyz"; 
-      description = "Mailer address";  
-    };  
+      type = types.str;
+      default = "wakapi@${hostname}.local";
+      example = "noreply@wilkuu.xyz";
+      description = "Mailer address";
+    };
     doACME = mkEnableOption "Enable ACME for wakapi here";
-    enable = mkEnableOption "Enable the wakapi service"; 
-    dataDir = mkOption { 
-     type = types.path; 
-     description = "Storage localtion for wakapi data";
-     default = "/srv/data/wakapi";
-     example = "/srv/data/wakapi";
-    }; 
+    enable = mkEnableOption "Enable the wakapi service";
+    dataDir = mkOption {
+      type = types.path;
+      description = "Storage localtion for wakapi data";
+      default = "/srv/data/wakapi";
+      example = "/srv/data/wakapi";
+    };
   };
 
-  config = lib.mkIf cfg.enable (let 
-  sopsPath = ../secrets/${hostname}/wakapi.yaml;
-  secrets = ["password_salt"]; 
-  toSops  = (sname: "wakapi/${sname}");
-  in {
-     networking.hosts = {
-      "127.0.0.1" = [cfg.domain];
-     };
+  config = lib.mkIf cfg.enable (
+    let
+      sopsPath = ../secrets/${hostname}/wakapi.yaml;
+      secrets = [ "password_salt" ];
+      toSops = (sname: "wakapi/${sname}");
+    in
+    {
+      networking.hosts = {
+        "127.0.0.1" = [ cfg.domain ];
+      };
 
-    sops.secrets = 
-      (lib.genAttrs (map toSops secrets) 
-        (name: {
-          sopsFile = sopsPath; 
-          mode = "0440"; 
-          owner = service_user;  
-        }));   
+      sops.secrets = (
+        lib.genAttrs (map toSops secrets) (_name: {
+          sopsFile = sopsPath;
+          mode = "0440";
+          owner = service_user;
+        })
+      );
 
-    services.nginx.virtualHosts."${cfg.domain}" = {
-      enableACME = cfg.doACME;
-      addSSL = cfg.doACME; 
-      locations."/" = {
-        proxyPass = "http://localhost:3111"; 
-        recommendedProxySettings = true;
+      services.nginx.virtualHosts."${cfg.domain}" = {
+        enableACME = cfg.doACME;
+        addSSL = cfg.doACME;
+        locations."/" = {
+          proxyPass = "http://localhost:3111";
+          recommendedProxySettings = true;
+        };
       };
-    };
 
-    wilkuu.services.mysql = let 
-    in  {
-      unix_users = [service_user]; 
-      databases.wakapi = {
-        enable = true; 
-        allowedUsers = [service_user];
+      wilkuu.services.mysql = {
+        unix_users = [ service_user ];
+        databases.wakapi = {
+          enable = true;
+          allowedUsers = [ service_user ];
+        };
       };
-    };
 
-    services.wakapi = {
-      enable = true;
-      stateDir = cfg.dataDir;
-      passwordSaltFile = config.sops.secrets.wakapi/password_salt;
-      settings = {
-        server = {
-          port = 3111;
-          public_url = cfg.domain; 
-        }; 
-        app = {
-          leaderboard_enabled = false; 
-          leaderboard_require_auth = true; 
-          inactive_days = 7;                 # time of previous days within a user must have logged in to be considered active
-          # go time format strings to format human-readable dates
-          # for details, check https://pkg.go.dev/time#Time.Format
-          date_format= "Mon, 02 Jan 2006";
-          datetime_format= "Mon, 02 Jan 2006 15:04";
-        };
-        db = { 
-          socket= "/var/lib/mysql/mysql.sock";
-          name = "wakapi"; 
-          dialect = "mysql"; 
-          charset = "utf8mb4";
+      services.wakapi = {
+        enable = true;
+        stateDir = cfg.dataDir;
+        passwordSaltFile = config.sops.secrets.wakapi/password_salt;
+        settings = {
+          server = {
+            port = 3111;
+            public_url = cfg.domain;
+          };
+          app = {
+            leaderboard_enabled = false;
+            leaderboard_require_auth = true;
+            inactive_days = 7; # time of previous days within a user must have logged in to be considered active
+            # go time format strings to format human-readable dates
+            # for details, check https://pkg.go.dev/time#Time.Format
+            date_format = "Mon, 02 Jan 2006";
+            datetime_format = "Mon, 02 Jan 2006 15:04";
+          };
+          db = {
+            socket = "/var/lib/mysql/mysql.sock";
+            name = "wakapi";
+            dialect = "mysql";
+            charset = "utf8mb4";
+          };
+          security = {
+            insecure_cookies = false;
+            trust_reverse_proxy_ips = "127.0.0.1";
+          };
+          mail = {
+            # FIXME: Add email
+            enabled = false;
+            provider = "smtp";
+            sender = "<Wakapi ${cfg.email}>";
+            smtp = {
+            };
+          };
         };
-        security = {
-          insecure_cookies = false; 
-          trust_reverse_proxy_ips= "127.0.0.1"; 
+        database = {
+          dialect = "mysql";
+          createLocally = false;
         };
-        mail = {
-          # FIXME: Add email 
-          enabled = false; 
-          provider = "smtp"; 
-          sender = "<Wakapi ${cfg.email}>"; 
-          smtp = {
-          };
-        }; 
-      }; 
-      database = {
-        dialect = "mysql";
-        createLocally = false;
+
       };
-      
-    };
-  }); 
+    }
+  );
 }