diff --git a/lua/astrocommunity/completion/tabby-nvim/README.md b/lua/astrocommunity/completion/tabby-nvim/README.md
new file mode 100644
index 000000000..bc80f0638
--- /dev/null
+++ b/lua/astrocommunity/completion/tabby-nvim/README.md
@@ -0,0 +1,16 @@
+# tabby-nvim
+
+Tabby is a self-hosted AI coding assistant that can suggest multi-line code or full functions in real-time.
+
+**Repository:** <https://github.com/TabbyML/vim-tabby>
+
+### Default Mappings
+
+| Mappings   | Action            |
+|------------|-------------------|
+| `<C-e>`    | Accept completion |
+| `Ctrl + \` | Trigger/Dismiss   |
+
+## Known Conflicts
+
+- Tabby internally utilizes the `<C-R><C-O>` command to insert the completion. If you have mapped `<C-R>` to other functions, you won't be able to accept the completion. In such scenarios, you may need to manually modify the function `tabby#Accept()` in [`autoload/tabby.vim`](https://github.com/TabbyML/tabby/tree/main/clients/vim/autoload/tabby.vim).
diff --git a/lua/astrocommunity/completion/tabby-nvim/init.lua b/lua/astrocommunity/completion/tabby-nvim/init.lua
new file mode 100644
index 000000000..ce3082d3c
--- /dev/null
+++ b/lua/astrocommunity/completion/tabby-nvim/init.lua
@@ -0,0 +1,16 @@
+return {
+  "TabbyML/vim-tabby",
+  lazy = false,
+  dependencies = {
+    "AstroNvim/astrocore",
+    ---@type AstroCoreOpts
+    opts = {
+      options = {
+        g = {
+          tabby_keybinding_accept = "<C-e>",
+          tabby_keybinding_trigger_or_dismiss = "<C-\\>",
+        },
+      },
+    },
+  },
+}