softinio/nvim-config
softinio/nvim-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request 'nix lsp update' (#10) from nix-updates into main

Browse source 
Reviewed-on: #10
This commit is contained in:
Salar Rahmanian 2024-06-07 23:19:08 -07:00
parent 71648bb0f8 1dce120f9b
commit fed5967077
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lua/plugins/conform.lua
View file

@ -4,6 +4,7 @@ return {
require("conform").setup({ require("conform").setup({
formatters_by_ft = { formatters_by_ft = {
lua = { "stylua" }, lua = { "stylua" },
nix = { "nixfmt" },
python = function(bufnr) python = function(bufnr)
if require("conform").get_formatter_info("ruff_format", bufnr).available then if require("conform").get_formatter_info("ruff_format", bufnr).available then
return { "ruff_fix", "ruff_format" } return { "ruff_fix", "ruff_format" }

2
lua/plugins/lsp.lua
View file

@ -74,6 +74,7 @@ return {
jqls = {}, jqls = {},
jsonls = {}, jsonls = {},
marksman = {}, marksman = {},
nil_ls = {},
pyright = { pyright = {
python = { python = {
analysis = { analysis = {
@ -83,7 +84,6 @@ return {
}, },
}, },
}, },
rnix = {},
rust_analyzer = { rust_analyzer = {
diagnostics = { diagnostics = {
enable = true, enable = true,