Merge branch 'dev' into mercury

nvim: fix sumneko_lua path
      remove unused Coq plugin
      fix Telescope mappings
      fix Telescope finders
This commit is contained in:
David JULIEN 2022-04-18 12:35:50 +02:00
commit c89affe871
3 changed files with 10 additions and 18 deletions

View File

@ -3,13 +3,11 @@
-- License : GPLv3
-- Description : sumneko (lua) config file for lsp
local system_name = "Linux"
-- set the path to the sumneko installation; if you previously installed via the now deprecated :LspInstall, use
local sumneko_root_path = vim.fn.stdpath("data") ..
"/lsp_servers/sumneko_lua/extension/server"
local sumneko_binary = sumneko_root_path .. "/bin/" .. system_name ..
"/lua-language-server"
local sumneko_binary = sumneko_root_path .. "/bin/" .. "/lua-language-server"
local runtime_path = vim.split(package.path, ';')
table.insert(runtime_path, "lua/?.lua")

View File

@ -20,9 +20,9 @@ utils.map("n", "<leader>lp", "<cmd>lua vim.diagnostic.goto_prev()<CR>")
utils.map("n", "<leader>lf", "<cmd>lua vim.lsp.buf.formatting()<CR>")
-- telescope
utils.map("n", "<leader>tf", "<cmd>Telescope find_files<CR>")
utils.map("n", "<leader>tb", "<cmd>Telescope file_browser<CR>")
utils.map("n", "<leader>tl", "<cmd>Telescope live_grep<CR>")
utils.map("n", "<leader>ff", "<cmd>Telescope find_files<CR>")
utils.map("n", "<leader>fb", "<cmd>Telescope buffers<CR>")
utils.map("n", "<leader>fl", "<cmd>Telescope live_grep<CR>")
-- colorscheme
utils.map("n", "<C-s>", "<cmd>lua require(\"astronomy\").toggle_variant()<CR>")

View File

@ -36,13 +36,13 @@ return require("packer").startup(function()
"nvim-telescope/telescope.nvim",
opt = true,
requires = {
{
"nvim-lua/popup.nvim",
opt = true
},
{
"nvim-lua/plenary.nvim",
opt = true
},
{'nvim-telescope/telescope-fzf-native.nvim',
opt = true,
run = 'make'
}
},
cmd = "Telescope"
@ -70,7 +70,8 @@ return require("packer").startup(function()
requires = {
{
"L3MON4D3/LuaSnip",
config = function() require("plugin.luasnip") end
config = function()
require("plugin.luasnip") end
},
"saadparwaiz1/cmp_luasnip",
"hrsh7th/cmp-nvim-lsp",
@ -101,11 +102,4 @@ return require("packer").startup(function()
"norcalli/nvim-colorizer.lua",
cmd = "ColorizerToggle"
}
-- ens
use {
"whonore/Coqtail",
ft = { "verilog" },
config = vim.cmd[[let g:coqtail_nomap = 1]]
}
end)