diff --git a/init.lua b/init.lua index c0efb33c..abfa24be 100644 --- a/init.lua +++ b/init.lua @@ -86,7 +86,7 @@ require('lazy').setup({ -- Useful status updates for LSP -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - { 'j-hui/fidget.nvim', tag = 'legacy', opts = {} }, + { 'j-hui/fidget.nvim', tag = 'legacy', opts = {} }, -- Additional lua configuration, makes nvim stuff amazing! 'folke/neodev.nvim', @@ -110,7 +110,7 @@ require('lazy').setup({ }, -- Useful plugin to show you pending keybinds. - { 'folke/which-key.nvim', opts = {} }, + { 'folke/which-key.nvim', opts = {} }, { -- Adds git related signs to the gutter, as well as utilities for managing changes 'lewis6991/gitsigns.nvim', @@ -128,16 +128,16 @@ require('lazy').setup({ -- don't override the built-in and fugitive keymaps local gs = package.loaded.gitsigns - vim.keymap.set({'n', 'v'}, ']c', function() + vim.keymap.set({ 'n', 'v' }, ']c', function() if vim.wo.diff then return ']c' end vim.schedule(function() gs.next_hunk() end) return '' - end, {expr=true, buffer = bufnr, desc = "Jump to next hunk"}) - vim.keymap.set({'n', 'v'}, '[c', function() + end, { expr = true, buffer = bufnr, desc = "Jump to next hunk" }) + vim.keymap.set({ 'n', 'v' }, '[c', function() if vim.wo.diff then return '[c' end vim.schedule(function() gs.prev_hunk() end) return '' - end, {expr=true, buffer = bufnr, desc = "Jump to previous hunk"}) + end, { expr = true, buffer = bufnr, desc = "Jump to previous hunk" }) end, }, }, @@ -147,7 +147,7 @@ require('lazy').setup({ 'navarasu/onedark.nvim', priority = 1000, config = function() - require('onedark').setup { + require('onedark').setup { transparent = true } vim.cmd.colorscheme 'onedark' @@ -458,7 +458,7 @@ local servers = { -- html = { filetypes = { 'html', 'twig', 'hbs'} }, -- requirement for https://github.com/olrtg/nvim-emmet - emmet_language_server = {}, + emmet_language_server = {}, lua_ls = { Lua = { @@ -555,9 +555,9 @@ vim.opt.relativenumber = true vim.opt.guicursor = "" -- 4 tab indenting -vim.opt.tabstop = 4 -vim.opt.softtabstop = 4 -vim.opt.shiftwidth = 4 +vim.opt.tabstop = 2 +vim.opt.softtabstop = 2 +vim.opt.shiftwidth = 2 vim.opt.expandtab = true -- move line up/down diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 1f1ec3b4..d49b9cf5 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -7,5 +7,8 @@ return { 'ThePrimeagen/vim-be-good', --"surroundings": parentheses, brackets, quotes, XML tags, and more - 'tpope/vim-surround', + 'tpope/vim-surround', + + --wrapper around Neovims native LSP formatting + "lukas-reineke/lsp-format.nvim", }