diff --git a/lua/taken/plugins/lsp/mason.lua b/lua/taken/plugins/lsp/mason.lua index b76fa22..95413e1 100644 --- a/lua/taken/plugins/lsp/mason.lua +++ b/lua/taken/plugins/lsp/mason.lua @@ -29,8 +29,7 @@ return { mason_null_ls.setup({ ensure_installed = { "stylua", - "clang-format", - "eslint_d", + "eslint", }, automatic_installation = true, }) diff --git a/lua/taken/plugins/lsp/null-ls.lua b/lua/taken/plugins/lsp/null-ls.lua index d0fee34..3eaebdc 100644 --- a/lua/taken/plugins/lsp/null-ls.lua +++ b/lua/taken/plugins/lsp/null-ls.lua @@ -12,10 +12,9 @@ return { null_ls.setup({ sources = { formatting.stylua, - formatting.clang_format, - diagnostics.eslint_d.with({ + diagnostics.eslint.with({ condition = function(utils) - return utils.root_has_file({ ".eslintrc.js", ".eslintrc.cjs" }) -- only enable if root has .eslintrc.js or .eslintrc.cjs + return utils.root_has_file({ ".eslintrc.js" }) end, }), }, @@ -30,6 +29,8 @@ return { vim.lsp.buf.format({ async = false }) end, }) + else + vim.notify("Formatting not supported") end end, }) diff --git a/lua/taken/plugins/neotree.lua b/lua/taken/plugins/neotree.lua index 4da7618..748b215 100644 --- a/lua/taken/plugins/neotree.lua +++ b/lua/taken/plugins/neotree.lua @@ -87,7 +87,7 @@ return { enabled = false, leave_dirs_open = false, }, - group_empty_dirs = true, + group_empty_dirs = false, hijack_netrw_behavior = "open_current", use_libuv_file_watcher = false, window = { diff --git a/lua/taken/plugins/telescope.lua b/lua/taken/plugins/telescope.lua index 1a12dfa..bb14d86 100644 --- a/lua/taken/plugins/telescope.lua +++ b/lua/taken/plugins/telescope.lua @@ -11,7 +11,7 @@ return { local telescope = require("telescope") local command = { "fd", "-I", "-H", "--type", "file" } - local ignored = { "node_modules", ".git" } + local ignored = { "node_modules", ".git", "dist" } for i, v in ipairs(ignored) do table.insert(command, "--exclude") @@ -40,10 +40,10 @@ return { }, }, fzf = { - fuzzy = true, -- false will only do exact matching + fuzzy = true, -- false will only do exact matching override_generic_sorter = true, -- override the generic sorter - override_file_sorter = true, -- override the file sorter - case_mode = "smart_case", -- or "ignore_case" or "respect_case" + override_file_sorter = true, -- override the file sorter + case_mode = "smart_case", -- or "ignore_case" or "respect_case" }, }, })