diff --git a/README.md b/README.md
index 5dedd8ca9..b81ecb01f 100644
--- a/README.md
+++ b/README.md
@@ -229,6 +229,7 @@ local DEFAULT_SETTINGS = {
 | Earthly | [`earthlyls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#earthlyls) |
 | Elixir | [`elixirls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#elixirls) |
 | Elixir | [`lexical`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#lexical) |
+| Elixir | [`nextls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#nextls) |
 | Elm | [`elmls`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#elmls) |
 | Ember | [`ember`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#ember) |
 | Emmet | [`emmet_language_server`](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#emmet_language_server) |
diff --git a/doc/mason-lspconfig-mapping.txt b/doc/mason-lspconfig-mapping.txt
index 738f0e160..16434ee42 100644
--- a/doc/mason-lspconfig-mapping.txt
+++ b/doc/mason-lspconfig-mapping.txt
@@ -117,6 +117,7 @@ motoko-lsp                                motoko_lsp
 move-analyzer                             move_analyzer
 mutt-language-server                      mutt_ls
 neocmakelsp                               neocmake
+nextls                                    nextls
 nginx-language-server                     nginx_language_server
 nickel-lang-lsp                           nickel_ls
 nil                                       nil_ls
diff --git a/doc/server-mapping.md b/doc/server-mapping.md
index e2e7cc756..4bccdd66c 100644
--- a/doc/server-mapping.md
+++ b/doc/server-mapping.md
@@ -114,6 +114,7 @@
 | [move_analyzer](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#move_analyzer) | [move-analyzer](https://mason-registry.dev/registry/list#move-analyzer) |
 | [mutt_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#mutt_ls) | [mutt-language-server](https://mason-registry.dev/registry/list#mutt-language-server) |
 | [neocmake](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#neocmake) | [neocmakelsp](https://mason-registry.dev/registry/list#neocmakelsp) |
+| [nextls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#nextls) | [nextls](https://mason-registry.dev/registry/list#nextls) |
 | [nginx_language_server](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#nginx_language_server) | [nginx-language-server](https://mason-registry.dev/registry/list#nginx-language-server) |
 | [nickel_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#nickel_ls) | [nickel-lang-lsp](https://mason-registry.dev/registry/list#nickel-lang-lsp) |
 | [nil_ls](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#nil_ls) | [nil](https://mason-registry.dev/registry/list#nil) |
diff --git a/lua/mason-lspconfig/mappings/filetype.lua b/lua/mason-lspconfig/mappings/filetype.lua
index 2f8098fb9..4b67a21dc 100644
--- a/lua/mason-lspconfig/mappings/filetype.lua
+++ b/lua/mason-lspconfig/mappings/filetype.lua
@@ -53,9 +53,9 @@ return {
   earthfile = { "earthlyls" },
   edge = { "htmx", "tailwindcss" },
   edn = { "clojure_lsp" },
-  eelixir = { "elixirls", "htmx", "lexical", "tailwindcss" },
+  eelixir = { "elixirls", "htmx", "lexical", "nextls", "tailwindcss" },
   ejs = { "htmx", "tailwindcss" },
-  elixir = { "elixirls", "htmx", "lexical", "tailwindcss" },
+  elixir = { "elixirls", "htmx", "lexical", "nextls", "tailwindcss" },
   elm = { "elmls" },
   erb = { "htmx", "tailwindcss" },
   erg = { "erg_language_server" },
@@ -85,7 +85,7 @@ return {
   haskell = { "hls" },
   haxe = { "haxe_language_server" },
   hbs = { "htmx", "tailwindcss" },
-  heex = { "elixirls", "htmx", "lexical", "tailwindcss" },
+  heex = { "elixirls", "htmx", "lexical", "nextls", "tailwindcss" },
   helm = { "helm_ls", "snyk_ls" },
   hoon = { "hoon_ls" },
   html = { "angularls", "antlersls", "ast_grep", "emmet_language_server", "emmet_ls", "harper_ls", "html", "htmx", "ltex", "lwc_ls", "stimulus_ls", "tailwindcss", "unocss" },
@@ -191,7 +191,7 @@ return {
   star = { "starlark_rust" },
   stylus = { "tailwindcss" },
   sugarss = { "stylelint_lsp", "tailwindcss" },
-  surface = { "elixirls", "lexical" },
+  surface = { "elixirls", "lexical", "nextls" },
   svelte = { "biome", "emmet_ls", "eslint", "htmx", "svelte", "tailwindcss", "unocss" },
   svg = { "lemminx" },
   swift = { "harper_ls" },
diff --git a/lua/mason-lspconfig/mappings/server.lua b/lua/mason-lspconfig/mappings/server.lua
index 9a0245b67..1da05a54a 100644
--- a/lua/mason-lspconfig/mappings/server.lua
+++ b/lua/mason-lspconfig/mappings/server.lua
@@ -116,6 +116,7 @@ M.lspconfig_to_package = {
     ["move_analyzer"] = "move-analyzer",
     ["mutt_ls"] = "mutt-language-server",
     ["neocmake"] = "neocmakelsp",
+    ["nextls"] = "nextls",
     ["nickel_ls"] = "nickel-lang-lsp",
     ["nginx_language_server"] = "nginx-language-server",
     ["nil_ls"] = "nil",
diff --git a/lua/mason-lspconfig/server_configurations/nextls/init.lua b/lua/mason-lspconfig/server_configurations/nextls/init.lua
new file mode 100644
index 000000000..386c1eb6a
--- /dev/null
+++ b/lua/mason-lspconfig/server_configurations/nextls/init.lua
@@ -0,0 +1,5 @@
+return function()
+    return {
+        cmd = { "nextls", "--stdio" },
+    }
+end