diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua index 9f06f58..07c4ad6 100644 --- a/.config/nvim/lua/maps.lua +++ b/.config/nvim/lua/maps.lua @@ -36,7 +36,7 @@ vim.keymap.set({ "t" }, "", -- yank and pasting vim.keymap.set({ "n", "x" }, "y", "\"+y", - { desc = "Yank to clipboard"} + { desc = "Yank to clipboard" } ) vim.keymap.set("n", "p", "\"+P", @@ -95,9 +95,11 @@ vim.keymap.set("n", "tk", { desc = "Search through keymaps" } ) vim.keymap.set("n", "tx", - function() require("telescope.builtin").diagnostics( - { buffnr = 0 } - ) end, + function() + require("telescope.builtin").diagnostics( + { buffnr = 0 } + ) + end, { desc = "Search through LSP diagnostics" } ) diff --git a/.config/nvim/lua/plugin/lsp/html.lua b/.config/nvim/lua/plugin/lsp/html.lua index e30f573..1d84744 100644 --- a/.config/nvim/lua/plugin/lsp/html.lua +++ b/.config/nvim/lua/plugin/lsp/html.lua @@ -5,6 +5,7 @@ local M = {} -M.setup = function(opts) end +M.setup = function(opts) +end return M diff --git a/.config/nvim/lua/plugin/lsp/init.lua b/.config/nvim/lua/plugin/lsp/init.lua index 7b225af..38dc0e0 100644 --- a/.config/nvim/lua/plugin/lsp/init.lua +++ b/.config/nvim/lua/plugin/lsp/init.lua @@ -24,7 +24,6 @@ return { "williamboman/mason-lspconfig.nvim", }, config = function() - vim.diagnostic.config({ underline = true, update_in_insert = false, diff --git a/.config/nvim/lua/plugin/lsp/lua_ls.lua b/.config/nvim/lua/plugin/lsp/lua_ls.lua index 0905cab..5e7beea 100644 --- a/.config/nvim/lua/plugin/lsp/lua_ls.lua +++ b/.config/nvim/lua/plugin/lsp/lua_ls.lua @@ -33,13 +33,13 @@ M.setup = function(opts) workspace = { -- Make the server aware of Neovim runtime files library = - vim.api.nvim_get_runtime_file("", true), + vim.api.nvim_get_runtime_file("", true), checkThirdParty = false, }, -- Do not send telemetry data containing a randomized but -- unique identifier telemetry = { - enable = false, + enable = false, }, }, } diff --git a/.config/nvim/lua/plugin/lsp/texlab.lua b/.config/nvim/lua/plugin/lsp/texlab.lua index 2fbbf14..c79154d 100644 --- a/.config/nvim/lua/plugin/lsp/texlab.lua +++ b/.config/nvim/lua/plugin/lsp/texlab.lua @@ -15,4 +15,3 @@ M.setup = function(opts) end return M - diff --git a/.config/nvim/lua/plugin/lsp/tsserver.lua b/.config/nvim/lua/plugin/lsp/tsserver.lua index bbeb11f..28b96d6 100644 --- a/.config/nvim/lua/plugin/lsp/tsserver.lua +++ b/.config/nvim/lua/plugin/lsp/tsserver.lua @@ -6,6 +6,7 @@ local M = {} -M.setup = function(opts) end +M.setup = function(opts) +end return M diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua index 0269caf..d382ecb 100644 --- a/.config/nvim/lua/settings.lua +++ b/.config/nvim/lua/settings.lua @@ -3,68 +3,68 @@ -- License : GPLv3 -- Description : neovim settings file -local opt = vim.opt -local g = vim.g +local opt = vim.opt +local g = vim.g -- general -opt.wildignore = { - ".git", - "*.o", "*.class", - "*.jpg", "*.jpeg", "*.png", - "*.pdf", - "*.zip", "*.gz", "*.rar", "*.tar.xz", +opt.wildignore = { + ".git", + "*.o", "*.class", + "*.jpg", "*.jpeg", "*.png", + "*.pdf", + "*.zip", "*.gz", "*.rar", "*.tar.xz", } -opt.wildmode = { "longest", "full" } -opt.wildoptions = "pum" +opt.wildmode = { "longest", "full" } +opt.wildoptions = "pum" -- editor -opt.lazyredraw = true -opt.splitright = true -opt.splitbelow = true -opt.scrolloff = 4 -opt.termguicolors = true -opt.background = "dark" -opt.cursorline = true -opt.colorcolumn = "+1" -opt.shortmess = opt.shortmess:append { c = true } -opt.number = true -opt.relativenumber = true -opt.signcolumn = "yes" -opt.listchars = { - tab = "<->", - nbsp = "␣", - trail = "·", - extends = ">", - precedes = "<", +opt.lazyredraw = true +opt.splitright = true +opt.splitbelow = true +opt.scrolloff = 4 +opt.termguicolors = true +opt.background = "dark" +opt.cursorline = true +opt.colorcolumn = "+1" +opt.shortmess = opt.shortmess:append { c = true } +opt.number = true +opt.relativenumber = true +opt.signcolumn = "yes" +opt.listchars = { + tab = "<->", + nbsp = "␣", + trail = "·", + extends = ">", + precedes = "<", } -opt.showmatch = true -opt.ignorecase = true -opt.smartcase = true -opt.inccommand = "split" -opt.completeopt = { "menuone", "noselect" } +opt.showmatch = true +opt.ignorecase = true +opt.smartcase = true +opt.inccommand = "split" +opt.completeopt = { "menuone", "noselect" } -- statusline -opt.laststatus = 2 -opt.showmode = false +opt.laststatus = 2 +opt.showmode = false -- text, tabs, indents -opt.textwidth = 79 -opt.tabstop = 4 -opt.softtabstop = -1 -opt.expandtab = true -opt.shiftwidth = 0 -opt.backspace = { "indent", "eol", "start" } +opt.textwidth = 79 +opt.tabstop = 4 +opt.softtabstop = -1 +opt.expandtab = true +opt.shiftwidth = 0 +opt.backspace = { "indent", "eol", "start" } -- augroups utils.create_augroup({ - {"BufWritePre", "*", "%s/\\s\\+$//e"} + { "BufWritePre", "*", "%s/\\s\\+$//e" } }, "remove_trailing_whitespaces") utils.create_augroup({ - {"BufNewFile,BufRead", "*.mom", "set filetype=groff"}, - {"BufNewFile,BufRead", "*.tex", "set filetype=tex"}, + { "BufNewFile,BufRead", "*.mom", "set filetype=groff" }, + { "BufNewFile,BufRead", "*.tex", "set filetype=tex" }, }, "enforce_filetypes") -vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, { - pattern = {"*.njk"}, - callback = function() vim.bo.filetype="html" end, +vim.api.nvim_create_autocmd({ "BufEnter", "BufWinEnter" }, { + pattern = { "*.njk" }, + callback = function() vim.bo.filetype = "html" end, }) diff --git a/.config/nvim/lua/utils.lua b/.config/nvim/lua/utils.lua index 9ea50dc..3041559 100644 --- a/.config/nvim/lua/utils.lua +++ b/.config/nvim/lua/utils.lua @@ -8,40 +8,40 @@ local cmd = vim.cmd -- augroup helper function M.create_augroup(autocmds, name) - cmd("augroup " .. name) - cmd("autocmd!") - for _, autocmd in ipairs(autocmds) do - cmd("autocmd " .. table.concat(autocmd, " ")) - end - cmd("augroup END") + cmd("augroup " .. name) + cmd("autocmd!") + for _, autocmd in ipairs(autocmds) do + cmd("autocmd " .. table.concat(autocmd, " ")) + end + cmd("augroup END") end -- add a path to the rtp function M.add_rtp(path) - local rtp = vim.o.rtp - rtp = rtp .. "," .. path + local rtp = vim.o.rtp + rtp = rtp .. "," .. path end -- see if a file exists function M.file_exists(file) - local f = io.open(file, "rb") - if f then f:close() end - return f ~= nil + local f = io.open(file, "rb") + if f then f:close() end + return f ~= nil end -- get all lines from a file -- @return table (empty if the file does not exist) function M.lines_from(file) - if not M.file_exists(file) then return {} end - local lines = {} - for line in io.lines(file) do - lines[#lines] = line - end - return lines + if not M.file_exists(file) then return {} end + local lines = {} + for line in io.lines(file) do + lines[#lines] = line + end + return lines end function M.copy(args) - return args[1] + return args[1] end -- Make it accessible everywhere