# HG changeset patch # User Meredith Howard # Date 1676276408 21600 # Node ID 21950cadff6b407b961dede40b0011e6b0ee6002 # Parent b57969db48dbe48155e8e520067dc85a5cc22daa Ongoing nvim config diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,2 +1,4 @@ require("config.options") require("config.lazy") +require("config.maps") +require("config.lsp") diff --git a/.config/nvim/lua/config/maps.lua b/.config/nvim/lua/config/maps.lua new file mode 100644 --- /dev/null +++ b/.config/nvim/lua/config/maps.lua @@ -0,0 +1,19 @@ + +local map = vim.keymap +local opts = {noremap = true, silent = true} + +map.set("n", "", ":20Lexplore", opts) +map.set("n", "", "n", opts) +map.set("n", "", "N", opts) +map.set("", "", ":let v:hlsearch = !v:hlsearch", opts) +-- map.set("n", "", ":UndotreeToggle", opts) +-- map.set("n", "", ":TagbarToggle", opts) + +-- Allow :noh even in insert mode +map.set("i", "", "") + +-- cover for search habit +map.set("c", "", "") + +map.set("n", "cd", ":cd %:p:h:pwd") + diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua --- a/.config/nvim/lua/config/options.lua +++ b/.config/nvim/lua/config/options.lua @@ -26,21 +26,25 @@ end -- Behavior o.autowriteall = true +o.backup = true +o.completeopt:append({"menuone", "noselect"}) o.ignorecase = true o.scrolloff = 15 +o.sessionoptions = {"buffers", "curdir", "localoptions"} o.sidescrolloff = 10 o.smartcase = true o.splitbelow = true o.splitright = true +o.undofile = true o.wildignorecase = true -- Paths -o.tags:append(".tags,./.tags;") +o.tags:append({".tags", "./.tags;"}) o.wildignore = "*~,*.o,*.pyc,.git/*,hg/*,.svn/*" -vim.api.nvim_create_autocmd("LspAttach", { - once = true, - callback = function(args) - vim.opt.number = true - end, -}) +if vim.fn.executable("ag") then + o.grepprg = "ag --vimgrep" + o.grepformat:prepend({"%f:%l:%c:%m", "%f"}) + o.errorformat:append("%f") +end + diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -35,20 +35,21 @@ return { [""] = cmp.mapping.select_next_item(), [""] = cmp.mapping.select_prev_item(), [""] = cmp.mapping.abort(), + -- FIXME: add extra space after in select case? [""] = cmp.mapping.confirm({select = false}), [""] = cmp.mapping.confirm({select = true}), }), - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "nvim_lsp_signature_help" }, - { name = "buffer" }, - { name = "path" }, - }), - experimental = { - ghost_text = { - hl_group = "LspCodeLens", - }, - }, + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + { name = "nvim_lsp_signature_help" }, + { name = "buffer" }, + { name = "path" }, + }), + experimental = { + ghost_text = { + hl_group = "LspCodeLens", + }, + }, } end, }, diff --git a/.config/nvim/lua/plugins/ui.lua b/.config/nvim/lua/plugins/ui.lua --- a/.config/nvim/lua/plugins/ui.lua +++ b/.config/nvim/lua/plugins/ui.lua @@ -7,11 +7,11 @@ return { icons_enabled = false, section_separators = "", component_separators = "", - globalstatus = true }, tabline = { lualine_a = { {'buffers', mode = 4} }, - } + }, + extensions = {"quickfix"}, } },