From b3d6b3ffb2e8fb2c2f6dca90120673f22a40b0a3 Mon Sep 17 00:00:00 2001 From: Xander Swan Date: Wed, 3 Dec 2025 10:00:42 -0500 Subject: compress plugins further, crawl back to oil --- .config/nvim/init.lua | 1 - .config/nvim/lua/lsp.lua | 82 -------------------------------------- .config/nvim/lua/map.lua | 2 - .config/nvim/lua/opt.lua | 2 + .config/nvim/lua/plugin/init.lua | 2 +- .config/nvim/lua/plugin/lsp.lua | 81 +++++++++++++++++++++++++++++++++++++ .config/nvim/lua/plugin/packer.lua | 15 +------ .config/nvim/lua/plugin/setup.lua | 45 ++++----------------- 8 files changed, 93 insertions(+), 137 deletions(-) delete mode 100644 .config/nvim/lua/lsp.lua create mode 100644 .config/nvim/lua/plugin/lsp.lua (limited to '.config') diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 0065226..7d4a97f 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,4 +1,3 @@ require("opt") -require("lsp") require("map") require("plugin") diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua deleted file mode 100644 index 32ba6f8..0000000 --- a/.config/nvim/lua/lsp.lua +++ /dev/null @@ -1,82 +0,0 @@ -local lspconf = require("lspconfig") -local cmp = require("cmp") -local capabilities = require("cmp_nvim_lsp").default_capabilities() - -vim.opt.signcolumn = "yes" - -local servers = { - ["lua_ls"] = { - settings = { - Lua = { - runtime = { - version = "LuaJIT" - } - } - } - }, - ["clangd"] = {}, -} - -for lsp, conf in pairs(servers) do - conf.capabilities = capabilities - lspconf[lsp].setup(conf) -end - - -cmp.setup({ - preselect = "item", - completion = { - completeopt = "menu,menuone,noinsert", - }, - window = { - completion = cmp.config.window.bordered(), - documentation = cmp.config.window.bordered(), - }, - formatting = { - fields = { "menu", "abbr", "kind" }, - - format = function(entry, item) - local menu_icon = { - nvim_lsp = "L", - buffer = "B", - path = "P", - nvim_lua = "NL", - } - - item.menu = menu_icon[entry.source.name] - - return item - end, - }, - mapping = { - [""] = cmp.mapping.confirm({ select = false }), - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.select_prev_item(), - }, - sources = { - { name = "path" }, - { name = "nvim_lsp" }, - { name = "buffer", keyword_length = 3 }, - }, -}) - -vim.api.nvim_create_autocmd("LspAttach", { - group = vim.api.nvim_create_augroup("UserLspConfig", {}), - callback = function(ev) - vim.bo[ev.buf].omnifunc = "v:lua.vim.lsp.omnifunc" - local opts = { buffer = ev.buf } - vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts) - vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts) - vim.keymap.set("n", "gi", vim.lsp.buf.implementation, opts) - vim.keymap.set("n", "gr", vim.lsp.buf.references, opts) - vim.keymap.set("n", "go", vim.lsp.buf.type_definition, opts) - vim.keymap.set("n", "ls", vim.lsp.buf.signature_help, opts) - vim.keymap.set("n", "rn", vim.lsp.buf.rename, opts) - vim.keymap.set("n", "h", vim.lsp.buf.hover, opts) - vim.keymap.set({"n", "v"}, "ca", vim.lsp.buf.code_action, opts) - vim.keymap.set("n", "f", - function() - vim.lsp.buf.format({async = true}) - end, opts) - end -}) diff --git a/.config/nvim/lua/map.lua b/.config/nvim/lua/map.lua index a0af88a..b52ad22 100644 --- a/.config/nvim/lua/map.lua +++ b/.config/nvim/lua/map.lua @@ -34,5 +34,3 @@ vim.api.nvim_create_user_command("Wq", "wq", {bang=true}) vim.api.nvim_create_user_command("Wqa", "wqa", {bang=true}) vim.api.nvim_create_user_command("Q", "q", {bang=true}) vim.api.nvim_create_user_command("Qa", "qa", {bang=true}) - -vim.api.nvim_create_user_command("ClangFormat", "!clang-format -i %", {}) diff --git a/.config/nvim/lua/opt.lua b/.config/nvim/lua/opt.lua index 56a9b84..446229d 100644 --- a/.config/nvim/lua/opt.lua +++ b/.config/nvim/lua/opt.lua @@ -11,8 +11,10 @@ vim.o.splitright = true vim.o.splitbelow = true local tabwidth = 2 vim.o.tabstop = tabwidth +vim.o.softtabstop = tabwidth vim.o.shiftwidth = tabwidth vim.o.expandtab = true +vim.o.wrap = false -- Disable line numbers in terminal vim.api.nvim_create_autocmd("TermOpen", { diff --git a/.config/nvim/lua/plugin/init.lua b/.config/nvim/lua/plugin/init.lua index 6cd9e35..4e60f98 100644 --- a/.config/nvim/lua/plugin/init.lua +++ b/.config/nvim/lua/plugin/init.lua @@ -1,3 +1,3 @@ require("plugin.packer") require("plugin.setup") --- require("plugin.lsp") +require("plugin.lsp") diff --git a/.config/nvim/lua/plugin/lsp.lua b/.config/nvim/lua/plugin/lsp.lua new file mode 100644 index 0000000..50eed85 --- /dev/null +++ b/.config/nvim/lua/plugin/lsp.lua @@ -0,0 +1,81 @@ +local lspconf = require("lspconfig") +local cmp = require("cmp") +local capabilities = require("cmp_nvim_lsp").default_capabilities() + +vim.opt.signcolumn = "yes" + +local servers = { + ["lua_ls"] = { + settings = { + Lua = { + runtime = { + version = "LuaJIT" + }, + }, + }, + }, + ["clangd"] = {}, +} + +for lsp, conf in pairs(servers) do + conf.capabilities = capabilities + lspconf[lsp].setup(conf) +end + +cmp.setup({ + preselect = "item", + completion = { + completeopt = "menu,menuone,noinsert", + }, + window = { + completion = cmp.config.window.bordered(), + documentation = cmp.config.window.bordered(), + }, + formatting = { + fields = { "menu", "abbr", "kind" }, + + format = function(entry, item) + local menu_icon = { + nvim_lsp = "L", + buffer = "B", + path = "P", + nvim_lua = "V", + } + + item.menu = menu_icon[entry.source.name] + + return item + end, + }, + mapping = { + [""] = cmp.mapping.confirm({ select = false }), + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.select_prev_item(), + }, + sources = { + { name = "path" }, + { name = "nvim_lsp" }, + { name = "buffer", keyword_length = 3 }, + }, +}) + +vim.api.nvim_create_autocmd("LspAttach", { + group = vim.api.nvim_create_augroup("UserLspConfig", {}), + callback = function(ev) + vim.bo[ev.buf].omnifunc = "v:lua.vim.lsp.omnifunc" + local opts = { buffer = ev.buf } + vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts) + vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts) + vim.keymap.set("n", "gi", vim.lsp.buf.implementation, opts) + vim.keymap.set("n", "gr", vim.lsp.buf.references, opts) + vim.keymap.set("n", "go", vim.lsp.buf.type_definition, opts) + vim.keymap.set("n", "ls", vim.lsp.buf.signature_help, opts) + vim.keymap.set("n", "rn", vim.lsp.buf.rename, opts) + vim.keymap.set("n", "h", vim.lsp.buf.hover, opts) + vim.keymap.set({"n", "v"}, "ca", vim.lsp.buf.code_action, opts) + vim.keymap.set("n", "f", + function() + vim.lsp.buf.format({async = true}) + end, opts) + end +}) diff --git a/.config/nvim/lua/plugin/packer.lua b/.config/nvim/lua/plugin/packer.lua index 961af13..359ceab 100644 --- a/.config/nvim/lua/plugin/packer.lua +++ b/.config/nvim/lua/plugin/packer.lua @@ -1,16 +1,10 @@ return require("packer").startup(function(use) use {"wbthomason/packer.nvim"} - use {"windwp/nvim-autopairs"} - use { - "nvim-telescope/telescope.nvim", - requires = { - { "nvim-lua/plenary.nvim"} - }, - } + use {"ibhagwan/fzf-lua"} + use {"stevearc/oil.nvim"} use {"lewis6991/gitsigns.nvim"} - use {"numToStr/Comment.nvim"} use {"williamboman/mason.nvim"} use {"neovim/nvim-lspconfig"} @@ -21,9 +15,4 @@ return require("packer").startup(function(use) use {"hrsh7th/cmp-nvim-lua"} use {"michaeljsmith/vim-indent-object"} - - use { - "nvim-treesitter/nvim-treesitter", - run = ":TSUpdate" - } end) diff --git a/.config/nvim/lua/plugin/setup.lua b/.config/nvim/lua/plugin/setup.lua index ca2be66..7a53c6a 100644 --- a/.config/nvim/lua/plugin/setup.lua +++ b/.config/nvim/lua/plugin/setup.lua @@ -1,43 +1,12 @@ ---@diagnostic disable: undefined-global -require("gitsigns").setup {} -require("Comment").setup {} -require("mason").setup {} +require("gitsigns").setup({}) +require("mason").setup({}) -require("nvim-autopairs").setup { - fast_wrap = { - map = "", - chars = { "<", "{", "[", "(", "\"", "'" }, - pattern = [=[[%"%"%>%]%)%}%,]]=], - end_key = "$", - keys = "qwertyuiopzxcvbnmasdfghjkl", - check_comma = true, - highlight = "Search", - highlight_grey="Comment" - } -} +require("oil").setup({}) +vim.keymap.set("n", "e", "Oil", {}) -require("nvim-treesitter.configs").setup { - ensure_installed = { "c", "lua", "vimdoc" }, - sync_install = true, - highlight = { - enable = true, - additional_vim_regex_highlighting = true, - }, - indent = {enable = true}, -} +require("fzf-lua").setup(require("fzf-lua.profiles.telescope")) +vim.keymap.set("n", "", function() FzfLua.files({}) end, {}) -local builtin = require("telescope.builtin") -require("telescope").setup { - pickers = { - find_files = { - theme = "dropdown", - } - } -} - -vim.keymap.set("n", "", builtin.find_files, {}) -vim.keymap.set("n", "", builtin.git_files, {}) -vim.keymap.set("n", "", function() - builtin.grep_string({ search = vim.fn.input("grep>") }) -end) +vim.keymap.set("n", "", function() FzfLua.grep() end, {}) -- cgit v1.3-2-g0d8e