diff --git a/README.md b/README.md
index b011028..76b4767 100644
--- a/README.md
+++ b/README.md
@@ -323,7 +323,7 @@ local servers = {
   "jedi_language_server", "jdtls", "sumneko_lua", "vimls", "html", "jsonls", "solargraph", "cssls",
   "yamlls", "clangd", "ccls", "sqls", "denols", "graphql", "dartls", "dotls",
   "kotlin_language_server", "nimls", "intelephense", "vuels", "phpactor", "omnisharp",
-  "r_language_server", "rust_analyzer", "terraformls", "svelte", "texlab", "clojure_lsp"
+  "r_language_server", "rust_analyzer", "terraformls", "svelte", "texlab", "clojure_lsp", "elixirls"
 }
 
 ```
@@ -765,4 +765,5 @@ end
 - Check `LspInfo` and treesitter status with `checkhealth`
 - Turn on log and attach the log to your issue if possible you can remove any personal/company info in the log
 - Submit Issue with minium vimrc. Please check playground/init.lua as a vimrc template. !!!Please DONOT use a packer vimrc
-that installs everything to default folder!!! Also check this repo [navigator bug report](https://github.com/fky2015/navigator.nvim-bug-report)
+
+  that installs everything to default folder!!! Also check this repo [navigator bug report](https://github.com/fky2015/navigator.nvim-bug-report)
diff --git a/lua/navigator/lspclient/clients.lua b/lua/navigator/lspclient/clients.lua
index 24b434e..457a1c9 100644
--- a/lua/navigator/lspclient/clients.lua
+++ b/lua/navigator/lspclient/clients.lua
@@ -113,6 +113,22 @@ local setups = {
     cmd = { 'clojure-lsp' },
   },
 
+  elixirls = {
+    on_attach = on_attach,
+    filetypes = { 'elixir', 'eelixir'},
+    cmd = {'elixir-ls'},
+    message_level = vim.lsp.protocol.MessageType.error,
+    settings = {
+      elixirLS = {
+        dialyzerEnabled = true, fetchDeps = false
+      }
+    },
+    root_dir = function(fname)
+      return util.root_pattern('mix.exs', '.git')(fname)
+        or util.path.dirname(fname)
+    end,
+  },
+
   gopls = {
     on_attach = on_attach,
     -- capabilities = cap,
@@ -319,6 +335,7 @@ local servers = {
   'svelte',
   'texlab',
   'clojure_lsp',
+  'elixirls'
 }
 
 local lsp_installer_servers = {}
diff --git a/lua/navigator/lspclient/mapping.lua b/lua/navigator/lspclient/mapping.lua
index 16e55d6..18ab2c1 100644
--- a/lua/navigator/lspclient/mapping.lua
+++ b/lua/navigator/lspclient/mapping.lua
@@ -203,9 +203,9 @@ end
 local function set_event_handler(user_opts)
   user_opts = user_opts or {}
   local file_types =
-    'c,cpp,h,go,python,vim,sh,javascript,html,css,lua,typescript,rust,javascriptreact,typescriptreact,json,yaml,kotlin,php,dart,nim,terraform,java'
+    'c,cpp,h,go,python,vim,sh,javascript,html,css,lua,typescript,rust,javascriptreact,typescriptreact,json,kotlin,php,dart,nim,java'
   -- local format_files = "c,cpp,h,go,python,vim,javascript,typescript" --html,css,
-  vim.api.nvim_command([[augroup nvim_lsp_autos]])
+  vim.api.nvim_command([[augroup nvim_nv_lsp_autos]])
   vim.api.nvim_command([[autocmd!]])
 
   for _, value in pairs(event_hdlrs) do
@@ -215,7 +215,12 @@ local function set_event_handler(user_opts)
     else
       f = 'lua vim.lsp.buf.' .. value.func
     end
-    local cmd = 'autocmd FileType ' .. file_types .. ' autocmd nvim_lsp_autos ' .. value.ev .. ' <buffer> silent! ' .. f
+    local cmd = 'autocmd FileType '
+      .. file_types
+      .. ' autocmd nvim_nv_lsp_autos '
+      .. value.ev
+      .. ' <buffer> silent! '
+      .. f
     vim.api.nvim_command(cmd)
   end
   vim.api.nvim_command([[augroup END]])