From e3896e07385cbc1327dcd23e1e28ca17f710b709 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Wed, 26 Jun 2024 19:54:00 +0300 Subject: Accidentally placed the nvim files in the wrong place, fixed now --- .config/nvim/lua/autocmds.lua | 7 ++++ .config/nvim/lua/keymaps.lua | 15 ++++++++ .config/nvim/lua/plugins/autopair.lua | 5 +++ .config/nvim/lua/plugins/completions.lua | 50 +++++++++++++++++++++++++++ .config/nvim/lua/plugins/indent-blankline.lua | 8 +++++ .config/nvim/lua/plugins/lazydev.lua | 13 +++++++ .config/nvim/lua/plugins/lsp.lua | 47 ++++++------------------- .config/nvim/lua/plugins/neotree.lua | 2 +- 8 files changed, 110 insertions(+), 37 deletions(-) create mode 100644 .config/nvim/lua/autocmds.lua create mode 100644 .config/nvim/lua/keymaps.lua create mode 100644 .config/nvim/lua/plugins/autopair.lua create mode 100644 .config/nvim/lua/plugins/completions.lua create mode 100644 .config/nvim/lua/plugins/indent-blankline.lua create mode 100644 .config/nvim/lua/plugins/lazydev.lua (limited to '.config/nvim/lua') diff --git a/.config/nvim/lua/autocmds.lua b/.config/nvim/lua/autocmds.lua new file mode 100644 index 0000000..a9a4d7b --- /dev/null +++ b/.config/nvim/lua/autocmds.lua @@ -0,0 +1,7 @@ +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/keymaps.lua b/.config/nvim/lua/keymaps.lua new file mode 100644 index 0000000..c043fc7 --- /dev/null +++ b/.config/nvim/lua/keymaps.lua @@ -0,0 +1,15 @@ +vim.keymap.set('n', '', 'nohlsearch') + +vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) + + + + + + + + + diff --git a/.config/nvim/lua/plugins/autopair.lua b/.config/nvim/lua/plugins/autopair.lua new file mode 100644 index 0000000..c51bf19 --- /dev/null +++ b/.config/nvim/lua/plugins/autopair.lua @@ -0,0 +1,5 @@ +return { + 'windwp/nvim-autopairs', + event = 'InsertEnter', + config = true, +} diff --git a/.config/nvim/lua/plugins/completions.lua b/.config/nvim/lua/plugins/completions.lua new file mode 100644 index 0000000..51b7a78 --- /dev/null +++ b/.config/nvim/lua/plugins/completions.lua @@ -0,0 +1,50 @@ +return { + { + "hrsh7th/cmp-nvim-lsp" + }, + { + "L3MON4D3/LuaSnip", + dependencies = { + "saadparwaiz1/cmp_luasnip", + "rafamadriz/friendly-snippets" + } + }, + { + "hrsh7th/nvim-cmp", + opts = function(_, opts) + -- Setup options for lazydev.nvim + opts.sources = opts.sources or {} + table.insert(opts.sources, { + name = "lazydev", + group_index = 0, + }) + end, + config = function() + local cmp = require("cmp") + require("luasnip.loaders.from_vscode").lazy_load() + + cmp.setup({ + snippet = { + expand = function(args) + require("luasnip").lsp_expand(args.body) + end + }, + window = { + completion = cmp.config.window.bordered(), + documentation = cmp.config.window.bordered(), + }, + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.abort(), + [""] = cmp.mapping.confirm({ select = true}), + }), + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + { name = "luasnip" }, + }, { { name = "buffer"} }) + }) + end + } +} diff --git a/.config/nvim/lua/plugins/indent-blankline.lua b/.config/nvim/lua/plugins/indent-blankline.lua new file mode 100644 index 0000000..aec0a40 --- /dev/null +++ b/.config/nvim/lua/plugins/indent-blankline.lua @@ -0,0 +1,8 @@ +return { + "lukas-reineke/indent-blankline.nvim", + main = "ibl", + opts = {}, + config = function () + require("ibl").setup() + end +} diff --git a/.config/nvim/lua/plugins/lazydev.lua b/.config/nvim/lua/plugins/lazydev.lua new file mode 100644 index 0000000..a073d8d --- /dev/null +++ b/.config/nvim/lua/plugins/lazydev.lua @@ -0,0 +1,13 @@ +return { + { + "folke/lazydev.nvim", + ft = "lua", + opts = { + library = { + { path = "luvit-meta/library", words = { "vim%.uv" } }, + }, + }, + }, + { "Bilal2453/luvit-meta", lazy = true }, + "hrsh7th/nvim-cmp", +} diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index 86da37a..beeaf0a 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -30,43 +30,18 @@ return { { "neovim/nvim-lspconfig", config = function() - local capabilities = require("cmp_nvim_lsp").default_capabilities() - local lspconfig = require("lspconfig") - 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 - }) + 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({}) 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 d55218d..50a7b5c 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() -- cgit v1.3.1