incase anything breaks

This commit is contained in:
John Grant 2025-08-29 20:13:55 -04:00
parent f8bd52db4f
commit 1fc22d3eff
5 changed files with 143 additions and 43 deletions

View file

@ -1,15 +1,16 @@
{
"LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" },
"SchemaStore.nvim": { "branch": "main", "commit": "433a310de5cbab41f1eb3424332a583e21e39f5c" },
"auto-session": { "branch": "main", "commit": "7d37d1cae7a39ff57da9a452d21b5dbfc5636c18" },
"SchemaStore.nvim": { "branch": "main", "commit": "8e74c08998fd786239caba373344f4e4601e21fe" },
"auto-session": { "branch": "main", "commit": "3b5d8947cf16ac582ef00443ede4cdd3dfa23af9" },
"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": "a0ab60ed666c56b37fd7ed1847d2ac52f2482ce0" },
"conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
"gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
@ -17,27 +18,28 @@
"harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
"lazydocker.nvim": { "branch": "main", "commit": "3330d1fc32ff2f52652d5abb1f75123ce5549cfc" },
"lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
"mini.ai": { "branch": "main", "commit": "1cd4f021a05c29acd4ab511c0981da14217daf38" },
"mini.icons": { "branch": "main", "commit": "b8f6fa6f5a3fd0c56936252edcd691184e5aac0c" },
"mini.pairs": { "branch": "main", "commit": "1e1ca3f60f58d4050bf814902b472eec9963a5dd" },
"mini.snippets": { "branch": "main", "commit": "752765aa04185d499e4f43506c434602eeb04e33" },
"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": "ee04d481d4e6089892c2fb2ad8924b1a053591e1" },
"nvim-lspconfig": { "branch": "master", "commit": "16878c7a018cba66a6e990286bdb6afc29ca13d3" },
"nvim-surround": { "branch": "main", "commit": "d56752df477ebd808cb82cea2fc68cf7455abb21" },
"nvim-lint": { "branch": "master", "commit": "f126af5345c7472e9a0cdbe1d1a29209be72c4c4" },
"nvim-lspconfig": { "branch": "master", "commit": "52364267cd7edbc0e9b25ab3bfb1c8f45dd58fde" },
"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": "c4ff9acddcf0f79b3187393319adb5cac5865bd3" },
"render-markdown.nvim": { "branch": "main", "commit": "f626e90bbc4b3d8f4fd29c909d958b165af13f4a" },
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
@ -47,8 +49,9 @@
"vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" },
"vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
"vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
"vim-dadbod-ui": { "branch": "master", "commit": "2900a1617b3df1a48683d872eadbe1101146a49a" },
"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" }
}

View file

@ -2,5 +2,10 @@
-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
-- Add any additional keymaps here
vim.keymap.set("n", "<leader>td", ':lua require("dbee").toggle()<cr>', { desc = "Toggle the database viewer" })
vim.keymap.set("t", "<esc><esc>", "<c-\\><c->", { desc = "Exit Terminal Mode" })
local map = vim.keymap.set
map("n", "<leader>td", ":lua require('dbee').toggle()<cr>", { desc = "Toggle the database viewer" })
map("i", "<S-Tab>", "<c-\\><c-n><<a", { desc = "Unindent Line" })
map("v", "J", ":m '>+1<CR>gv=gv", { desc = "Swap Lines (Below)" })
map("v", "K", ":m '<-2<CR>gv=gv", { desc = "Swap Lines (Above)" })

View file

