From caa5c2414680f76586b27a19df9d8fbcdf65c27f Mon Sep 17 00:00:00 2001 From: araison Date: Sun, 14 Jan 2024 00:19:31 +0100 Subject: [PATCH] Updating neovim configuration --- nvim/lua/plugins/autoclose.lua | 6 +-- nvim/lua/plugins/comment.lua | 90 ++++++++++++++++----------------- nvim/lua/plugins/lsp-config.lua | 66 ++++++++++++------------ nvim/lua/plugins/lualine.lua | 9 ++-- nvim/lua/plugins/neotree.lua | 22 ++++---- nvim/lua/plugins/none-ls.lua | 24 ++++----- nvim/lua/plugins/telescope.lua | 17 ++++--- nvim/lua/plugins/vimtex.lua | 14 ++--- nvim/lua/vim-options.lua | 2 - 9 files changed, 123 insertions(+), 127 deletions(-) diff --git a/nvim/lua/plugins/autoclose.lua b/nvim/lua/plugins/autoclose.lua index 3a794db..55ba8bf 100644 --- a/nvim/lua/plugins/autoclose.lua +++ b/nvim/lua/plugins/autoclose.lua @@ -1,5 +1,5 @@ return { - 'windwp/nvim-autopairs', - event = "InsertEnter", - opts = {} -- this is equalent to setup({}) function + "windwp/nvim-autopairs", + event = "InsertEnter", + opts = {}, -- this is equalent to setup({}) function } diff --git a/nvim/lua/plugins/comment.lua b/nvim/lua/plugins/comment.lua index d238339..883a380 100644 --- a/nvim/lua/plugins/comment.lua +++ b/nvim/lua/plugins/comment.lua @@ -1,47 +1,47 @@ return { - "numToStr/Comment.nvim", - opts = { - ---Add a space b/w comment and the line - padding = true, - ---Whether the cursor should stay at its position - sticky = true, - ---Lines to be ignored while (un)comment - ignore = nil, - ---LHS of toggle mappings in NORMAL mode - toggler = { - ---Line-comment toggle keymap - line = "gcc", - ---Block-comment toggle keymap - block = "gcc", - }, - ---LHS of operator-pending mappings in NORMAL and VISUAL mode - opleader = { - ---Line-comment keymap - line = "gc", - ---Block-comment keymap - block = "gb", - }, - ---LHS of extra mappings - extra = { - ---Add comment on the line above - above = "gcO", - ---Add comment on the line below - below = "gco", - ---Add comment at the end of line - eol = "gcA", - }, - ---Enable keybindings - ---NOTE: If given `false` then the plugin won't create any mappings - mappings = { - ---Operator-pending mapping; `gcc` `gbc` `gc[count]{motion}` `gb[count]{motion}` - basic = true, - ---Extra mapping; `gco`, `gcO`, `gcA` - extra = true, - }, - ---Function to call before (un)comment - pre_hook = nil, - ---Function to call after (un)comment - post_hook = nil, - }, - lazy = false, + "numToStr/Comment.nvim", + opts = { + ---Add a space b/w comment and the line + padding = true, + ---Whether the cursor should stay at its position + sticky = true, + ---Lines to be ignored while (un)comment + ignore = nil, + ---LHS of toggle mappings in NORMAL mode + toggler = { + ---Line-comment toggle keymap + line = "gcc", + ---Block-comment toggle keymap + block = "gcc", + }, + ---LHS of operator-pending mappings in NORMAL and VISUAL mode + opleader = { + ---Line-comment keymap + line = "gc", + ---Block-comment keymap + block = "gb", + }, + ---LHS of extra mappings + extra = { + ---Add comment on the line above + above = "gcO", + ---Add comment on the line below + below = "gco", + ---Add comment at the end of line + eol = "gcA", + }, + ---Enable keybindings + ---NOTE: If given `false` then the plugin won't create any mappings + mappings = { + ---Operator-pending mapping; `gcc` `gbc` `gc[count]{motion}` `gb[count]{motion}` + basic = true, + ---Extra mapping; `gco`, `gcO`, `gcA` + extra = true, + }, + ---Function to call before (un)comment + pre_hook = nil, + ---Function to call after (un)comment + post_hook = nil, + }, + lazy = false, } diff --git a/nvim/lua/plugins/lsp-config.lua b/nvim/lua/plugins/lsp-config.lua index ab81764..4be553b 100644 --- a/nvim/lua/plugins/lsp-config.lua +++ b/nvim/lua/plugins/lsp-config.lua @@ -1,35 +1,35 @@ return { - { - "williamboman/mason.nvim", - config = function() - require("mason").setup() - end, - }, - { - "williamboman/mason-lspconfig.nvim", - config = function() - require("mason-lspconfig").setup({ - ensure_installed = { "lua_ls", "texlab", "clangd", "pylsp" }, - }) - end, - }, - { - "neovim/nvim-lspconfig", - config = function() - local lspconfig = require("lspconfig") - local capabilities = require("cmp_nvim_lsp").default_capabilities() - lspconfig.lua_ls.setup({ - capabilities = capabilities, - }) - lspconfig.texlab.setup({ - capabilities = capabilities, - }) - lspconfig.clangd.setup({ - capabilities = capabilities, - }) - lspconfig.pylsp.setup({ - capabilities = capabilities, - }) - end, - }, + { + "williamboman/mason.nvim", + config = function() + require("mason").setup() + end, + }, + { + "williamboman/mason-lspconfig.nvim", + config = function() + require("mason-lspconfig").setup({ + ensure_installed = { "lua_ls", "texlab", "clangd", "pylsp" }, + }) + end, + }, + { + "neovim/nvim-lspconfig", + config = function() + local lspconfig = require("lspconfig") + local capabilities = require("cmp_nvim_lsp").default_capabilities() + lspconfig.lua_ls.setup({ + capabilities = capabilities, + }) + lspconfig.texlab.setup({ + capabilities = capabilities, + }) + lspconfig.clangd.setup({ + capabilities = capabilities, + }) + lspconfig.pylsp.setup({ + capabilities = capabilities, + }) + end, + }, } diff --git a/nvim/lua/plugins/lualine.lua b/nvim/lua/plugins/lualine.lua index 9d7441b..ddba7ec 100644 --- a/nvim/lua/plugins/lualine.lua +++ b/nvim/lua/plugins/lualine.lua @@ -1,8 +1,7 @@ return { - 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, + "nvim-lualine/lualine.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, config = function() - require('lualine').setup() - end + require("lualine").setup() + end, } - diff --git a/nvim/lua/plugins/neotree.lua b/nvim/lua/plugins/neotree.lua index 1d15c2f..fbb4006 100644 --- a/nvim/lua/plugins/neotree.lua +++ b/nvim/lua/plugins/neotree.lua @@ -1,14 +1,12 @@ -return { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", - }, +return { + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, config = function() - vim.keymap.set("n", 'n',":Neotree toggle",{}) - end + vim.keymap.set("n", "n", ":Neotree toggle", {}) + end, } - - diff --git a/nvim/lua/plugins/none-ls.lua b/nvim/lua/plugins/none-ls.lua index a6b3f61..2134d21 100644 --- a/nvim/lua/plugins/none-ls.lua +++ b/nvim/lua/plugins/none-ls.lua @@ -1,14 +1,14 @@ return { - "nvimtools/none-ls.nvim", - config = function() - local null_ls = require("null-ls") - null_ls.setup({ - sources = { - null_ls.builtins.formatting.stylua, - null_ls.builtins.formatting.black, - null_ls.builtins.formatting.isort, - }, - }) - vim.keymap.set("n", "gf", vim.lsp.buf.format, {}) - end, + "nvimtools/none-ls.nvim", + config = function() + local null_ls = require("null-ls") + null_ls.setup({ + sources = { + null_ls.builtins.formatting.stylua, + null_ls.builtins.formatting.black, + null_ls.builtins.formatting.isort, + }, + }) + vim.keymap.set("n", "gf", vim.lsp.buf.format, {}) + end, } diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index c414967..fb09978 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -1,9 +1,10 @@ return { - 'nvim-telescope/telescope.nvim', tag = '0.1.5', - dependencies = { 'nvim-lua/plenary.nvim' }, - config= function() - local builtin = require("telescope.builtin") - vim.keymap.set("n", '',builtin.find_files,{}) - vim.keymap.set("n", 'fg',builtin.live_grep,{}) - end - } + "nvim-telescope/telescope.nvim", + tag = "0.1.5", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + local builtin = require("telescope.builtin") + vim.keymap.set("n", "", builtin.find_files, {}) + vim.keymap.set("n", "fg", builtin.live_grep, {}) + end, +} diff --git a/nvim/lua/plugins/vimtex.lua b/nvim/lua/plugins/vimtex.lua index 7194730..f322f82 100644 --- a/nvim/lua/plugins/vimtex.lua +++ b/nvim/lua/plugins/vimtex.lua @@ -1,9 +1,9 @@ return { - "lervag/vimtex", - config = function() - vim.g.vimtex_view_general_viewer = 'zathura' - vim.g.vimtex_view_automatic = 1 - vim.keymap.set('n','ll',':VimtexCompile') - vim.keymap.set('n','lv',':VimtexView') - end + "lervag/vimtex", + config = function() + vim.g.vimtex_view_general_viewer = "zathura" + vim.g.vimtex_view_automatic = 1 + vim.keymap.set("n", "ll", ":VimtexCompile") + vim.keymap.set("n", "lv", ":VimtexView") + end, } diff --git a/nvim/lua/vim-options.lua b/nvim/lua/vim-options.lua index 1b1c7e2..96ea9cd 100644 --- a/nvim/lua/vim-options.lua +++ b/nvim/lua/vim-options.lua @@ -3,5 +3,3 @@ vim.cmd("set tabstop=2") vim.cmd("set softtabstop=2") vim.cmd("set shiftwidth=2") vim.g.mapleader = " " - -