diff --git a/init.lua b/init.lua index 01847efc..a94f699c 100644 --- a/init.lua +++ b/init.lua @@ -470,7 +470,7 @@ mason_lspconfig.setup_handlers { settings = servers[server_name], filetypes = (servers[server_name] or {}).filetypes, } - end + end, } -- [[ Configure nvim-cmp ]] diff --git a/lua/custom/plugins/autocmds.lua b/lua/custom/plugins/autocmds.lua index b4520589..9dbc450b 100644 --- a/lua/custom/plugins/autocmds.lua +++ b/lua/custom/plugins/autocmds.lua @@ -1,72 +1,72 @@ -- Taken from https://www.lazyvim.org/configuration/general local function augroup(name) - return vim.api.nvim_create_augroup("lazyvim_" .. name, { clear = true }) + return vim.api.nvim_create_augroup('lazyvim_' .. name, { clear = true }) end -- Check if we need to reload the file when it changed -vim.api.nvim_create_autocmd({ "FocusGained", "TermClose", "TermLeave" }, { - group = augroup("checktime"), - command = "checktime", +vim.api.nvim_create_autocmd({ 'FocusGained', 'TermClose', 'TermLeave' }, { + group = augroup 'checktime', + command = 'checktime', }) -- Highlight on yank -vim.api.nvim_create_autocmd("TextYankPost", { - group = augroup("highlight_yank"), - callback = function() - vim.highlight.on_yank() - end, -}) +-- vim.api.nvim_create_autocmd("TextYankPost", { +-- group = augroup("highlight_yank"), +-- callback = function() +-- vim.highlight.on_yank() +-- end, +-- }) -- resize splits if window got resized -vim.api.nvim_create_autocmd({ "VimResized" }, { - group = augroup("resize_splits"), - callback = function() - vim.cmd("tabdo wincmd =") - end, +vim.api.nvim_create_autocmd({ 'VimResized' }, { + group = augroup 'resize_splits', + callback = function() + vim.cmd 'tabdo wincmd =' + end, }) -- go to last loc when opening a buffer -vim.api.nvim_create_autocmd("BufReadPost", { - group = augroup("last_loc"), - callback = function() - local mark = vim.api.nvim_buf_get_mark(0, '"') - local lcount = vim.api.nvim_buf_line_count(0) - if mark[1] > 0 and mark[1] <= lcount then - pcall(vim.api.nvim_win_set_cursor, 0, mark) - end - end, +vim.api.nvim_create_autocmd('BufReadPost', { + group = augroup 'last_loc', + callback = function() + local mark = vim.api.nvim_buf_get_mark(0, '"') + local lcount = vim.api.nvim_buf_line_count(0) + if mark[1] > 0 and mark[1] <= lcount then + pcall(vim.api.nvim_win_set_cursor, 0, mark) + end + end, }) -- close some filetypes with -vim.api.nvim_create_autocmd("FileType", { - group = augroup("close_with_q"), - pattern = { - "PlenaryTestPopup", - "help", - "lspinfo", - "man", - "notify", - "qf", - "query", -- :InspectTree - "spectre_panel", - "startuptime", - "tsplayground", - }, - callback = function(event) - vim.bo[event.buf].buflisted = false - vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) - end, +vim.api.nvim_create_autocmd('FileType', { + group = augroup 'close_with_q', + pattern = { + 'PlenaryTestPopup', + 'help', + 'lspinfo', + 'man', + 'notify', + 'qf', + 'query', -- :InspectTree + 'spectre_panel', + 'startuptime', + 'tsplayground', + }, + callback = function(event) + vim.bo[event.buf].buflisted = false + vim.keymap.set('n', 'q', 'close', { buffer = event.buf, silent = true }) + end, }) -- wrap and check for spell in text filetypes -vim.api.nvim_create_autocmd("FileType", { - group = augroup("wrap_spell"), - pattern = { "gitcommit", "markdown" }, - callback = function() - vim.opt_local.wrap = true - vim.opt_local.spell = true - end, +vim.api.nvim_create_autocmd('FileType', { + group = augroup 'wrap_spell', + pattern = { 'gitcommit', 'markdown' }, + callback = function() + vim.opt_local.wrap = true + vim.opt_local.spell = true + end, }) return {} diff --git a/lua/custom/plugins/base.lua b/lua/custom/plugins/base.lua index 975a224f..9ecec267 100644 --- a/lua/custom/plugins/base.lua +++ b/lua/custom/plugins/base.lua @@ -9,8 +9,8 @@ if has_unnamedplus then vim.o.clipboard = 'unnamedplus' end -vim.api.nvim_buf_set_keymap(0, 'n', 'y', '"+y', { noremap = true, silent = true }) -vim.api.nvim_buf_set_keymap(0, 'n', 'p', '"+p', { noremap = true, silent = true }) +-- vim.api.nvim_buf_set_keymap(0, 'n', 'y', '"+y', { noremap = true, silent = true }) +-- vim.api.nvim_buf_set_keymap(0, 'n', 'p', '"+p', { noremap = true, silent = true }) local function set_json_filetype() if string.match(vim.api.nvim_buf_get_name(0), '%.geojson$') or string.match(vim.api.nvim_buf_get_name(0), '%.json$') then diff --git a/lua/custom/plugins/languages/latex.lua b/lua/custom/plugins/languages/latex.lua new file mode 100644 index 00000000..e667933a --- /dev/null +++ b/lua/custom/plugins/languages/latex.lua @@ -0,0 +1,3 @@ +return { + 'lervag/vimtex', +}