diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 501917ffb..5916024b0 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -349,6 +349,11 @@
     githubId = 12465195;
     name = "Bruno BELANYI";
   };
+  libewa = {
+    email = "libewa-git@icloud.com";
+    github = "libewa";
+    githubId = 67926131;
+  };
   malvo = {
     email = "malte@malvo.org";
     github = "malte-v";
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 732c92478..bf5e4be76 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1770,6 +1770,16 @@ in {
           ideas from mutt.
         '';
       }
+
+      {
+        time = "2024-10-17T13:07:55+00:00";
+        message = ''
+          A new module is available: 'programs.zed-editor'.
+
+          Zed is a fast text editor for macOS and Linux.
+          See https://zed.dev for more.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index b6880e62f..b2b98e231 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -262,6 +262,7 @@ let
     ./programs/yt-dlp.nix
     ./programs/z-lua.nix
     ./programs/zathura.nix
+    ./programs/zed-editor.nix
     ./programs/zellij.nix
     ./programs/zk.nix
     ./programs/zoxide.nix
diff --git a/modules/programs/zed-editor.nix b/modules/programs/zed-editor.nix
new file mode 100644
index 000000000..250d891bb
--- /dev/null
+++ b/modules/programs/zed-editor.nix
@@ -0,0 +1,89 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.zed-editor;
+  jsonFormat = pkgs.formats.json { };
+
+  mergedSettings = cfg.userSettings // {
+    # this part by @cmacrae
+    auto_install_extensions = lib.genAttrs cfg.extensions (_: true);
+  };
+in {
+  meta.maintainers = [ hm.maintainers.libewa ];
+
+  options = {
+    # TODO: add vscode option parity (installing extensions, configuring
+    # keybinds with nix etc.)
+    programs.zed-editor = {
+      enable = mkEnableOption
+        "Zed, the high performance, multiplayer code editor from the creators of Atom and Tree-sitter";
+
+      package = mkPackageOption pkgs "zed-editor" { };
+
+      userSettings = mkOption {
+        type = jsonFormat.type;
+        default = { };
+        example = literalExpression ''
+          {
+            features = {
+              copilot = false;
+            };
+            telemetry = {
+              metrics = false;
+            };
+            vim_mode = false;
+            ui_font_size = 16;
+            buffer_font_size = 16;
+          }
+        '';
+        description = ''
+          Configuration written to Zed's {file}`settings.json`.
+        '';
+      };
+
+      userKeymaps = mkOption {
+        type = jsonFormat.type;
+        default = { };
+        example = literalExpression ''
+          [
+            {
+              context = "Workspace";
+              bindings = {
+                ctrl-shift-t = "workspace::NewTerminal";
+              };
+            };
+          ]
+        '';
+        description = ''
+          Configuration written to Zed's {file}`keymap.json`.
+        '';
+      };
+
+      extensions = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        example = literalExpression ''
+          [ "swift" "nix" "xy-zed" ]
+        '';
+        description = ''
+          A list of the extensions Zed should install on startup.
+          Use the name of a repository in the [extension list](https://github.com/zed-industries/extensions/tree/main/extensions).
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
+
+    xdg.configFile."zed/settings.json" = (mkIf (mergedSettings != { }) {
+      source = jsonFormat.generate "zed-user-settings" mergedSettings;
+    });
+
+    xdg.configFile."zed/keymap.json" = (mkIf (cfg.userKeymaps != { }) {
+      source = jsonFormat.generate "zed-user-keymaps" cfg.userKeymaps;
+    });
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index 90371aafe..9e431e473 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -161,6 +161,7 @@ in import nmtSrc {
     ./modules/programs/watson
     ./modules/programs/wezterm
     ./modules/programs/yazi
+    ./modules/programs/zed-editor
     ./modules/programs/zellij
     ./modules/programs/zk
     ./modules/programs/zplug
diff --git a/tests/modules/programs/zed-editor/default.nix b/tests/modules/programs/zed-editor/default.nix
new file mode 100644
index 000000000..3c5c894fe
--- /dev/null
+++ b/tests/modules/programs/zed-editor/default.nix
@@ -0,0 +1,5 @@
+{
+  zed-extensions = ./extensions.nix;
+  zed-keymap = ./keymap.nix;
+  zed-settings = ./settings.nix;
+}
diff --git a/tests/modules/programs/zed-editor/extensions.nix b/tests/modules/programs/zed-editor/extensions.nix
new file mode 100644
index 000000000..82b79aed8
--- /dev/null
+++ b/tests/modules/programs/zed-editor/extensions.nix
@@ -0,0 +1,24 @@
+{ config, ... }:
+
+{
+  programs.zed-editor = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { };
+    extensions = [ "swift" "html" "xy-zed" ];
+  };
+
+  nmt.script = let
+    expectedContent = builtins.toFile "expected.json" ''
+      {
+        "auto_install_extensions": {
+          "html": true,
+          "swift": true,
+          "xy-zed": true
+        }
+      }
+    '';
+  in ''
+    assertFileExists "home-files/.config/zed/settings.json"
+    assertFileContent "home-files/.config/zed/settings.json" "${expectedContent}"
+  '';
+}
diff --git a/tests/modules/programs/zed-editor/keymap.nix b/tests/modules/programs/zed-editor/keymap.nix
new file mode 100644
index 000000000..df6abebdf
--- /dev/null
+++ b/tests/modules/programs/zed-editor/keymap.nix
@@ -0,0 +1,39 @@
+# Test custom keymap functionality
+{ config, ... }:
+
+{
+  programs.zed-editor = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { };
+    userKeymaps = [
+      { bindings = { up = "menu::SelectPrev"; }; }
+      {
+        context = "Editor";
+        bindings = { escape = "editor::Cancel"; };
+      }
+    ];
+  };
+
+  nmt.script = let
+    expectedContent = builtins.toFile "expected.json" ''
+      [
+        {
+          "bindings": {
+            "up": "menu::SelectPrev"
+          }
+        },
+        {
+          "bindings": {
+            "escape": "editor::Cancel"
+          },
+          "context": "Editor"
+        }
+      ]
+    '';
+
+    keymapPath = ".config/zed/keymap.json";
+  in ''
+    assertFileExists "home-files/${keymapPath}"
+    assertFileContent "home-files/${keymapPath}" "${expectedContent}"
+  '';
+}
diff --git a/tests/modules/programs/zed-editor/settings.nix b/tests/modules/programs/zed-editor/settings.nix
new file mode 100644
index 000000000..701caab13
--- /dev/null
+++ b/tests/modules/programs/zed-editor/settings.nix
@@ -0,0 +1,36 @@
+# Test custom keymap functionality
+{ config, ... }:
+
+{
+  programs.zed-editor = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { };
+    userSettings = {
+      theme = "XY-Zed";
+      features = { copilot = false; };
+      vim_mode = false;
+      ui_font_size = 16;
+      buffer_font_size = 16;
+    };
+  };
+
+  nmt.script = let
+    expectedContent = builtins.toFile "expected.json" ''
+      {
+        "auto_install_extensions": {},
+        "buffer_font_size": 16,
+        "features": {
+          "copilot": false
+        },
+        "theme": "XY-Zed",
+        "ui_font_size": 16,
+        "vim_mode": false
+      }
+    '';
+
+    settingsPath = ".config/zed/settings.json";
+  in ''
+    assertFileExists "home-files/${settingsPath}"
+    assertFileContent "home-files/${settingsPath}" "${expectedContent}"
+  '';
+}