diff --git a/nvim/after/lsp/yamlls.lua b/nvim/after/lsp/yamlls.lua index 877c271..1dc6923 100644 --- a/nvim/after/lsp/yamlls.lua +++ b/nvim/after/lsp/yamlls.lua @@ -10,24 +10,24 @@ return { redhat = { telemetry = { enabled = false } }, yaml = { customTags = { - "!fn", - "!And", - "!If", - "!Not", - "!Equals", - "!Or", - "!FindInMap sequence", - "!Base64", - "!Cidr", - "!Ref", - "!Ref Scalar", - "!Sub", - "!GetAtt", - "!GetAZs", - "!ImportValue", - "!Select", - "!Split", - "!Join sequence" + '!fn', + '!And', + '!If', + '!Not', + '!Equals', + '!Or', + '!FindInMap sequence', + '!Base64', + '!Cidr', + '!Ref', + '!Ref Scalar', + '!Sub', + '!GetAtt', + '!GetAZs', + '!ImportValue', + '!Select', + '!Split', + '!Join sequence' }, format = { enable = true, singleQuote = true }, hover = true, diff --git a/nvim/lua/plugins/language_support.lua b/nvim/lua/plugins/language_support.lua index 65dabbb..28a7e9c 100644 --- a/nvim/lua/plugins/language_support.lua +++ b/nvim/lua/plugins/language_support.lua @@ -1,5 +1,5 @@ -- Treesitter -local rocks_path = os.getenv('HOME') .. "/.luarocks/lib/luarocks/rocks-5.1" +local rocks_path = os.getenv('HOME') .. '/.luarocks/lib/luarocks/rocks-5.1' -- Pick up the installed parsers in the install dir for _, parser_dir in ipairs(vim.fn.glob(rocks_path .. '/tree-sitter-*/*/', true, true)) do @@ -7,7 +7,7 @@ for _, parser_dir in ipairs(vim.fn.glob(rocks_path .. '/tree-sitter-*/*/', true, end -- Start treesitter parsing on the current buffer -vim.api.nvim_create_autocmd("FileType", { +vim.api.nvim_create_autocmd('FileType', { callback = function(ev) pcall(vim.treesitter.start, ev.buf) end @@ -16,7 +16,7 @@ vim.api.nvim_create_autocmd("FileType", { vim.diagnostic.config({ underline = true, virtual_text = { - prefix = "●", + prefix = '●', source = true, }, severity_sort = true, @@ -33,18 +33,18 @@ vim.api.nvim_create_autocmd('LspAttach', { local bufopts = { noremap = true, silent = true, buffer = bufnr } vim.keymap.set('i', '', vim.lsp.completion.get, bufopts) - vim.keymap.set('n', '', function() vim.diagnostic.jump({ count = -1, float = true }) end, bufopts) - vim.keymap.set('n', '', function() vim.diagnostic.jump({ count = 1, float = true }) end, bufopts) + vim.keymap.set('n', '', function() vim.diagnostic.jump({ count = -1, float = true }) end, bufopts) + vim.keymap.set('n', '', function() vim.diagnostic.jump({ count = 1, float = true }) end, bufopts) vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) vim.keymap.set('n', 'for', function() vim.lsp.buf.format { async = true } end, bufopts) - vim.keymap.set('n', 'r', vim.lsp.buf.rename, bufopts) + vim.keymap.set('n', 're', vim.lsp.buf.rename, bufopts) vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) vim.keymap.set('n', 'ga', vim.lsp.buf.code_action, bufopts) vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) - vim.keymap.set('n', 'gs', vim.lsp.buf.signature_help, bufopts) + vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) end, }) diff --git a/nvim/lua/plugins/luasnip.lua b/nvim/lua/plugins/luasnip.lua index 731d01f..d5127e3 100644 --- a/nvim/lua/plugins/luasnip.lua +++ b/nvim/lua/plugins/luasnip.lua @@ -40,7 +40,7 @@ require('luasnip').setup { } require('luasnip.loaders.from_vscode').lazy_load() -require('luasnip.loaders.from_lua').lazy_load({ paths = "./snippets" }) +require('luasnip.loaders.from_lua').lazy_load({ paths = './snippets' }) -- TODO: Figure out keymappings that make sense vim.keymap.set({ 'i' }, '', function() require('luasnip').expand() end, { silent = true }) diff --git a/nvim/lua/plugins/twilight.lua b/nvim/lua/plugins/twilight.lua index 566021f..00ad6cb 100644 --- a/nvim/lua/plugins/twilight.lua +++ b/nvim/lua/plugins/twilight.lua @@ -10,10 +10,10 @@ require('twilight').setup({ context = 6, treesitter = true, expand = { - "function", - "method", - "table", - "if_statement", + 'function', + 'method', + 'table', + 'if_statement', } }) diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua index a8ac5e1..d806c02 100644 --- a/nvim/lua/settings.lua +++ b/nvim/lua/settings.lua @@ -1,5 +1,5 @@ vim.opt.background = 'dark' -- Force a dark background for the colorscheme -vim.opt.clipboard = 'unnamed,unnamedplus' -- Use both the "*" and "+" registers for yanks and deletes (puts things in the system clipboard) +vim.opt.clipboard = 'unnamed,unnamedplus' -- Use both the '*' and '+' registers for yanks and deletes (puts things in the system clipboard) vim.opt.completeopt = 'fuzzy,menuone,noinsert,popup' -- Change how the completion menu is interacted with and displays vim.opt.cursorcolumn = true -- Highlight the column the cursor is on vim.opt.cursorline = true -- Highlight the line the cursor is on. diff --git a/nvim/lua/ui2.lua b/nvim/lua/ui2.lua index 351acb3..a2fce91 100644 --- a/nvim/lua/ui2.lua +++ b/nvim/lua/ui2.lua @@ -3,6 +3,6 @@ require('vim._core.ui2').enable { enable = true, msg = { - targets = "msg", -- Displays in a floating text format + targets = 'msg', -- Displays in a floating text format } } diff --git a/nvim/snippets/all.lua b/nvim/snippets/all.lua index 5208611..7e24df9 100644 --- a/nvim/snippets/all.lua +++ b/nvim/snippets/all.lua @@ -14,8 +14,8 @@ -- return s({ trig = pair_begin, wordTrig = false }, { -- t({ pair_begin }), -- c(1, { --- r(1, "content", i(1)), --- sn(nil, { t({"", "\t"}), r(1, "content", i(1)), t({ "", "" }) }), +-- r(1, 'content', i(1)), +-- sn(nil, { t({ '', '\t' }), r(1, 'content', i(1)), t({ '', '' }) }), -- }), -- t({ pair_end }), -- })