From 9a128539e675333e7441ad893c61f8dce625f317 Mon Sep 17 00:00:00 2001 From: Xander Swan Date: Wed, 3 Dec 2025 10:00:42 -0500 Subject: Update lots and lots --- .config/nvim/lua/map.lua | 36 ----------------- .config/nvim/lua/opt.lua | 27 ------------- .config/nvim/lua/plugin/init.lua | 3 -- .config/nvim/lua/plugin/lsp.lua | 81 -------------------------------------- .config/nvim/lua/plugin/packer.lua | 18 --------- .config/nvim/lua/plugin/setup.lua | 12 ------ 6 files changed, 177 deletions(-) delete mode 100644 .config/nvim/lua/map.lua delete mode 100644 .config/nvim/lua/opt.lua delete mode 100644 .config/nvim/lua/plugin/init.lua delete mode 100644 .config/nvim/lua/plugin/lsp.lua delete mode 100644 .config/nvim/lua/plugin/packer.lua delete mode 100644 .config/nvim/lua/plugin/setup.lua (limited to '.config/nvim/lua') diff --git a/.config/nvim/lua/map.lua b/.config/nvim/lua/map.lua deleted file mode 100644 index b52ad22..0000000 --- a/.config/nvim/lua/map.lua +++ /dev/null @@ -1,36 +0,0 @@ -vim.g.mapleader = " " - -local nv = {"n", "v"} - -vim.keymap.set(nv, "gm", "gM", {}) -vim.keymap.set(nv, "gM", "gMi", {}) - --- Make exiting insert mode in terminal mode easier -vim.keymap.set("t", "", "", {}) - --- Center when moving around at high speeds -vim.keymap.set(nv, "", "zz", {}) -vim.keymap.set(nv, "", "zz", {}) -vim.keymap.set(nv, "G", "Gzz", {}) - --- Make going to the end of a line as easy as going to the beginning -vim.keymap.set({"n", "v", "o"}, "+", "$", {}) - --- Yanking and pasting -vim.keymap.set(nv, "y", "\"+y", {}) -vim.keymap.set(nv, "p", "\"+p", {}) -vim.keymap.set("x", "p", "\"_dP", {}) -vim.keymap.set("x", "P", "p", {}) - --- Commands -vim.keymap.set(nv, "c", "set invhlsearch", {silent=true}) -vim.keymap.set("n", "{", "cp", {silent=true}) -vim.keymap.set("n", "}", "cn", {silent=true}) - --- Common typo with me -vim.api.nvim_create_user_command("W", "w", {bang=true}) -vim.api.nvim_create_user_command("Wa", "wa", {bang=true}) -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}) diff --git a/.config/nvim/lua/opt.lua b/.config/nvim/lua/opt.lua deleted file mode 100644 index 446229d..0000000 --- a/.config/nvim/lua/opt.lua +++ /dev/null @@ -1,27 +0,0 @@ -vim.o.termguicolors = true -vim.o.relativenumber = true -vim.o.number = true -vim.o.cursorline = true -vim.o.cursorlineopt = "line" -vim.o.ignorecase = true -vim.o.smartcase = true -vim.o.mouse = "" -vim.o.cc = "80" -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", { - callback = function() - vim.o.number = false - vim.o.relativenumber = false - end, -}) - -vim.cmd.colorscheme("mine") diff --git a/.config/nvim/lua/plugin/init.lua b/.config/nvim/lua/plugin/init.lua deleted file mode 100644 index 4e60f98..0000000 --- a/.config/nvim/lua/plugin/init.lua +++ /dev/null @@ -1,3 +0,0 @@ -require("plugin.packer") -require("plugin.setup") -require("plugin.lsp") diff --git a/.config/nvim/lua/plugin/lsp.lua b/.config/nvim/lua/plugin/lsp.lua deleted file mode 100644 index 50eed85..0000000 --- a/.config/nvim/lua/plugin/lsp.lua +++ /dev/null @@ -1,81 +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 = "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 deleted file mode 100644 index 359ceab..0000000 --- a/.config/nvim/lua/plugin/packer.lua +++ /dev/null @@ -1,18 +0,0 @@ -return require("packer").startup(function(use) - use {"wbthomason/packer.nvim"} - - use {"ibhagwan/fzf-lua"} - use {"stevearc/oil.nvim"} - - use {"lewis6991/gitsigns.nvim"} - - use {"williamboman/mason.nvim"} - use {"neovim/nvim-lspconfig"} - use {"hrsh7th/nvim-cmp"} - use {"hrsh7th/cmp-buffer"} - use {"hrsh7th/cmp-path"} - use {"hrsh7th/cmp-nvim-lsp"} - use {"hrsh7th/cmp-nvim-lua"} - - use {"michaeljsmith/vim-indent-object"} -end) diff --git a/.config/nvim/lua/plugin/setup.lua b/.config/nvim/lua/plugin/setup.lua deleted file mode 100644 index 7a53c6a..0000000 --- a/.config/nvim/lua/plugin/setup.lua +++ /dev/null @@ -1,12 +0,0 @@ ----@diagnostic disable: undefined-global - -require("gitsigns").setup({}) -require("mason").setup({}) - -require("oil").setup({}) -vim.keymap.set("n", "e", "Oil", {}) - -require("fzf-lua").setup(require("fzf-lua.profiles.telescope")) -vim.keymap.set("n", "", function() FzfLua.files({}) end, {}) - -vim.keymap.set("n", "", function() FzfLua.grep() end, {}) -- cgit v1.3-2-g0d8e