diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2a910ee13dd9..4ab71bbb8762 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19682,6 +19682,13 @@
     githubId = 83010835;
     keys = [ { fingerprint = "0181 FF89 4F34 7FCC EB06  5710 4C88 A185 FB89 301E"; } ];
   };
+  overloader = {
+    name = "Overloader";
+    github = "Overloader6";
+    githubId = 22007229;
+    email = "overloader@tutanota.com";
+    keys = [ { fingerprint = "B96E 6D41 E47B 042C 64A2  1D9A 8B17 537A AF09 AF18"; } ];
+  };
   ovlach = {
     email = "ondrej@vlach.xyz";
     name = "Ondrej Vlach";
diff --git a/pkgs/by-name/fl/flow-state/package.nix b/pkgs/by-name/fl/flow-state/package.nix
new file mode 100644
index 000000000000..25e5d59ed8db
--- /dev/null
+++ b/pkgs/by-name/fl/flow-state/package.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "flow_state";
+  version = "1.0.3";
+
+  src = fetchFromGitHub {
+    owner = "Stan-breaks";
+    repo = "flow_state";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-7j8W370lr/QaLL+T7N/2SlcrPe+dTW5zlNPL7+U/Vog=";
+  };
+
+  cargoHash = "sha256-IY4Kd43zLIGRjQbkeZddl6ayRv997HuSKV1DKI8Z6BY=";
+
+  meta = {
+    description = "Terminal-based habit tracker designed for neurodivergent users";
+    mainProgram = "flow_state";
+    homepage = "https://github.com/Stan-breaks/flow_state";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      overloader
+    ];
+  };
+})