From 1fdd7365a9101c28aa59e237688dd8a56a04db6a Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Sun, 14 Sep 2025 18:58:09 -0700 Subject: [PATCH] feat: various config updates and plugin removals --- lua/plugins/cmp.lua | 76 -------------------------------------- lua/plugins/editor.lua | 34 ----------------- lua/plugins/formatting.lua | 10 ----- lua/plugins/snack.lua | 51 +++++++++++++------------ 4 files changed, 27 insertions(+), 144 deletions(-) diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index 17c09b3..232ab91 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -14,80 +14,4 @@ return { }, opts_extend = { "sources.default" }, }, - -- { - -- "hrsh7th/nvim-cmp", - -- dependencies = { - -- "hrsh7th/cmp-nvim-lsp", - -- "hrsh7th/cmp-buffer", - -- }, - -- config = function() - -- local cmp = require("cmp") - -- - -- cmp.setup({ - -- -- Highlights the first result always - -- completion = { - -- completeopt = "menu,menuone,noinsert", - -- }, - -- window = { - -- completion = cmp.config.window.bordered({ - -- side_padding = 1, - -- scrollbar = false, - -- }), - -- }, - -- mapping = cmp.mapping.preset.insert({ - -- [""] = cmp.mapping.scroll_docs(-4), - -- [""] = cmp.mapping.scroll_docs(4), - -- [""] = cmp.mapping.complete(), - -- [""] = cmp.mapping.abort(), - -- [""] = cmp.mapping(function(fallback) - -- if cmp.visible() then - -- cmp.select_next_item() - -- else - -- fallback() - -- end - -- end, { "i" }), - -- [""] = cmp.mapping(function(fallback) - -- if cmp.visible() then - -- cmp.select_prev_item() - -- else - -- fallback() - -- end - -- end, { "i" }), - -- [""] = cmp.mapping.confirm({ select = true }), - -- }), - -- - -- snippet = { - -- expand = function(args) - -- require("luasnip").lsp_expand(args.body) - -- end, - -- }, - -- - -- sources = cmp.config.sources({ - -- { name = "nvim_lsp" }, - -- { name = "nvim_lsp_signature_help" }, - -- { name = "luasnip" }, - -- }, { - -- { name = "buffer" }, - -- }), - -- }) - -- end, - -- }, - -- { - -- "L3MON4D3/LuaSnip", - -- dependencies = { - -- { - -- "rafamadriz/friendly-snippets", - -- config = function() - -- require("luasnip.loaders.from_vscode").lazy_load({ - -- exclude = { "html" }, - -- }) - -- end, - -- }, - -- }, - -- build = "make install_jsregexp", - -- opts = { - -- history = true, - -- delete_check_events = "TextChanged", - -- }, - -- }, } diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 45fc5e8..8c2af54 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -8,44 +8,10 @@ return { end, opts = {}, }, - { - "folke/flash.nvim", - event = "VeryLazy", - opts = {}, - -- stylua: ignore - keys = { - { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, - { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, - { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" }, - { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, - { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, - }, - }, { "MeanderingProgrammer/markdown.nvim", main = "render-markdown", opts = {}, dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-tree/nvim-web-devicons" }, }, - { - "MagicDuck/grug-far.nvim", - opts = {}, - keys = { - { - "sr", - function() - local grug = require("grug-far") - local ext = vim.bo.buftype == "" and vim.fn.expand("%:e") - grug.open({ - transient = true, - prefills = { - filesFilter = ext and ext ~= "" and "*." .. ext or nil, - }, - }) - end, - mode = { "n", "v" }, - desc = "Search and Replace", - }, - }, - }, } diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index 362d402..ca1cd15 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -49,16 +49,6 @@ return { } end, }, - -- pint = { - -- args = function() - -- local CONFIG_PATH = os.getenv("HOME") .. "/.config/pint/pint.json" - -- return { - -- "--config", - -- CONFIG_PATH, - -- "$FILENAME", - -- } - -- end, - -- }, }, }, }, diff --git a/lua/plugins/snack.lua b/lua/plugins/snack.lua index 7869992..a6b14c6 100644 --- a/lua/plugins/snack.lua +++ b/lua/plugins/snack.lua @@ -1,26 +1,29 @@ return { - "folke/snacks.nvim", - priority = 1000, - lazy = false, - opts = { - dashboard = { enabled = true }, - git = { enabled = true }, - indent = { enabled = true }, - input = { enabled = true }, - lazygit = { enabled = true }, - notifier = { enabled = true }, - quickfile = { enabled = true }, - scratch = { enabled = true }, - scroll = { enabled = true }, - statuscolumn = { enabled = true }, - terminal = { enabled = true }, - }, - keys = { - { ".", function() Snacks.scratch() end, desc = "Toggle Scratch Buffer" }, - { "S", function() Snacks.scratch.select() end, desc = "Select Scratch Buffer" }, - { "n", function() Snacks.notifier.show_history() end, desc = "Notification History" }, - { "gb", function() Snacks.git.blame_line() end, desc = "Git Blame Line" }, - { "gg", function() Snacks.lazygit() end, desc = "Lazygit" }, - { "", function() Snacks.terminal() end, desc = "Toggle Terminal" }, - } + "folke/snacks.nvim", + priority = 1000, + lazy = false, + opts = { + git = { enabled = true }, + indent = { enabled = true }, + input = { enabled = true }, + notifier = { enabled = true }, + scroll = { enabled = true }, + statuscolumn = { enabled = true }, + }, + keys = { + { + "n", + function() + Snacks.notifier.show_history() + end, + desc = "Notification History", + }, + { + "gb", + function() + Snacks.git.blame_line() + end, + desc = "Git Blame Line", + }, + }, }