removing null-ls and adding tailwindcss to lsp

This commit is contained in:
Ivan Dimitrov 2023-07-30 10:55:18 +03:00
parent 51b6675a4f
commit 5c2f81c1c5
2 changed files with 22 additions and 25 deletions

View File

@ -1,15 +1,21 @@
-- START GLOBAL CONFIG -- START GLOBAL CONFIG
vim.wo.number = true -- show numbers vim.wo.number = true -- show numbers
vim.o.scrolloff = 15 -- scrll if n lines left vim.o.scrolloff = 15 -- scrll if n lines left
vim.o.hlsearch = false -- highlight search vim.o.hlsearch = false -- highlight search
vim.g.mapleader = " " -- leader space vim.g.mapleader = " " -- leader space
vim.g.maplocalleader = " " vim.g.maplocalleader = " "
vim.keymap.set({ "n", "v" }, "<Space>", "<Nop>", { silent = true }) -- nop leader vim.keymap.set({ "n", "v" }, "<Space>", "<Nop>", { silent = true }) -- nop leader
local nmap = function(keys, cmd) vim.keymap.set("n", keys, cmd, { noremap = true, silent = true }) end local nmap = function(keys, cmd)
local vmap = function(keys, cmd) vim.keymap.set("v", keys, cmd, { noremap = true, silent = true }) end vim.keymap.set("n", keys, cmd, { noremap = true, silent = true })
local tmap = function(keys, cmd) vim.keymap.set("t", keys, cmd, { noremap = true, silent = true }) end end
local vmap = function(keys, cmd)
vim.keymap.set("v", keys, cmd, { noremap = true, silent = true })
end
local tmap = function(keys, cmd)
vim.keymap.set("t", keys, cmd, { noremap = true, silent = true })
end
nmap("<leader>/", require("Comment.api").toggle.linewise.current) nmap("<leader>/", require("Comment.api").toggle.linewise.current)
vmap("<leader>/", "<ESC><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>") vmap("<leader>/", "<ESC><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>")
@ -32,28 +38,27 @@ nmap("<leader>e", vim.diagnostic.open_float)
-- START LSP -- START LSP
local null_ls = require("null-ls")
local formatting = null_ls.builtins.formatting
local cmp = require("cmp") local cmp = require("cmp")
local lspconfig = require("lspconfig") local lspconfig = require("lspconfig")
local servers = { local servers = {
tsserver = { tsserver = {
settings = { settings = {
completions = { completions = {
completeFunctionCalls = true completeFunctionCalls = true,
} },
} },
}, },
pylsp = {}, pylsp = {},
lua_ls = {}, lua_ls = {},
rnix = {}, rnix = {},
gopls = {} gopls = {},
tailwindcss = {},
} }
local cmp_capabilities = require("cmp_nvim_lsp").default_capabilities() local cmp_capabilities = require("cmp_nvim_lsp").default_capabilities()
local on_attach = function(client, bufnr) local on_attach = function(client, bufnr)
nmap("<leader>ca", vim.lsp.buf.code_action) nmap("<leader>ca", vim.lsp.buf.code_action)
nmap('<leader>lr', vim.lsp.buf.rename) nmap("<leader>lr", vim.lsp.buf.rename)
nmap('gd', vim.lsp.buf.definition) nmap("gd", vim.lsp.buf.definition)
nmap("<leader>l", function() nmap("<leader>l", function()
vim.lsp.buf.format() vim.lsp.buf.format()
end) end)
@ -81,20 +86,12 @@ for server, cfg in pairs(servers) do
}) })
end end
null_ls.setup({
sources = {
formatting.stylua,
formatting.black,
formatting.prettier
},
})
-- END LSP -- END LSP
require("Comment").setup() require("Comment").setup()
require("toggleterm").setup() require("toggleterm").setup()
require("autoclose").setup() require("autoclose").setup()
require('gitsigns').setup() require("gitsigns").setup()
require("nightfox").setup({ options = { transparent = true } }) require("nightfox").setup({ options = { transparent = true } })
vim.cmd.colorscheme("carbonfox") vim.cmd.colorscheme("carbonfox")

View File

@ -75,6 +75,7 @@
nodePackages_latest.prettier nodePackages_latest.prettier
nodePackages_latest.typescript nodePackages_latest.typescript
nodePackages_latest.typescript-language-server nodePackages_latest.typescript-language-server
nodePackages_latest."@tailwindcss/language-server"
python311Packages.python-lsp-black python311Packages.python-lsp-black
python311Packages.python-lsp-server python311Packages.python-lsp-server
ripgrep ripgrep
@ -89,7 +90,6 @@
comment-nvim comment-nvim
luasnip luasnip
nightfox-nvim nightfox-nvim
null-ls-nvim
nvim-cmp nvim-cmp
nvim-cmp nvim-cmp
nvim-lspconfig nvim-lspconfig