diff options
Diffstat (limited to 'lua/lvim')
| -rw-r--r-- | lua/lvim/config/settings.lua | 10 | ||||
| -rw-r--r-- | lua/lvim/core/autocmds.lua | 56 |
2 files changed, 42 insertions, 24 deletions
diff --git a/lua/lvim/config/settings.lua b/lua/lvim/config/settings.lua index 5724406a..5b818034 100644 --- a/lua/lvim/config/settings.lua +++ b/lua/lvim/config/settings.lua @@ -64,6 +64,16 @@ M.load_default_options = function() for k, v in pairs(default_options) do vim.opt[k] = v end + + vim.filetype.add { + extension = { + tex = "tex", + zir = "zir", + }, + pattern = { + ["[jt]sconfig.*.json"] = "jsonc", + }, + } end M.load_headless_options = function() diff --git a/lua/lvim/core/autocmds.lua b/lua/lvim/core/autocmds.lua index 79c9089b..6d1cc6cd 100644 --- a/lua/lvim/core/autocmds.lua +++ b/lua/lvim/core/autocmds.lua @@ -3,25 +3,6 @@ local Log = require "lvim.core.log" --- Load the default set of autogroups and autocommands. function M.load_defaults() - vim.api.nvim_create_autocmd({ "FileType" }, { - pattern = { - "Jaq", - "qf", - "help", - "man", - "lspinfo", - "spectre_panel", - "lir", - "DressingSelect", - "tsplayground", - }, - callback = function() - vim.cmd [[ - nnoremap <silent> <buffer> q :close<CR> - set nobuflisted - ]] - end, - }) local definitions = { { "TextYankPost", @@ -30,7 +11,7 @@ function M.load_defaults() pattern = "*", desc = "Highlight text on yank", callback = function() - require("vim.highlight").on_yank { higroup = "Search", timeout = 100 } + vim.highlight.on_yank { higroup = "Search", timeout = 100 } end, }, }, @@ -46,16 +27,43 @@ function M.load_defaults() "FileType", { group = "_filetype_settings", - pattern = "qf", - command = "set nobuflisted", + pattern = { "lua" }, + desc = "fix gf functionality inside .lua files", + callback = function() + ---@diagnostic disable: assign-type-mismatch + -- credit: https://github.com/sam4llis/nvim-lua-gf + vim.opt_local.include = [[\v<((do|load)file|require|reload)[^''"]*[''"]\zs[^''"]+]] + vim.opt_local.includeexpr = "substitute(v:fname,'\\.','/','g')" + vim.opt_local.suffixesadd:prepend ".lua" + vim.opt_local.suffixesadd:prepend "init.lua" + + for _, path in pairs(vim.api.nvim_list_runtime_paths()) do + vim.opt_local.path:append(path .. "/lua") + end + end, }, }, { "FileType", { group = "_buffer_mappings", - pattern = { "qf", "help", "man", "floaterm", "lspinfo", "lsp-installer", "null-ls-info" }, - command = "nnoremap <silent> <buffer> q :close<CR>", + pattern = { + "qf", + "help", + "man", + "floaterm", + "lspinfo", + "lir", + "lsp-installer", + "null-ls-info", + "tsplayground", + "DressingSelect", + "Jaq", + }, + callback = function() + vim.keymap.set("n", "q", "<cmd>close<cr>", { buffer = true }) + vim.opt_local.buflisted = false + end, }, }, { |