From ee21b1952cbb45271a45e3d3cb0ab57e5a9460d3 Mon Sep 17 00:00:00 2001 From: John Grant Date: Fri, 29 Aug 2025 23:43:49 -0400 Subject: [PATCH] wip --- lazy-lock.json | 19 +++-------- lazyvim.json | 10 ++---- lua/config/keymaps.lua | 1 - lua/plugins/folke.lua | 70 +++++++++++++++++++++------------------- lua/plugins/init.lua | 63 +++++++----------------------------- lua/plugins/supertab.lua | 4 +++ 6 files changed, 58 insertions(+), 109 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 949e940..a12c605 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,14 +2,9 @@ "LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" }, "SchemaStore.nvim": { "branch": "main", "commit": "8e74c08998fd786239caba373344f4e4601e21fe" }, "auto-session": { "branch": "main", "commit": "3b5d8947cf16ac582ef00443ede4cdd3dfa23af9" }, + "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "catppuccin": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" }, - "chkn.nvim": { "branch": "main", "commit": "b9766860d40ac27fcf15b58511d3c313f7e53f72" }, - "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, - "cmp-dbee": { "branch": "main", "commit": "1650f67b9bf43c029fc37570665ca895a33cdf5a" }, - "cmp-mini-snippets": { "branch": "main", "commit": "582aea215ce2e65b880e0d23585c20863fbb7604" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, - "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, @@ -26,23 +21,20 @@ "mini.ai": { "branch": "main", "commit": "45a26d032d8703f280c69c2ed9fb4e1bfc8f24f9" }, "mini.icons": { "branch": "main", "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d" }, "mini.pairs": { "branch": "main", "commit": "6e1cc569130f25b2c6fa16d8b21b31ddb1420a4a" }, - "mini.snippets": { "branch": "main", "commit": "c5e2d0aae10a299fd92834b6d68916c9c7ba14f2" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-dbee": { "branch": "master", "commit": "dda517694889a5d238d7aa407403984da9f80cc0" }, "nvim-lint": { "branch": "master", "commit": "f126af5345c7472e9a0cdbe1d1a29209be72c4c4" }, - "nvim-lspconfig": { "branch": "master", "commit": "52364267cd7edbc0e9b25ab3bfb1c8f45dd58fde" }, + "nvim-lspconfig": { "branch": "master", "commit": "408cf07b97535825cca6f1afa908d98348712ba6" }, "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "render-markdown.nvim": { "branch": "main", "commit": "f626e90bbc4b3d8f4fd29c909d958b165af13f4a" }, + "render-markdown.nvim": { "branch": "main", "commit": "e76eb2e4262f0f0a1a7bd7a454dd7d44f1299afd" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, + "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, @@ -52,6 +44,5 @@ "vim-dadbod-ui": { "branch": "master", "commit": "e8b53c0f3aa6e6127ac2a2d2071d9aade6c6e373" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, - "yanky.nvim": { "branch": "main", "commit": "04775cc6e10ef038c397c407bc17f00a2f52b378" } + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/lazyvim.json b/lazyvim.json index bcd9016..b84ac83 100644 --- a/lazyvim.json +++ b/lazyvim.json @@ -1,20 +1,14 @@ { "extras": [ - "lazyvim.plugins.extras.coding.mini-snippets", - "lazyvim.plugins.extras.coding.nvim-cmp", - "lazyvim.plugins.extras.coding.yanky", - "lazyvim.plugins.extras.formatting.prettier", "lazyvim.plugins.extras.lang.json", "lazyvim.plugins.extras.lang.markdown", "lazyvim.plugins.extras.lang.sql", "lazyvim.plugins.extras.lang.toml", - "lazyvim.plugins.extras.lang.typescript", - "lazyvim.plugins.extras.util.dot" + "lazyvim.plugins.extras.lang.typescript" ], "install_version": 8, "news": { "NEWS.md": "10960" }, "version": 8 -} - +} \ No newline at end of file diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index f384dbf..5af404f 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -4,7 +4,6 @@ local map = vim.keymap.set -map("n", "td", ":lua require('dbee').toggle()", { desc = "Toggle the database viewer" }) map("i", "", "<+1gv=gv", { desc = "Swap Lines (Below)" }) diff --git a/lua/plugins/folke.lua b/lua/plugins/folke.lua index 295d7b1..e401455 100644 --- a/lua/plugins/folke.lua +++ b/lua/plugins/folke.lua @@ -1,6 +1,7 @@ local snacksRootDirDesc = "Explorer Snacks (Root Dir)" local snacksCwdDesc = "Explorer Snacks (cwd)" +local pickerRootDirDesc = "Find Files (Root Dir)" local pickerCwdDesc = "Find Files (cwd)" local exploreExclude = { "**/node_modules/**" } @@ -10,6 +11,7 @@ local pickerExclude = return { { "folke/snacks.nvim", + ---@type snacks.Config opts = { picker = { sources = { @@ -26,43 +28,43 @@ return { }, keys = { { - "", + "fF", function() - Snacks.terminal(nil, {}) + Snacks.picker.files({ hidden = true, ignored = true, exclude = pickerExclude }) end, - desc = "Terminal (Root Dir)", + desc = pickerCwdDesc, }, - -- { - -- "fF", - -- function() - -- Snacks.picker.files({ cwd = LazyVim.root(), hidden = true, ignored = true, exclude = pickerExclude }) - -- end, - -- desc = "Find Files (Root Dir)", - -- }, - -- { - -- "ff", - -- function() - -- Snacks.picker.files({ hidden = true, ignored = true, exclude = pickerExclude }) - -- end, - -- desc = pickerCwdDesc, - -- }, - -- { - -- "fe", - -- function() - -- Snacks.explorer({ exclude = exploreExclude }) - -- end, - -- desc = snacksCwdDesc, - -- }, - -- { - -- "fE", - -- function() - -- Snacks.explorer({ cwd = LazyVim.root(), exclude = exploreExclude }) - -- end, - -- desc = snacksRootDirDesc, - -- }, - -- { "", "ff", desc = pickerCwdDesc, remap = true }, - -- { "e", "fe", desc = snacksCwdDesc, remap = true }, - -- { "E", "fE", desc = snacksRootDirDesc, remap = true }, + { + "ff", + function() + Snacks.picker.files({ cwd = LazyVim.root(), hidden = true, ignored = true, exclude = pickerExclude }) + end, + desc = pickerRootDirDesc, + }, + { + "fe", + function() + Snacks.explorer({ cwd = LazyVim.root(), exclude = exploreExclude }) + end, + desc = snacksRootDirDesc, + }, + { + "fE", + function() + Snacks.explorer({ exclude = exploreExclude }) + end, + desc = snacksCwdDesc, + }, + { + "f/", + function() + Snacks.explorer({ cwd = "/" }) + end, + desc = "Find Files (/)", + }, + { "", "ff", desc = pickerRootDirDesc, remap = true }, + { "e", "fe", desc = snacksRootDirDesc, remap = true }, + { "E", "fE", desc = snacksCwdDesc, remap = true }, }, }, } diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index fe007ed..8baeaa2 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -2,6 +2,17 @@ return { { "ThePrimeagen/vim-be-good" }, { "tpope/vim-sleuth" }, + -- LazyDev (Lua plugin typedefs) + { + "folke/lazydev.nvim", + ft = "lua", + opts = { + library = { + "~/.local/share/nvim-lazy/lazy/", -- Path to your lazy.nvim plugins + }, + }, + }, + -- AutoSession { "rmagatti/auto-session", @@ -15,22 +26,6 @@ return { -- log_level = 'debug', }, }, - -- DBee (Database UI) - { - "kndndrj/nvim-dbee", - dependencies = { - "MunifTanjim/nui.nvim", - }, - build = function() - -- Install tries to automatically detect the install method. - -- if it fails, try calling it with one of these parameters: - -- "curl", "wget", "bitsadmin", "go" - require("dbee").install() - end, - config = function() - require("dbee").setup(--[[optional config]]) - end, - }, -- Surround { @@ -44,42 +39,6 @@ return { end, }, - -- Toggleterm - { - "akinsho/toggleterm.nvim", - version = "*", - config = true, - }, - - -- LazyDev (Lua plugin typedefs) - { - "folke/lazydev.nvim", - ft = "lua", - opts = { - library = { - "~/.local/share/nvim-lazy/lazy/ ", -- Path to your lazy.nvim plugins - }, - }, - }, - - -- Chkn (Scratchpad) - { - "ericrswanny/chkn.nvim", - config = function() - require("chkn").setup() -- Use the default configuration - end, - lazy = false, - keys = { - { - ".", - function() - vim.cmd("silent! ChknToggle") - end, - desc = "Toggle Scratchpad", - }, - }, - }, - -- TMUX Navigator { "christoomey/vim-tmux-navigator", diff --git a/lua/plugins/supertab.lua b/lua/plugins/supertab.lua index 27ef3d2..d831f74 100644 --- a/lua/plugins/supertab.lua +++ b/lua/plugins/supertab.lua @@ -1,3 +1,7 @@ +-- since this is just an example spec, don't actually load anything here and return an empty spec +-- stylua: ignore +if true then return {} end + return { { "hrsh7th/nvim-cmp",