@ -4,7 +4,8 @@ local snacksCwdDesc = "Explorer Snacks (cwd)"
local pickerCwdDesc = "Find Files (cwd)"
local exploreExclude = { "**/node_modules/**" }
local pickerExclude = { "**/node_modules/**", "**/.next/**", "**/.idea/**", "**/.vscode/**" }
local pickerExclude =
{ "**/node_modules/**", "**/.next/**", "**/.idea/**", "**/.vscode/**", "**/android/**", "**/ios/**", "**/.expo/**" }
return {
{
@ -25,36 +26,43 @@ return {
},
keys = {
{
"<leader>fF",
"<c-/>",
function()
Snacks.picker.files({ cwd = LazyVim.root(), hidden = true, ignored = true, exclude = pickerExclude })
Snacks.terminal(nil, {})
end,
desc = "Find Files (Root Dir)",
desc = "Terminal (Root Dir)",
},
{
"<leader>ff",
function()
Snacks.picker.files({ hidden = true, ignored = true, exclude = pickerExclude })
end,
desc = pickerCwdDesc,
},
{
"<leader>fe",
function()
Snacks.explorer({ exclude = exploreExclude })
end,
desc = snacksCwdDesc,
},
{
"<leader>fE",
function()
Snacks.explorer({ cwd = LazyVim.root(), exclude = exploreExclude })
end,
desc = snacksRootDirDesc,
},
{ "<leader><leader>", "<leader>ff", desc = pickerCwdDesc, remap = true },
{ "<leader>e", "<leader>fe", desc = snacksCwdDesc, remap = true },
{ "<leader>E", "<leader>fE", desc = snacksRootDirDesc, remap = true },
-- {
-- "<leader>fF",
-- function()
-- Snacks.picker.files({ cwd = LazyVim.root(), hidden = true, ignored = true, exclude = pickerExclude })
-- end,
-- desc = "Find Files (Root Dir)",
-- },
-- {
-- "<leader>ff",
-- function()
-- Snacks.picker.files({ hidden = true, ignored = true, exclude = pickerExclude })
-- end,
-- desc = pickerCwdDesc,
-- },
-- {
-- "<leader>fe",
-- function()
-- Snacks.explorer({ exclude = exploreExclude })
-- end,
-- desc = snacksCwdDesc,
-- },
-- {
-- "<leader>fE",
-- function()
-- Snacks.explorer({ cwd = LazyVim.root(), exclude = exploreExclude })
-- end,
-- desc = snacksRootDirDesc,
-- },
-- { "<leader><leader>", "<leader>ff", desc = pickerCwdDesc, remap = true },
-- { "<leader>e", "<leader>fe", desc = snacksCwdDesc, remap = true },
-- { "<leader>E", "<leader>fE", desc = snacksRootDirDesc, remap = true },
},
},
}

View file

@ -61,4 +61,63 @@ return {
},
},
},
-- Chkn (Scratchpad)
{
"ericrswanny/chkn.nvim",
config = function()
require("chkn").setup() -- Use the default configuration
end,
lazy = false,
keys = {
{
"<leader>.",
function()
vim.cmd("silent! ChknToggle")
end,
desc = "Toggle Scratchpad",
},
},
},
-- TMUX Navigator
{
"christoomey/vim-tmux-navigator",
cmd = {
"TmuxNavigateLeft",
"TmuxNavigateDown",
"TmuxNavigateUp",
"TmuxNavigateRight",
"TmuxNavigatePrevious",
"TmuxNavigatorProcessList",
},
keys = {
{ "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>" },
{ "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>" },
{ "<c-k>", "<cmd><C-U>TmuxNavigateUp<cr>" },
{ "<c-l>", "<cmd><C-U>TmuxNavigateRight<cr>" },
--{ "<c-\\>", "<cmd><C-U>TmuxNavigatePrevious<cr>" },
},
},
-- lazydocker.nvim
{
"mgierada/lazydocker.nvim",
dependencies = { "akinsho/toggleterm.nvim" },
config = function()
require("lazydocker").setup({
border = "curved", -- valid options are "single" | "double" | "shadow" | "curved"
})
end,
event = "BufRead",
keys = {
{
"<leader>dd",
function()
require("lazydocker").open()
end,
desc = "Open Lazydocker floating window",
},
},
},
}

View file

@ -25,7 +25,15 @@ return {
local cmp = require("cmp")
opts.mapping = vim.tbl_extend("force", opts.mapping, {
["<CR>"] = cmp.mapping(function(fallback)
-- ["<CR>"] = cmp.mapping(function(fallback)
-- if cmp.visible() then
-- print("CLOSING")
-- cmp.close()
-- else
-- fallback()
-- end
-- end, { "i", "s" }),
["<ESC>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.close()
else
@ -47,6 +55,23 @@ return {
fallback()
end
end, { "i", "s" }),
["<C-Space>"] = cmp.mapping(function(fallback)
if cmp.visible() then
-- You could replace select_next_item() with confirm({ select = true }) to get VS Code autocompletion behavior
--cmp.select_next_item()
cmp.confirm({ select = true })
elseif vim.snippet.active({ direction = 1 }) then
vim.schedule(function()
vim.snippet.jump(1)
end)
elseif has_words_before() then
cmp.complete()
elseif vim.api.nvim_get_mode()["mode"] == "i" then
-- Nothing to do here, but don't fallback
else
fallback()
end
end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()