stuff
This commit is contained in:
RingOfStorms (Joshua Bell)
parent
66c32e98f5
commit
01eb2153e8
11 changed files with 41 additions and 237 deletions
|
|
@ -32,3 +32,10 @@ vim.api.nvim_create_autocmd("BufRead", {
|
|||
vim.cmd.CccHighlighterEnable()
|
||||
end,
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd('BufEnter', {
|
||||
callback = function ()
|
||||
local ts_avail, parsers = pcall(require, "nvim-treesitter.parsers")
|
||||
if ts_avail and parsers.has_parser() then vim.cmd.TSBufEnable "highlight" end
|
||||
end,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ vim.g.mapleader = " "
|
|||
|
||||
require('util').keymaps({
|
||||
n = {
|
||||
[";"] = { ":", desc = "No shift command mode" },
|
||||
["n"] = { "nzzzv", desc = "Next search result centered" },
|
||||
["N"] = { "Nzzzv", desc = "Previous search result centered" },
|
||||
["<esc>"] = { ":noh<CR><esc>", desc = "Clear search on escape" },
|
||||
|
|
@ -67,6 +68,9 @@ require('util').keymaps({
|
|||
["<leader>p"] = { '"_dP', desc = "Paste w/o copying replaced content" },
|
||||
["<C-r"] = {'"hy:%s/<C-r>h//g<left><left>', desc = "Replace current selection"},
|
||||
},
|
||||
t = {
|
||||
["<Esc>"] = { "<C-\\><C-n>", desc = "Escape the terminal" },
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -128,7 +128,6 @@ return {
|
|||
}
|
||||
|
||||
config.lua_ls.setup(lsp.nvim_lua_ls())
|
||||
config.stylua.setup(default {})
|
||||
|
||||
config.rust_analyzer.setup(default {})
|
||||
|
||||
|
|
@ -137,13 +136,14 @@ return {
|
|||
})
|
||||
config.html.setup(default {})
|
||||
config.eslint.setup(default {})
|
||||
config.deno.setup(default {})
|
||||
config.cssls.setup(default {})
|
||||
config.cssmodules_ls.setup(default {})
|
||||
config.prettier.setup(default {})
|
||||
|
||||
config.pyright.setup(default {})
|
||||
|
||||
config.dockerls.setup(default {})
|
||||
config.docker_compose_language_service.setup(default {})
|
||||
|
||||
lsp.setup()
|
||||
|
||||
local cmp = require("cmp")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,12 @@
|
|||
local test = function ()
|
||||
return "test 123"
|
||||
end
|
||||
|
||||
return {
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = {
|
||||
"RingOfStorms/lualine-lsp-progress",
|
||||
},
|
||||
opts = {
|
||||
options = {
|
||||
theme = "codedark",
|
||||
|
|
@ -9,10 +16,10 @@ return {
|
|||
sections = {
|
||||
lualine_a = {'mode'},
|
||||
lualine_b = {'branch', 'diff', 'diagnostics'},
|
||||
lualine_c = {'filename'},
|
||||
lualine_c = {'filename', "lsp_progress", test},
|
||||
lualine_x = {'encoding', 'filetype', 'filesize'},
|
||||
lualine_y = {'searchcount', 'selectioncount'},
|
||||
lualine_z = {'location'},
|
||||
},
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ return {
|
|||
null_ls.builtins.formatting.prettier,
|
||||
null_ls.builtins.formatting.stylua,
|
||||
null_ls.builtins.formatting.rustfmt,
|
||||
null_ls.builtins.formatting.python,
|
||||
-- null_ls.builtins.formatting.python,
|
||||
-- null_ls.builtins.code_actions.proselint, -- TODO looks interesting
|
||||
null_ls.builtins.code_actions.cspell.with {
|
||||
config = {
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ return {
|
|||
"TSUpdateSync",
|
||||
},
|
||||
opts = {
|
||||
-- "all",
|
||||
-- ensure_installed = 'all',
|
||||
ensure_installed = {
|
||||
"lua",
|
||||
"http",
|
||||
|
|
@ -58,9 +58,10 @@ return {
|
|||
"vue",
|
||||
"yaml",
|
||||
},
|
||||
auto_install = true,
|
||||
auto_install = false,
|
||||
highlight = {
|
||||
enable = true,
|
||||
use_languagetree = true,
|
||||
-- disable = function(_, bufnr) return vim.api.nvim_buf_line_count(bufnr) > 10000 end,
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
|
|
@ -74,4 +75,7 @@ return {
|
|||
max_file_lines = nil,
|
||||
},
|
||||
},
|
||||
"nvim-treesitter/playground",
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
return {
|
||||
{
|
||||
"hrsh7th/nvim-cmp",
|
||||
dependencies = {
|
||||
{
|
||||
"hrsh7th/cmp-cmdline",
|
||||
},
|
||||
{
|
||||
"hrsh7th/cmp-path",
|
||||
},
|
||||
{
|
||||
"hrsh7th/cmp-buffer",
|
||||
},
|
||||
{
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
},
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
@ -1,115 +0,0 @@
|
|||
-- npm install -g cspell@latest
|
||||
|
||||
local output = vim.fn.system {
|
||||
"which",
|
||||
"cspell",
|
||||
}
|
||||
if output == nil or output == "" then
|
||||
-- if v:shell_error != 0 then
|
||||
vim.fn.system {
|
||||
"npm",
|
||||
"install",
|
||||
"-g",
|
||||
"cspell@latest",
|
||||
}
|
||||
end
|
||||
|
||||
return {
|
||||
{
|
||||
-- universal JSON schema store, where schemas for popular JSON documents can be found.
|
||||
"b0o/SchemaStore.nvim",
|
||||
commit = "15f37630d3abfb98607dd8e4625b731a8558b96d",
|
||||
},
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
commit = "1c13e529bd5683b54a39b633a560d2f00fcb25af",
|
||||
dependencies = {
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
}
|
||||
},
|
||||
-- NULL LS
|
||||
{
|
||||
"jose-elias-alvarez/null-ls.nvim",
|
||||
commit = "77e53bc3bac34cc273be8ed9eb9ab78bcf67fa48",
|
||||
opts = function(_, config)
|
||||
-- config variable is the default definitions table for the setup function call
|
||||
local null_ls = require "null-ls"
|
||||
|
||||
-- Check supported formatters and linters
|
||||
-- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting
|
||||
-- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
|
||||
config.sources = {
|
||||
-- Set a formatter
|
||||
null_ls.builtins.formatting.stylua,
|
||||
null_ls.builtins.formatting.prettier,
|
||||
null_ls.builtins.formatting.rustfmt,
|
||||
-- null_ls.builtins.code_actions.proselint, -- TODO looks interesting
|
||||
null_ls.builtins.code_actions.cspell.with {
|
||||
config = {
|
||||
find_json = function() return vim.fn.findfile("cspell.json", vim.fn.environ().HOME .. "/.config/nvim/lua/user/;") end,
|
||||
},
|
||||
},
|
||||
null_ls.builtins.diagnostics.cspell.with {
|
||||
extra_args = { "--config", "~/.config/nvim/lua/user/cspell.json" },
|
||||
},
|
||||
}
|
||||
|
||||
config.update_in_insert = true
|
||||
|
||||
return config -- return final config table
|
||||
end,
|
||||
},
|
||||
-- MASON
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
build = ":MasonUpdate", -- :MasonUpdate updates registry contents
|
||||
commit = "08b2fd308e0107eab9f0b59d570b69089fd0b522",
|
||||
cmd = {
|
||||
"Mason",
|
||||
"MasonInstall",
|
||||
"MasonUninstall",
|
||||
"MasonUninstallAll",
|
||||
"MasonLog",
|
||||
},
|
||||
opts = {}
|
||||
},
|
||||
{
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
dependencies = {
|
||||
"williamboman/mason.nvim",
|
||||
},
|
||||
commit = "c55d18f3947562e699d34d89681edbf9f0e250d3",
|
||||
cmd = { "LspInstall", "LspUninstall" },
|
||||
opts = {
|
||||
ensure_installed = { "lua_ls", "rust_analyzer", "tsserver", "pyright", "cssls", "cssmodules_ls" },
|
||||
},
|
||||
},
|
||||
{
|
||||
"jay-babu/mason-null-ls.nvim",
|
||||
commit = "54d702020bf94e4eefd357f0b738317af30217eb",
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
dependencies = {
|
||||
"williamboman/mason.nvim",
|
||||
"jose-elias-alvarez/null-ls.nvim",
|
||||
},
|
||||
opts = {
|
||||
ensure_installed = { "prettier", "stylua", "black", "rust_fmt" },
|
||||
},
|
||||
},
|
||||
{
|
||||
"jay-babu/mason-nvim-dap.nvim",
|
||||
commit = "c836e511e796d2b6a25ad9f164f5b25d8b9ff705",
|
||||
dependencies = {
|
||||
"williamboman/mason.nvim",
|
||||
"mfussenegger/nvim-dap",
|
||||
},
|
||||
opts = {
|
||||
ensure_installed = { "codelldb" },
|
||||
},
|
||||
},
|
||||
mappings = {
|
||||
n = {
|
||||
["<leader>l"] = { desc = " LSP" },
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
return {
|
||||
"folke/noice.nvim",
|
||||
commit = "f5178da0097e964b37951a0ebc078fdcc14280f3",
|
||||
dependencies = {
|
||||
"MunifTanjim/nui.nvim",
|
||||
"rcarriga/nvim-notify",
|
||||
},
|
||||
event = "VeryLazy"
|
||||
}
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
return {
|
||||
{
|
||||
-- Mason: install and manage LSP servers, DAP servers, linters, and formatters
|
||||
"williamboman/mason.nvim",
|
||||
build = ":MasonUpdate", -- :MasonUpdate updates registry contents
|
||||
},
|
||||
{
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
opts = {
|
||||
-- Available servers: https://github.com/williamboman/mason-lspconfig.nvim#available-lsp-servers
|
||||
ensure_installed = {
|
||||
'lua_ls',
|
||||
'rust_analyzer',
|
||||
'tsserver',
|
||||
"eslint",
|
||||
'cssls',
|
||||
'cssmodules_ls',
|
||||
'pyright',
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
config = function(_, opts)
|
||||
local c = require 'lspconfig'
|
||||
local u = require "lspconfig/util"
|
||||
|
||||
c.lua_ls.setup {
|
||||
workspace = {
|
||||
library = {
|
||||
[vim.fn.expand "$VIMRUNTIME/lua"] = true,
|
||||
[vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true,
|
||||
[vim.fn.stdpath "data" .. "/lazy/lazy.nvim/lua/lazy"] = true,
|
||||
},
|
||||
},
|
||||
settings = {
|
||||
Lua = {
|
||||
diagnostics = {
|
||||
globals = { "vim" }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
c.rust_analyzer.setup {
|
||||
on_attach = function() end,
|
||||
capabilities = {},
|
||||
filetypes = { "rust" },
|
||||
root_dir = u.root_pattern("Cargo.toml"),
|
||||
settings = {
|
||||
["rust-analyzer"] = {
|
||||
cargo = {
|
||||
allFeatures = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
c.tsserver.setup {
|
||||
|
||||
}
|
||||
|
||||
c.eslint.setup {
|
||||
|
||||
}
|
||||
|
||||
c.cssls.setup {}
|
||||
|
||||
c.cssmodules_ls.setup {}
|
||||
|
||||
c.pyright.setup {}
|
||||
end
|
||||
},
|
||||
}
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue