From 13f4ef936d2eec4816f7a9a31f1df95e3dc5e292 Mon Sep 17 00:00:00 2001 From: John Grant Date: Sun, 31 Aug 2025 15:12:05 -0400 Subject: [PATCH] get things working again --- lazy-lock.json | 10 +++++++--- lazyvim.json | 1 + lua/plugins/folke.lua | 18 ++++++++++++++++-- lua/plugins/init.lua | 19 +++++++++++++++++++ lua/plugins/supertab.lua | 18 ------------------ 5 files changed, 43 insertions(+), 23 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index a12c605..a4b7d1e 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,10 +1,12 @@ { "LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" }, - "SchemaStore.nvim": { "branch": "main", "commit": "8e74c08998fd786239caba373344f4e4601e21fe" }, + "SchemaStore.nvim": { "branch": "main", "commit": "dc34600801650c2c8bf62125b1f70f6cfffcc057" }, "auto-session": { "branch": "main", "commit": "3b5d8947cf16ac582ef00443ede4cdd3dfa23af9" }, - "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "catppuccin": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" }, + "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, + "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" }, @@ -23,8 +25,10 @@ "mini.pairs": { "branch": "main", "commit": "6e1cc569130f25b2c6fa16d8b21b31ddb1420a4a" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-lint": { "branch": "master", "commit": "f126af5345c7472e9a0cdbe1d1a29209be72c4c4" }, - "nvim-lspconfig": { "branch": "master", "commit": "408cf07b97535825cca6f1afa908d98348712ba6" }, + "nvim-lspconfig": { "branch": "master", "commit": "5f550bbb4d58bb2bfbbed4633fc69c3f0eccaf3a" }, + "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, diff --git a/lazyvim.json b/lazyvim.json index b84ac83..e98c9e0 100644 --- a/lazyvim.json +++ b/lazyvim.json @@ -1,5 +1,6 @@ { "extras": [ + "lazyvim.plugins.extras.coding.nvim-cmp", "lazyvim.plugins.extras.lang.json", "lazyvim.plugins.extras.lang.markdown", "lazyvim.plugins.extras.lang.sql", diff --git a/lua/plugins/folke.lua b/lua/plugins/folke.lua index e401455..5477700 100644 --- a/lua/plugins/folke.lua +++ b/lua/plugins/folke.lua @@ -1,5 +1,5 @@ -local snacksRootDirDesc = "Explorer Snacks (Root Dir)" -local snacksCwdDesc = "Explorer Snacks (cwd)" +local snacksRootDirDesc = "Explorer (Root Dir)" +local snacksCwdDesc = "Explorer (cwd)" local pickerRootDirDesc = "Find Files (Root Dir)" local pickerCwdDesc = "Find Files (cwd)" @@ -62,6 +62,20 @@ return { end, desc = "Find Files (/)", }, + { + "fh", + function() + Snacks.explorer({ cwd = "~" }) + end, + desc = "Explorer (Home)", + }, + { + "fH", + function() + Snacks.picker.files({ cwd = "~" }) + end, + desc = "Find Files (Home)", + }, { "", "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 8baeaa2..b3f3f16 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -79,4 +79,23 @@ return { }, }, }, + + -- Dadbob UI + { + "kristijanhusak/vim-dadbod-ui", + dependencies = { + { "tpope/vim-dadbod", lazy = true }, + { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true }, -- Optional + }, + cmd = { + "DBUI", + "DBUIToggle", + "DBUIAddConnection", + "DBUIFindBuffer", + }, + init = function() + -- Your DBUI configuration + vim.g.db_ui_use_nerd_fonts = 1 + end, + }, } diff --git a/lua/plugins/supertab.lua b/lua/plugins/supertab.lua index d831f74..f4bea12 100644 --- a/lua/plugins/supertab.lua +++ b/lua/plugins/supertab.lua @@ -1,25 +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", - dependencies = { - { - "MattiasMTS/cmp-dbee", - dependencies = { - { "kndndrj/nvim-dbee" }, - }, - ft = "sql", -- optional but good to have - opts = {}, -- needed - }, - }, opts = function(_, opts) - -- opts.sources = { - -- { "cmp-dbee" }, - -- } - local has_words_before = function() unpack = unpack or table.unpack local line, col = unpack(vim.api.nvim_win_get_cursor(0))