diff --git a/lazy-lock.json b/lazy-lock.json index d5b7902..14b4a17 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -10,6 +10,7 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "cosmic-ui": { "branch": "main", "commit": "ab7de388576eaac02ce7bc2389e55b8e207aad12" }, "dashboard-nvim": { "branch": "master", "commit": "000448d837f6e7a47f8f342f29526c4d7e49e9ce" }, + "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "gitsigns.nvim": { "branch": "main", "commit": "4c40357994f386e72be92a46f41fc1664c84c87d" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, @@ -33,9 +34,10 @@ "telescope-fzf-native.nvim": { "branch": "main", "commit": "2a5ceff981501cff8f46871d5402cd3378a8ab6a" }, "telescope.nvim": { "branch": "master", "commit": "814f102cd1da3dc78c7d2f20f2ef3ed3cdf0e6e4" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "toggleterm.nvim": { "branch": "main", "commit": "e76134e682c1a866e3dfcdaeb691eb7b01068668" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, + "vim-eunuch": { "branch": "master", "commit": "e86bb794a1c10a2edac130feb0ea590a00d03f1e" }, "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }, + "vim-heritage": { "branch": "main", "commit": "574baeb0679681a710adce5110a0d8b2ae1c2637" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/lua/lsp/servers/defaults.lua b/lua/lsp/servers/defaults.lua index 2c21e39..fbcf2f0 100644 --- a/lua/lsp/servers/defaults.lua +++ b/lua/lsp/servers/defaults.lua @@ -2,7 +2,6 @@ local M = {} local augroup_name = 'CosmicNvimLspFormat' local config = require('config') local u = require('utils') -local lsp_utils = require('utils.lsp') local lsp_mappings = require('lsp.mappings') M.augroup = vim.api.nvim_create_augroup(augroup_name, { clear = true }) @@ -23,9 +22,7 @@ function M.on_attach(client, bufnr) if client.supports_method('textDocument/formatting') then -- set up :LspFormat for clients that are capable - vim.cmd( - string.format("command! -nargs=? LspFormat lua require('utils.lsp').buf_format(%s, )", bufnr) - ) + vim.cmd(string.format("command! -nargs=? LspFormat lua require('utils.lsp').buf_format(%s, )", bufnr)) -- set up auto format on save vim.api.nvim_clear_autocmds({ diff --git a/lua/mappings.lua b/lua/mappings.lua index 5bfbf39..284a485 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -1,6 +1,6 @@ local map = require('utils').set_keymap --- Quickfix mappings +-- quickfix mappings map('n', 'ck', ':cexpr []', { desc = 'Clear list' }) map('n', 'cc', ':cclose ', { desc = 'Close list' }) map('n', 'co', ':copen ', { desc = 'Open list' }) @@ -35,3 +35,7 @@ map('n', '', ':resize -2', { desc = 'Resize -2' }) map('n', '', ':resize +2', { desc = 'Resize +2' }) map('n', '', ':vertical resize -2', { desc = 'Vertical Resize -2' }) map('n', '', ':vertical resize +2', { desc = 'Vertical Resize +2' }) + +-- easy insertion of trailing ; and , from insert mode. +map('i', ';;', 'A;') +map('i', ',,', 'A;') diff --git a/lua/plugins_init.lua b/lua/plugins_init.lua index b75b000..acb9492 100644 --- a/lua/plugins_init.lua +++ b/lua/plugins_init.lua @@ -7,6 +7,10 @@ require('lazy').setup('plugins', { border = config.border, size = { width = 0.7, height = 0.7 }, }, + install = { + missing = true, + colorscheme = { 'tokyonight' }, + }, performance = { rtp = { disabled_plugins = {