diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix
index 0c1c50c..20835a4 100644
--- a/configurations/nixos/defiant/configuration.nix
+++ b/configurations/nixos/defiant/configuration.nix
@@ -366,6 +366,10 @@
       enable = true;
       openFirewall = true;
     };
+    flaresolverr = {
+      enable = true;
+      openFirewall = true;
+    };
   };
 
   # disable computer sleeping
diff --git a/modules/nixos-modules/server/default.nix b/modules/nixos-modules/server/default.nix
index 0ed7c18..22a0223 100644
--- a/modules/nixos-modules/server/default.nix
+++ b/modules/nixos-modules/server/default.nix
@@ -8,6 +8,7 @@
 
     ./actual
     ./bazarr
+    ./flaresolverr
     ./forgejo
     ./home-assistant
     ./immich
diff --git a/modules/nixos-modules/server/flaresolverr/default.nix b/modules/nixos-modules/server/flaresolverr/default.nix
new file mode 100644
index 0000000..f39d940
--- /dev/null
+++ b/modules/nixos-modules/server/flaresolverr/default.nix
@@ -0,0 +1,6 @@
+{...}: {
+  imports = [
+    ./proxy.nix
+    ./impermanence.nix
+  ];
+}
diff --git a/modules/nixos-modules/server/flaresolverr/impermanence.nix b/modules/nixos-modules/server/flaresolverr/impermanence.nix
new file mode 100644
index 0000000..b568a56
--- /dev/null
+++ b/modules/nixos-modules/server/flaresolverr/impermanence.nix
@@ -0,0 +1,19 @@
+{
+  lib,
+  config,
+  ...
+}: {
+  config = lib.mkIf (config.services.flaresolverr.enable && config.host.impermanence.enable) {
+    # FlareSolverr typically doesn't need persistent storage as it's a proxy service
+    # but we'll add basic structure in case it's needed for logs or configuration
+    environment.persistence."/persist/system/root" = {
+      directories = [
+        {
+          directory = "/var/lib/flaresolverr";
+          user = "flaresolverr";
+          group = "flaresolverr";
+        }
+      ];
+    };
+  };
+}
diff --git a/modules/nixos-modules/server/flaresolverr/proxy.nix b/modules/nixos-modules/server/flaresolverr/proxy.nix
new file mode 100644
index 0000000..5b8dd4c
--- /dev/null
+++ b/modules/nixos-modules/server/flaresolverr/proxy.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  config,
+  ...
+}: {
+  options.services.flaresolverr = {
+    subdomain = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      default = null;
+      description = "Subdomain for reverse proxy. If null, service will be local only.";
+    };
+    extraSubdomains = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [];
+      description = "Extra subdomains for reverse proxy.";
+    };
+  };
+
+  config = lib.mkIf (config.services.flaresolverr.enable && config.services.flaresolverr.subdomain != null) {
+    host.reverse_proxy.subdomains.flaresolverr = {
+      subdomain = config.services.flaresolverr.subdomain;
+      extraSubdomains = config.services.flaresolverr.extraSubdomains;
+      target = "http://127.0.0.1:${toString config.services.flaresolverr.port}";
+      websockets.enable = true;
+      forwardHeaders.enable = true;
+    };
+  };
+}