diff options
| -rw-r--r-- | .config/nvim/init.lua | 2 | ||||
| -rw-r--r-- | .config/nvim/lazy-lock.json | 9 | ||||
| -rw-r--r-- | .config/nvim/lua/options.lua | 26 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/lsp.lua | 47 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/neotree.lua | 2 |
5 files changed, 53 insertions, 33 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 754c885..c5e7d9b 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -13,6 +13,8 @@ end vim.opt.rtp:prepend(lazypath) require("options") +require("keymaps") +require("autocmds") require("lazy").setup("plugins") diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 031a501..a28dd3e 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,13 +1,22 @@ { + "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "catppuccin": { "branch": "main", "commit": "c0bea773a09e49e123136b099bce9ddc1bf395d2" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, + "indent-blankline.nvim": { "branch": "master", "commit": "4288ce8128a52650e401dda42fd7651a6038f262" }, "lazy.nvim": { "branch": "main", "commit": "c501b429cf995c645454539b924aaefae45bb9eb" }, + "lazydev.nvim": { "branch": "main", "commit": "6184ebbbc8045d70077659b7d30c705a588dc62f" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "none-ls.nvim": { "branch": "main", "commit": "cc0a3c45047e3daf85d07c1571d65476cfce6480" }, "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, + "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, + "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, "nvim-lspconfig": { "branch": "master", "commit": "bd7c76375a511994c9ca8d69441f134dc10ae3bd" }, "nvim-treesitter": { "branch": "master", "commit": "2e9c346aefda680bd14ebf40a50c2897fd637bc2" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, 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() |