diff options
| -rw-r--r-- | .editorconfig | 12 | ||||
| -rw-r--r-- | config/lua/getchoo/efmls.lua | 9 | ||||
| -rw-r--r-- | config/plugin/lsp.lua | 43 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | neovim.nix | 5 |
5 files changed, 55 insertions, 16 deletions
diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..54ba4d1 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_style = tab +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{lock,nix}] +indent_size = 2 +indent_style = space diff --git a/config/lua/getchoo/efmls.lua b/config/lua/getchoo/efmls.lua index 10d1dee..2b1caaa 100644 --- a/config/lua/getchoo/efmls.lua +++ b/config/lua/getchoo/efmls.lua @@ -2,17 +2,14 @@ local alex = require("efmls-configs.linters.alex") alex.rootMarkers = nil local actionlint = require("efmls-configs.linters.actionlint") local beautysh = require("efmls-configs.formatters.beautysh") -local codespell = require("efmls-configs.linters.codespell") local fish_indent = require("efmls-configs.formatters.fish_indent") local prettier = require("efmls-configs.formatters.prettier") local prettier_eslint = require("efmls-configs.formatters.prettier_eslint") local selene = require("efmls-configs.linters.selene") -local shellcheck = require("efmls-configs.linters.shellcheck") -local statix = require("efmls-configs.linters.statix") local stylua = require("efmls-configs.formatters.stylua") local languages = { - all = { alex, codespell }, + all = { alex }, bash = { beautysh, @@ -30,13 +27,11 @@ local languages = { lua = { selene, stylua }, - nix = { statix }, - sass = { prettier }, scss = { prettier }, - sh = { beautysh, shellcheck }, + sh = { beautysh }, typescript = { prettier_eslint }, diff --git a/config/plugin/lsp.lua b/config/plugin/lsp.lua index 0312523..ef77067 100644 --- a/config/plugin/lsp.lua +++ b/config/plugin/lsp.lua @@ -4,13 +4,27 @@ end vim.g.did_load_lsp_plugin = true local lsp_servers = { + astro = { + binary = "astro-ls", + }, + bashls = { binary = "bash-language-server", }, + biome = {}, + clangd = {}, - eslint = {}, + denols = { + binary = "deno", + }, + + dprint = {}, + + eslint = { + binary = "vscode-eslint-language-server", + }, efm = { binary = "efm-langserver", @@ -41,7 +55,20 @@ local lsp_servers = { }, }, - pyright = {}, + nim_langserver = { + binary = "nimlangserver", + }, + + pyright = { + extraOptions = { + settings = { + -- ruff is used instead + pyright = { disableOrganizeImports = true }, + python = { ignore = { "*" } }, + }, + }, + }, + ruff_lsp = { binary = "ruff-lsp", extraOptions = { @@ -62,13 +89,19 @@ local lsp_servers = { }, }, - denols = { - binary = "deno", - }, + statix = {}, tsserver = { binary = "typescript-language-server", }, + + typos_lsp = { + binary = "typos-lsp", + }, + + typst_lsp = { + binary = "typst-lsp", + }, } local caps = vim.tbl_deep_extend( @@ -26,7 +26,7 @@ # lua lua-language-server - selene + selene stylua # nix @@ -66,14 +66,13 @@ self: { nodePackages.alex actionlint beautysh - codespell - shellcheck - statix # lspconfig nodePackages.bash-language-server nil alejandra + statix + typos-lsp ]; neovimConfig = pkgs.neovimUtils.makeNeovimConfig { |