summaryrefslogtreecommitdiff
path: root/.config/nvim/lua
diff options
context:
space:
mode:
authorKyren223 <ulmliad223@gmail.com>2024-06-26 18:28:04 +0300
committerKyren223 <ulmliad223@gmail.com>2024-06-26 18:28:04 +0300
commit867c7192639ef90246a85a6ed2ae5e481b33ed98 (patch)
tree432af1ad487b244d196852994a0acf4e1e72e7be /.config/nvim/lua
parent0aeaf3bf942d01dd9b106fba9e70adfe9942024c (diff)
Modified nvim config
Diffstat (limited to '.config/nvim/lua')
-rw-r--r--.config/nvim/lua/options.lua26
-rw-r--r--.config/nvim/lua/plugins/lsp.lua47
-rw-r--r--.config/nvim/lua/plugins/neotree.lua2
3 files changed, 42 insertions, 33 deletions
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
index 4093897..f1efff1 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -3,6 +3,8 @@ vim.g.maplocalleader = " "
vim.g.have_nerd_font = true
+vim.opt.showmode = false
+
vim.opt.number = true
vim.opt.relativenumber = true
@@ -32,31 +34,13 @@ vim.opt.splitbelow = true
-- vim.opt.list = true
-- vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
+vim.opt.list = true
+vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
+
vim.opt.cursorline = true
vim.opt.scrolloff = 8
vim.opt.hlsearch = true
-vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
-
-vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
-vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
-vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
-vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
-
-vim.api.nvim_create_autocmd('TextYankPost', {
- desc = 'Highlight when yanking (copying) text',
- group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }),
- callback = function()
- vim.highlight.on_yank()
- end,
-})
-
-
-
-
-
-
-
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index beeaf0a..86da37a 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -30,18 +30,43 @@ return {
{
"neovim/nvim-lspconfig",
config = function()
+ local capabilities = require("cmp_nvim_lsp").default_capabilities()
+
local lspconfig = require("lspconfig")
- lspconfig.lua_ls.setup({})
- lspconfig.clangd.setup({})
- lspconfig.gradle_ls.setup({})
- lspconfig.jdtls.setup({})
- lspconfig.kotlin_language_server.setup({})
- lspconfig.pyright.setup({})
- lspconfig.rust_analyzer.setup({})
- lspconfig.taplo.setup({})
- lspconfig.bashls.setup({})
- lspconfig.lemminx.setup({})
- lspconfig.yamlls.setup({})
+ lspconfig.lua_ls.setup({
+ capabilities = capabilities
+ })
+
+ lspconfig.clangd.setup({
+ capabilities = capabilities
+ })
+ lspconfig.gradle_ls.setup({
+ capabilities = capabilities
+ })
+ lspconfig.jdtls.setup({
+ capabilities = capabilities
+ })
+ lspconfig.kotlin_language_server.setup({
+ capabilities = capabilities
+ })
+ lspconfig.pyright.setup({
+ capabilities = capabilities
+ })
+ lspconfig.rust_analyzer.setup({
+ capabilities = capabilities
+ })
+ lspconfig.taplo.setup({
+ capabilities = capabilities
+ })
+ lspconfig.bashls.setup({
+ capabilities = capabilities
+ })
+ lspconfig.lemminx.setup({
+ capabilities = capabilities
+ })
+ lspconfig.yamlls.setup({
+ capabilities = capabilities
+ })
vim.keymap.set('n', 'gh', vim.lsp.buf.hover, { desc = "[G]oto [H]over" })
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = "[G]oto [D]efinition" })
diff --git a/.config/nvim/lua/plugins/neotree.lua b/.config/nvim/lua/plugins/neotree.lua
index 50a7b5c..d55218d 100644
--- a/.config/nvim/lua/plugins/neotree.lua
+++ b/.config/nvim/lua/plugins/neotree.lua
@@ -3,7 +3,7 @@ return {
branch = "v3.x",
dependencies = {
"nvim-lua/plenary.nvim",
- "nvim-tree/nvim-web-devicons",
+ "nvim-tree/nvim-web-devicons",
"MunifTanjim/nui.nvim",
},
config = function()