1
0
Fork 0

Add new plugins and refactor

This commit is contained in:
CRy386i 2025-06-28 19:20:31 +03:00
parent 885eb0dd8b
commit ff494a0caa
2 changed files with 37 additions and 41 deletions

View file

@ -33,11 +33,27 @@ require('lazy').setup({
},
{
"folke/tokyonight.nvim",
lazy = true,
-- config = function()
-- -- load the colorscheme here
-- vim.cmd([[colorscheme tokyonight]])
-- end,
lazy = true
},
{
"folke/which-key.nvim",
event = "VeryLazy",
opts = {
preset = "modern",
icons = {
mappings = false,
rules = false
}
},
keys = {
{
"<leader>?",
function()
require("which-key").show({ global = false })
end,
desc = "Buffer Local Keymaps (which-key)",
},
},
},
{ 'nvim-telescope/telescope-fzf-native.nvim',
build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build'
@ -49,8 +65,6 @@ require('lazy').setup({
local telescope = require('telescope')
telescope.setup{
-- defaults = {
-- }
extensions = {
fzf = {
fuzzy = true, -- false will only do exact matching
@ -61,23 +75,24 @@ require('lazy').setup({
}
}
}
--telescope.load_extension('fzy')
telescope.load_extension('fzf')
local wk = require("which-key")
local builtin = require('telescope.builtin')
vim.keymap.set('n', '<C-p>', builtin.find_files, {})
vim.keymap.set('n', '<leader>ft', builtin.treesitter, {})
vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
wk.add({
{ '<C-p>', builtin.find_files, desc = "Find file", mode = "n" },
{ '<leader>ft', builtin.treesitter, desc = "Treesitter symbol", mode = "n" },
{ '<leader>fg', builtin.live_grep, desc = "Live grep", mode = "n" },
{ '<leader>fb', builtin.buffers, desc = "Search in buffers", mode = "n" },
{ '<leader>fh', builtin.help_tags, desc = "Help search", mode = "n" }
})
end
},
{ "nvim-treesitter/nvim-treesitter",
build = ":TSUpdate",
config = function()
require("nvim-treesitter.configs").setup {
ensure_installed = { "c", "cpp", "pascal", "lua", "glsl", "yaml" },
ensure_installed = { "c", "cpp", "lua" },
highlight = { enable = true, }
}
end
@ -86,16 +101,19 @@ require('lazy').setup({
'neovim/nvim-lspconfig',
config = function()
-- Setup language servers.
local wk = require("which-key")
local lspconfig = require('lspconfig')
--lspconfig.clangd.setup {}
--lspconfig.neocmake.setup {}
-- Global mappings.
-- See `:help vim.diagnostic.*` for documentation on any of the below functions
vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
wk.add({
{ '<space>e', vim.diagnostic.open_float, desc = "Open diagnostic window", mode = "n" },
{ '[d', vim.diagnostic.goto_prev, desc = "Previous diagnostic", mode = "n" },
{ ']d', vim.diagnostic.goto_next, desc = "Next diagnostic", mode = "n" },
{ '<space>q', vim.diagnostic.setloclist, desc = "Add buffer diagnostics to the location list", mode = "n" }
})
-- Use LspAttach autocommand to only map the following keys
-- after the language server attaches to the current buffer