From 35aaf58a926e4a5329d88a85b500534dbc5e2b8e Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Sat, 30 Dec 2023 17:47:22 -0800 Subject: [PATCH 001/240] Initial commit --- init.lua | 63 ++++++++++++++++++++++++++++++++++++++ lazy-lock.json | 23 ++++++++++++++ lua/keybinds.lua | 21 +++++++++++++ lua/plugins/commentary.lua | 3 ++ lua/plugins/completion.lua | 56 +++++++++++++++++++++++++++++++++ lua/plugins/fugitive.lua | 9 ++++++ lua/plugins/lsp-config.lua | 47 ++++++++++++++++++++++++++++ lua/plugins/lualine.lua | 12 ++++++++ lua/plugins/neo-tree.lua | 12 ++++++++ lua/plugins/surround.lua | 3 ++ lua/plugins/telescope.lua | 31 +++++++++++++++++++ lua/plugins/tokyonight.lua | 9 ++++++ lua/plugins/treesitter.lua | 18 +++++++++++ lua/plugins/trouble.lua | 7 +++++ 14 files changed, 314 insertions(+) create mode 100644 init.lua create mode 100644 lazy-lock.json create mode 100644 lua/keybinds.lua create mode 100644 lua/plugins/commentary.lua create mode 100644 lua/plugins/completion.lua create mode 100644 lua/plugins/fugitive.lua create mode 100644 lua/plugins/lsp-config.lua create mode 100644 lua/plugins/lualine.lua create mode 100644 lua/plugins/neo-tree.lua create mode 100644 lua/plugins/surround.lua create mode 100644 lua/plugins/telescope.lua create mode 100644 lua/plugins/tokyonight.lua create mode 100644 lua/plugins/treesitter.lua create mode 100644 lua/plugins/trouble.lua diff --git a/init.lua b/init.lua new file mode 100644 index 0000000..708b323 --- /dev/null +++ b/init.lua @@ -0,0 +1,63 @@ +vim.g.mapleader = " " +vim.g.maplocalleader = " " + +vim.opt.belloff = "all" +vim.opt.backspace = "2" +vim.opt.showcmd = true +vim.opt.laststatus = 2 +vim.opt.swapfile = false + +vim.opt.number = true +vim.opt.relativenumber = true +vim.opt.signcolumn = "yes" + +vim.opt.autoindent = true +vim.opt.smartindent = true +vim.opt.smarttab = true +vim.opt.expandtab = true +vim.opt.shiftwidth = 4 +vim.opt.tabstop = 2 +vim.opt.softtabstop = 2 +vim.opt.copyindent = true + +vim.opt.scrolloff = 2 +vim.opt.splitright = true +vim.opt.splitbelow = true +vim.opt.wrap = false +vim.opt.cursorline = true + +vim.opt.hlsearch = false +vim.opt.incsearch = true + +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + +-- Fix for yanking to system clipboard on Windows +if vim.fn.has('wsl') == 1 then + vim.g.clipboard = { + name = 'WslClipboard', + copy = { + ['+'] = 'clip.exe', + ['*'] = 'clip.exe', + }, + paste = { + ['+'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', + ['*'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', + }, + cache_enabled = 0, + } +end + +require("lazy").setup("plugins") +require("keybinds") + diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 0000000..5e5948c --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,23 @@ +{ + "LuaSnip": { "branch": "master", "commit": "2463d687fe704b76eb0aa3bb34e95f69a5bb0362" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, + "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, + "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, + "nvim-lspconfig": { "branch": "master", "commit": "0d9e870d01894c592d7ea93cfe0fa451916d9a7f" }, + "nvim-treesitter": { "branch": "master", "commit": "e49f1e8ef3e8450a8446cb1f2bbb53c919f60b6d" }, + "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" }, + "nvim-web-devicons": { "branch": "master", "commit": "808627b8d412b2a6b6fc6eed816fec3557198b01" }, + "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, + "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" }, + "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, + "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" }, + "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, + "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" } +} \ No newline at end of file diff --git a/lua/keybinds.lua b/lua/keybinds.lua new file mode 100644 index 0000000..7c9a52f --- /dev/null +++ b/lua/keybinds.lua @@ -0,0 +1,21 @@ +vim.keymap.set("n", "", "", {}) +vim.keymap.set("n", "", "", {}) +vim.keymap.set("n", "", "", {}) +vim.keymap.set("n", "", "", {}) + +-- Move visual blocks around using J/K (up/down) +vim.keymap.set("v", "J", ":m '>+1gv=gv", {}) +vim.keymap.set("v", "K", ":m '<-2gv=gv", {}) + +-- Keep search terms in the middle of the screen +vim.keymap.set("n", "n", "nzzzv", {}) +vim.keymap.set("n", "N", "Nzzzv", {}) + +-- Paste without replacing clipboard contents +vim.keymap.set("x", "p", "\"_dP", {}) + +-- Yank into system clipboard +vim.keymap.set("n", "y", "\"+y", {}) + +-- Like ciw on the text under the cursor +vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) diff --git a/lua/plugins/commentary.lua b/lua/plugins/commentary.lua new file mode 100644 index 0000000..4e85c75 --- /dev/null +++ b/lua/plugins/commentary.lua @@ -0,0 +1,3 @@ +return { + "tpope/vim-commentary" +} diff --git a/lua/plugins/completion.lua b/lua/plugins/completion.lua new file mode 100644 index 0000000..e3f01ac --- /dev/null +++ b/lua/plugins/completion.lua @@ -0,0 +1,56 @@ +return { + { + "hrsh7th/nvim-cmp", + config = function() + local cmp = require("cmp") + + cmp.setup({ + -- Highlights the first result always + completion = { + completeopt = "menu,menuone,noinsert" + }, + + 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 = "luasnip" } + }, { + { name = "buffer" } + }) + }) + end + }, + { + "hrsh7th/cmp-nvim-lsp" + }, + { + "L3MON4D3/LuaSnip" + } +} diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua new file mode 100644 index 0000000..a2e0c75 --- /dev/null +++ b/lua/plugins/fugitive.lua @@ -0,0 +1,9 @@ +return { + "tpope/vim-fugitive", + config = function () + vim.keymap.set("n", "gs", vim.cmd.Git) + vim.keymap.set("n", "gh", "diffget //2") + vim.keymap.set("n", "gl", "diffget //3") + end +} + diff --git a/lua/plugins/lsp-config.lua b/lua/plugins/lsp-config.lua new file mode 100644 index 0000000..bda5a51 --- /dev/null +++ b/lua/plugins/lsp-config.lua @@ -0,0 +1,47 @@ +return { + { + "williamboman/mason.nvim", + config = function() + require("mason").setup() + end + }, + { + "williamboman/mason-lspconfig.nvim", + config = function() + require("mason-lspconfig").setup({ + ensure_installed = { "lua_ls", "tsserver", "eslint" } + }) + end + }, + { + "neovim/nvim-lspconfig", + config = function() + local lspconfig = require("lspconfig") + local capabilities = require("cmp_nvim_lsp").default_capabilities() + + lspconfig.lua_ls.setup({ + capabilities = capabilities + }) + + lspconfig.tsserver.setup({ + capabilities = capabilities + }) + + -- Runs :EslintFixAll when saving + lspconfig.eslint.setup({ + on_attach = function(_, bufnr) + vim.api.nvim_create_autocmd("BufWritePre", { + buffer = bufnr, + command = "EslintFixAll", + }) + end + }) + + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, {}) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, {}) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, {}) + vim.keymap.set('n', 'f', vim.lsp.buf.format, {}) + vim.keymap.set('n', 'vca', vim.lsp.buf.code_action, {}) + end + } +} diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua new file mode 100644 index 0000000..b368357 --- /dev/null +++ b/lua/plugins/lualine.lua @@ -0,0 +1,12 @@ +return { + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + require('lualine').setup({ + options = { + icons_enabled = true, + theme = 'tokyonight' + } + }) + end +} diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua new file mode 100644 index 0000000..b0bbc1f --- /dev/null +++ b/lua/plugins/neo-tree.lua @@ -0,0 +1,12 @@ +return { + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + config = function() + vim.keymap.set("n", "nn", ":Neotree", {}) + end +} diff --git a/lua/plugins/surround.lua b/lua/plugins/surround.lua new file mode 100644 index 0000000..b5dd6ff --- /dev/null +++ b/lua/plugins/surround.lua @@ -0,0 +1,3 @@ +return { + "tpope/vim-surround" +} diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua new file mode 100644 index 0000000..29b009e --- /dev/null +++ b/lua/plugins/telescope.lua @@ -0,0 +1,31 @@ +return { + { + 'nvim-telescope/telescope.nvim', + tag = '0.1.5', + dependencies = { 'nvim-lua/plenary.nvim' }, + config = function() + local builtin = require('telescope.builtin') + + vim.keymap.set('n', 'pp', builtin.git_files, {}) + vim.keymap.set('n', 'pf', builtin.find_files, {}) + vim.keymap.set('n', 'fh', builtin.help_tags, {}) + vim.keymap.set('n', 'ps', function() + builtin.grep_string({ search = vim.fn.input("Grep > ") }) + end) + end + }, + { + "nvim-telescope/telescope-ui-select.nvim", + config = function() + require("telescope").setup { + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown {} + } + } + } + + require("telescope").load_extension("ui-select") + end + } +} diff --git a/lua/plugins/tokyonight.lua b/lua/plugins/tokyonight.lua new file mode 100644 index 0000000..6c6b53e --- /dev/null +++ b/lua/plugins/tokyonight.lua @@ -0,0 +1,9 @@ +return { + "folke/tokyonight.nvim", + lazy = false, + priority = 1000, + opts = {}, + config = function() + vim.cmd.colorscheme "tokyonight" + end +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua new file mode 100644 index 0000000..5bcb754 --- /dev/null +++ b/lua/plugins/treesitter.lua @@ -0,0 +1,18 @@ +return { + { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + config = function() + local config = require("nvim-treesitter.configs") + config.setup({ + ensure_installed = { "lua", "javascript", "typescript", "tsx" }, + sync_install = false, + highlight = { enable = true }, + indent = { enable = true } + }) + end + }, + { + "nvim-treesitter/nvim-treesitter-context" + } +} diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua new file mode 100644 index 0000000..b1ad96d --- /dev/null +++ b/lua/plugins/trouble.lua @@ -0,0 +1,7 @@ +return { + "folke/trouble.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + vim.keymap.set("n", "tt", ":TroubleToggle", {}) + end + } From 85e20d0e92920a438365a7264ea759f8ad680ce6 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Sat, 30 Dec 2023 21:59:42 -0800 Subject: [PATCH 002/240] fix: update neo-tree to show dotfiles --- lua/plugins/neo-tree.lua | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index b0bbc1f..d8cb3b7 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -2,11 +2,22 @@ return { "nvim-neo-tree/neo-tree.nvim", branch = "v3.x", dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", }, config = function() vim.keymap.set("n", "nn", ":Neotree", {}) + + local nt = require("neo-tree") + + nt.setup({ + filesystem = { + filtered_items = { + hide_dotfiles = false, + hide_gitignored = true, + } + } + }) end } From c08291b5b2cab2e607fbda1b8d67614c716a90f3 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Sat, 30 Dec 2023 22:26:50 -0800 Subject: [PATCH 003/240] feat: add autopairs plugin --- lazy-lock.json | 1 + lua/plugins/treesitter.lua | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/lazy-lock.json b/lazy-lock.json index 5e5948c..3bd79ea 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -7,6 +7,7 @@ "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, + "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-lspconfig": { "branch": "master", "commit": "0d9e870d01894c592d7ea93cfe0fa451916d9a7f" }, "nvim-treesitter": { "branch": "master", "commit": "e49f1e8ef3e8450a8446cb1f2bbb53c919f60b6d" }, diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 5bcb754..b21d1ff 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -14,5 +14,10 @@ return { }, { "nvim-treesitter/nvim-treesitter-context" + }, + { + 'windwp/nvim-autopairs', + event = "InsertEnter", + opts = {} } } From f043f923bd97257bfb17e267a8781a2046012bf2 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Sat, 30 Dec 2023 22:35:05 -0800 Subject: [PATCH 004/240] fix: yank into system clipboard for n and v modes --- lua/keybinds.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index 7c9a52f..e8a7ec9 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -15,7 +15,8 @@ vim.keymap.set("n", "N", "Nzzzv", {}) vim.keymap.set("x", "p", "\"_dP", {}) -- Yank into system clipboard -vim.keymap.set("n", "y", "\"+y", {}) +vim.keymap.set("n", "y", "\"*y", {}) +vim.keymap.set("v", "y", "\"*y", {}) -- Like ciw on the text under the cursor vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) From 72411cfbcfeedecd97d935d6fa5730282a58601c Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:38:37 -0800 Subject: [PATCH 005/240] feat: update neo-tree config to show env files --- lazy-lock.json | 8 ++++---- lua/plugins/neo-tree.lua | 11 ++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 3bd79ea..ea6a6cb 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "2463d687fe704b76eb0aa3bb34e95f69a5bb0362" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, @@ -9,10 +9,10 @@ "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, - "nvim-lspconfig": { "branch": "master", "commit": "0d9e870d01894c592d7ea93cfe0fa451916d9a7f" }, - "nvim-treesitter": { "branch": "master", "commit": "e49f1e8ef3e8450a8446cb1f2bbb53c919f60b6d" }, + "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, + "nvim-treesitter": { "branch": "master", "commit": "65ef62092ef997d2ecf68ede01a0afbda17808c3" }, "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" }, - "nvim-web-devicons": { "branch": "master", "commit": "808627b8d412b2a6b6fc6eed816fec3557198b01" }, + "nvim-web-devicons": { "branch": "master", "commit": "cff25ce621e6d15fae0b0bfe38c00be50ce38468" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index d8cb3b7..f67dfbc 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -14,9 +14,18 @@ return { nt.setup({ filesystem = { filtered_items = { + show_hidden_count = false, hide_dotfiles = false, hide_gitignored = true, - } + always_show = { + ".env" + }, + never_show = { + ".git", + "thumbs.db", + ".DS_Store" + } + }, } }) end From 01a66527f806b6fb36e0c28f318a44f457830bab Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:43:23 -0800 Subject: [PATCH 006/240] feat: add todo-comments.nvim --- lazy-lock.json | 1 + lua/plugins/todo-comments.lua | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 lua/plugins/todo-comments.lua diff --git a/lazy-lock.json b/lazy-lock.json index ea6a6cb..d414243 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -16,6 +16,7 @@ "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" }, diff --git a/lua/plugins/todo-comments.lua b/lua/plugins/todo-comments.lua new file mode 100644 index 0000000..2ca05d6 --- /dev/null +++ b/lua/plugins/todo-comments.lua @@ -0,0 +1,5 @@ +return { + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = {}, +} From d961ba0c605c27025f2b492f345a551c5c40ca36 Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:52:34 -0800 Subject: [PATCH 007/240] feat: add which-key.nvim --- lazy-lock.json | 3 ++- lua/plugins/which-key.lua | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 lua/plugins/which-key.lua diff --git a/lazy-lock.json b/lazy-lock.json index d414243..7f63a2b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -21,5 +21,6 @@ "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" }, "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, - "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" } + "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua new file mode 100644 index 0000000..410f8db --- /dev/null +++ b/lua/plugins/which-key.lua @@ -0,0 +1,9 @@ +return { + "folke/which-key.nvim", + event = "VeryLazy", + init = function() + vim.o.timeout = true + vim.o.timeoutlen = 300 + end, + opts = {} +} From a5d38f9ac447cf52afd05ddb0694275f30bc38fd Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:03:54 -0800 Subject: [PATCH 008/240] feat: add hardtime.nvim --- init.lua | 1 + lazy-lock.json | 1 + lua/plugins/hardtime.lua | 14 ++++++++++++++ 3 files changed, 16 insertions(+) create mode 100644 lua/plugins/hardtime.lua diff --git a/init.lua b/init.lua index 708b323..818e495 100644 --- a/init.lua +++ b/init.lua @@ -25,6 +25,7 @@ vim.opt.splitright = true vim.opt.splitbelow = true vim.opt.wrap = false vim.opt.cursorline = true +vim.opt.cmdheight = 2 vim.opt.hlsearch = false vim.opt.incsearch = true diff --git a/lazy-lock.json b/lazy-lock.json index 7f63a2b..02aceab 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,7 @@ { "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "hardtime.nvim": { "branch": "main", "commit": "4ba3be553fa0b713c7b817f6d201b07d282accf3" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, diff --git a/lua/plugins/hardtime.lua b/lua/plugins/hardtime.lua new file mode 100644 index 0000000..4fd94bb --- /dev/null +++ b/lua/plugins/hardtime.lua @@ -0,0 +1,14 @@ +return { + "m4xshen/hardtime.nvim", + dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, + opts = { + disable_mouse = true, + disabled_keys = { + -- Drill Sergeant Demchuk! + [""] = {"", "i"}, + [""] = {"", "i"}, + [""] = {"", "i"}, + [""] = {"", "i"} + } + } +} From f11252f073d436fcff97d551af25b2cf1757b106 Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Thu, 4 Jan 2024 20:00:56 -0800 Subject: [PATCH 009/240] fix: update completion behaviour --- lua/plugins/completion.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lua/plugins/completion.lua b/lua/plugins/completion.lua index e3f01ac..18d888f 100644 --- a/lua/plugins/completion.lua +++ b/lua/plugins/completion.lua @@ -29,7 +29,10 @@ return { fallback() end end, { "i" }), - [""] = cmp.mapping.confirm({ select = true }) + [""] = cmp.mapping.confirm({ + behaviour = cmp.ConfirmBehavior.Insert, + select = true + }) }), snippet = { From 3120c51c8490f7c66f2f747a4ae2e308910a9d5e Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Thu, 4 Jan 2024 20:01:07 -0800 Subject: [PATCH 010/240] fix: context to max 2 lines --- lua/plugins/treesitter.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index b21d1ff..81c7fae 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -13,7 +13,10 @@ return { end }, { - "nvim-treesitter/nvim-treesitter-context" + "nvim-treesitter/nvim-treesitter-context", + opts = { + max_lines = 2, + } }, { 'windwp/nvim-autopairs', From 9f98fb46ce09273e07351c87fd67061bc6c1e6fa Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:44:45 -0800 Subject: [PATCH 011/240] feat: add descriptions for keybinds --- lua/keybinds.lua | 29 ++++++++++++----------------- lua/plugins/fugitive.lua | 7 ++++--- lua/plugins/hardtime.lua | 12 ++++++++++++ lua/plugins/lsp-config.lua | 10 +++++----- lua/plugins/neo-tree.lua | 2 +- lua/plugins/telescope.lua | 8 ++++---- lua/plugins/trouble.lua | 2 +- 7 files changed, 39 insertions(+), 31 deletions(-) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index e8a7ec9..9258c85 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -1,22 +1,17 @@ -vim.keymap.set("n", "", "", {}) -vim.keymap.set("n", "", "", {}) -vim.keymap.set("n", "", "", {}) -vim.keymap.set("n", "", "", {}) +vim.keymap.set("n", "", "", { desc = "Go to split on left" }) +vim.keymap.set("n", "", "", { desc = "Go to split above"}) +vim.keymap.set("n", "", "", { desc = "Go to split below"}) +vim.keymap.set("n", "", "", { desc = "Go to split on right" }) --- Move visual blocks around using J/K (up/down) -vim.keymap.set("v", "J", ":m '>+1gv=gv", {}) -vim.keymap.set("v", "K", ":m '<-2gv=gv", {}) +vim.keymap.set("v", "J", ":m '>+1gv=gv", { desc = "Move lines under cursor up" }) +vim.keymap.set("v", "K", ":m '<-2gv=gv", { desc = "Move lines under cursor down" }) --- Keep search terms in the middle of the screen -vim.keymap.set("n", "n", "nzzzv", {}) -vim.keymap.set("n", "N", "Nzzzv", {}) +vim.keymap.set("n", "n", "nzzzv", { desc = "Go to next search result and keep cursor centered on screen" }) +vim.keymap.set("n", "N", "Nzzzv", { desc = "Go to previous search result and keep cursor centered on screen" }) --- Paste without replacing clipboard contents -vim.keymap.set("x", "p", "\"_dP", {}) +vim.keymap.set("x", "p", "\"_dP", { desc = "Paste without replacing clipboard contents" }) --- Yank into system clipboard -vim.keymap.set("n", "y", "\"*y", {}) -vim.keymap.set("v", "y", "\"*y", {}) +vim.keymap.set("n", "y", "\"*y", { desc = "Yank into system clipboard" }) +vim.keymap.set("v", "y", "\"*y", { desc = "Yank into system clipboard" }) --- Like ciw on the text under the cursor -vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) +vim.keymap.set("n", "s", [[:%s/\<\>//gI]], { desc = "Like `ciw` for any highlighted text (doesn't have to be word)"}) diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua index a2e0c75..9636763 100644 --- a/lua/plugins/fugitive.lua +++ b/lua/plugins/fugitive.lua @@ -1,9 +1,10 @@ return { "tpope/vim-fugitive", config = function () - vim.keymap.set("n", "gs", vim.cmd.Git) - vim.keymap.set("n", "gh", "diffget //2") - vim.keymap.set("n", "gl", "diffget //3") + vim.keymap.set("n", "gs", vim.cmd.Git, { desc = "View `git status`" }) + vim.keymap.set("n", "gh", "diffget //2", { desc = "Pick gitdiff on left" }) + vim.keymap.set("n", "gl", "diffget //3", { desc = "Pick gitdiff on right" }) + vim.keymap.set("n", "gp", ":Git push", { desc = "Run `git push`" }) end } diff --git a/lua/plugins/hardtime.lua b/lua/plugins/hardtime.lua index 4fd94bb..8b090fd 100644 --- a/lua/plugins/hardtime.lua +++ b/lua/plugins/hardtime.lua @@ -9,6 +9,18 @@ return { [""] = {"", "i"}, [""] = {"", "i"}, [""] = {"", "i"} + }, + disabled_filetypes = { + "checkhealth", + "fugitive", + "help", + "lazy", + "mason", + "neo-tree", + "neo-tree-popup", + "netrw", + "noice", + "notify", } } } diff --git a/lua/plugins/lsp-config.lua b/lua/plugins/lsp-config.lua index bda5a51..f418bac 100644 --- a/lua/plugins/lsp-config.lua +++ b/lua/plugins/lsp-config.lua @@ -37,11 +37,11 @@ return { end }) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, {}) - vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, {}) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, {}) - vim.keymap.set('n', 'f', vim.lsp.buf.format, {}) - vim.keymap.set('n', 'vca', vim.lsp.buf.code_action, {}) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = "Go to definition" }) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { desc = "Go to implementation" }) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, { desc = "Show signature" }) + vim.keymap.set('n', 'f', vim.lsp.buf.format, { desc = "Format buffer" }) + vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, { desc = "View code actions" }) end } } diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index f67dfbc..3855db3 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -7,7 +7,7 @@ return { "MunifTanjim/nui.nvim", }, config = function() - vim.keymap.set("n", "nn", ":Neotree", {}) + vim.keymap.set("n", "nn", ":Neotree", { desc = "Open Neotree" }) local nt = require("neo-tree") diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 29b009e..ff69daa 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -6,12 +6,12 @@ return { config = function() local builtin = require('telescope.builtin') - vim.keymap.set('n', 'pp', builtin.git_files, {}) - vim.keymap.set('n', 'pf', builtin.find_files, {}) - vim.keymap.set('n', 'fh', builtin.help_tags, {}) + vim.keymap.set('n', 'pp', builtin.git_files, { desc = "Search git_files" }) + vim.keymap.set('n', 'pf', builtin.find_files, { desc = "Search all files "}) + vim.keymap.set('n', 'fh', builtin.help_tags, { desc = "View help tags" }) vim.keymap.set('n', 'ps', function() builtin.grep_string({ search = vim.fn.input("Grep > ") }) - end) + end, { desc = "Grep entire project for string" }) end }, { diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua index b1ad96d..e7a9de2 100644 --- a/lua/plugins/trouble.lua +++ b/lua/plugins/trouble.lua @@ -2,6 +2,6 @@ return { "folke/trouble.nvim", dependencies = { "nvim-tree/nvim-web-devicons" }, config = function() - vim.keymap.set("n", "tt", ":TroubleToggle", {}) + vim.keymap.set("n", "tt", ":TroubleToggle", { desc = "Toggle Trouble" }) end } From 0dcc4fa0edd26c7fa2f6fb665b0acb08a89b38a4 Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:06:19 -0800 Subject: [PATCH 012/240] feat: moved linting and formatting to plugins --- lazy-lock.json | 3 +++ lua/plugins/lint.lua | 26 +++++++++++++++++++ lua/plugins/lsp-config.lua | 53 +++++++++++++++++++++++++++++--------- 3 files changed, 70 insertions(+), 12 deletions(-) create mode 100644 lua/plugins/lint.lua diff --git a/lazy-lock.json b/lazy-lock.json index 02aceab..abaf2df 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,15 +1,18 @@ { "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "conform.nvim": { "branch": "master", "commit": "75e7c5c7eb5fbd53f8b12dc420b31ec70770b231" }, "hardtime.nvim": { "branch": "main", "commit": "4ba3be553fa0b713c7b817f6d201b07d282accf3" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, + "nvim-lint": { "branch": "master", "commit": "8df53b5dde8ea80f0a039775777eae6648a10229" }, "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, "nvim-treesitter": { "branch": "master", "commit": "65ef62092ef997d2ecf68ede01a0afbda17808c3" }, "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" }, diff --git a/lua/plugins/lint.lua b/lua/plugins/lint.lua new file mode 100644 index 0000000..2d279dd --- /dev/null +++ b/lua/plugins/lint.lua @@ -0,0 +1,26 @@ +return { + "mfussenegger/nvim-lint", + event = { + "BufReadPre", + "BufNewFile", + }, + config = function () + local lint = require("lint") + + lint.linters_by_ft = { + javascript = { "eslint_d" }, + typescript = { "eslint_d" }, + javascriptreact = { "eslint_d" }, + typescriptreact = { "eslint_d" }, + } + + local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) + + vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { + group = lint_augroup, + callback = function () + lint.try_lint() + end + }) + end +} diff --git a/lua/plugins/lsp-config.lua b/lua/plugins/lsp-config.lua index f418bac..a0b1eed 100644 --- a/lua/plugins/lsp-config.lua +++ b/lua/plugins/lsp-config.lua @@ -2,14 +2,14 @@ return { { "williamboman/mason.nvim", config = function() - require("mason").setup() + require("mason").setup() end }, { "williamboman/mason-lspconfig.nvim", config = function() require("mason-lspconfig").setup({ - ensure_installed = { "lua_ls", "tsserver", "eslint" } + ensure_installed = { "lua_ls", "tsserver" } }) end }, @@ -27,21 +27,50 @@ return { capabilities = capabilities }) - -- Runs :EslintFixAll when saving - lspconfig.eslint.setup({ - on_attach = function(_, bufnr) - vim.api.nvim_create_autocmd("BufWritePre", { - buffer = bufnr, - command = "EslintFixAll", - }) - end - }) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = "Go to definition" }) vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { desc = "Go to implementation" }) vim.keymap.set('n', 'K', vim.lsp.buf.hover, { desc = "Show signature" }) vim.keymap.set('n', 'f', vim.lsp.buf.format, { desc = "Format buffer" }) vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, { desc = "View code actions" }) end + }, + { + "WhoIsSethDaniel/mason-tool-installer.nvim", + config = function() + local mason_tool_installer = require("mason-tool-installer") + + mason_tool_installer.setup({ + ensure_installed = { + "prettierd", + "eslint_d", + }, + automatic_installation = true + }) + end + }, + { + "stevearc/conform.nvim", + opts = { + formatters_by_ft = { + lua = { "stylua" }, + javascript = { "eslint_d" }, + javascriptreact = { "eslint_d" }, + json = { "prettierd" }, + jsonc = { "prettierd" }, + yaml = { "prettierd" }, + typescript = { "eslint_d" }, + typescriptreact = { "eslint_d" }, + html = { "prettierd" }, + ejs = { "prettierd" }, + css = { "prettierd" }, + scss = { "prettierd" }, + graphql = { "prettierd" }, + markdown = { "prettierd" }, + ["_"] = { "trim_whitespace" }, + }, + format_on_save = { + lsp_fallback = true, + }, + }, } } From 580a30e305dd67b61d2f606cdf77391be1f8966d Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:09:27 -0800 Subject: [PATCH 013/240] fix: format config files --- init.lua | 17 ++++++++--------- lua/keybinds.lua | 7 ++++--- lua/plugins/completion.lua | 8 ++++---- lua/plugins/fugitive.lua | 3 +-- lua/plugins/hardtime.lua | 14 +++++++------- lua/plugins/lint.lua | 4 ++-- lua/plugins/telescope.lua | 10 +++++----- lua/plugins/trouble.lua | 2 +- 8 files changed, 32 insertions(+), 33 deletions(-) diff --git a/init.lua b/init.lua index 818e495..93f817c 100644 --- a/init.lua +++ b/init.lua @@ -32,14 +32,14 @@ vim.opt.incsearch = true local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) end vim.opt.rtp:prepend(lazypath) @@ -61,4 +61,3 @@ end require("lazy").setup("plugins") require("keybinds") - diff --git a/lua/keybinds.lua b/lua/keybinds.lua index 9258c85..ca9d9ea 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -1,6 +1,6 @@ vim.keymap.set("n", "", "", { desc = "Go to split on left" }) -vim.keymap.set("n", "", "", { desc = "Go to split above"}) -vim.keymap.set("n", "", "", { desc = "Go to split below"}) +vim.keymap.set("n", "", "", { desc = "Go to split above" }) +vim.keymap.set("n", "", "", { desc = "Go to split below" }) vim.keymap.set("n", "", "", { desc = "Go to split on right" }) vim.keymap.set("v", "J", ":m '>+1gv=gv", { desc = "Move lines under cursor up" }) @@ -14,4 +14,5 @@ vim.keymap.set("x", "p", "\"_dP", { desc = "Paste without replacing clip vim.keymap.set("n", "y", "\"*y", { desc = "Yank into system clipboard" }) vim.keymap.set("v", "y", "\"*y", { desc = "Yank into system clipboard" }) -vim.keymap.set("n", "s", [[:%s/\<\>//gI]], { desc = "Like `ciw` for any highlighted text (doesn't have to be word)"}) +vim.keymap.set("n", "s", [[:%s/\<\>//gI]], + { desc = "Like `ciw` for any highlighted text (doesn't have to be word)" }) diff --git a/lua/plugins/completion.lua b/lua/plugins/completion.lua index 18d888f..6696501 100644 --- a/lua/plugins/completion.lua +++ b/lua/plugins/completion.lua @@ -15,14 +15,14 @@ return { [""] = cmp.mapping.scroll_docs(4), [""] = cmp.mapping.complete(), [""] = cmp.mapping.abort(), - [""] = cmp.mapping(function (fallback) + [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() else fallback() end end, { "i" }), - [""] = cmp.mapping(function (fallback) + [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() else @@ -45,8 +45,8 @@ return { { name = "nvim_lsp" }, { name = "luasnip" } }, { - { name = "buffer" } - }) + { name = "buffer" } + }) }) end }, diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua index 9636763..b9a587d 100644 --- a/lua/plugins/fugitive.lua +++ b/lua/plugins/fugitive.lua @@ -1,10 +1,9 @@ return { "tpope/vim-fugitive", - config = function () + config = function() vim.keymap.set("n", "gs", vim.cmd.Git, { desc = "View `git status`" }) vim.keymap.set("n", "gh", "diffget //2", { desc = "Pick gitdiff on left" }) vim.keymap.set("n", "gl", "diffget //3", { desc = "Pick gitdiff on right" }) vim.keymap.set("n", "gp", ":Git push", { desc = "Run `git push`" }) end } - diff --git a/lua/plugins/hardtime.lua b/lua/plugins/hardtime.lua index 8b090fd..2848a46 100644 --- a/lua/plugins/hardtime.lua +++ b/lua/plugins/hardtime.lua @@ -1,14 +1,14 @@ return { - "m4xshen/hardtime.nvim", - dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, - opts = { + "m4xshen/hardtime.nvim", + dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, + opts = { disable_mouse = true, disabled_keys = { -- Drill Sergeant Demchuk! - [""] = {"", "i"}, - [""] = {"", "i"}, - [""] = {"", "i"}, - [""] = {"", "i"} + [""] = { "", "i" }, + [""] = { "", "i" }, + [""] = { "", "i" }, + [""] = { "", "i" } }, disabled_filetypes = { "checkhealth", diff --git a/lua/plugins/lint.lua b/lua/plugins/lint.lua index 2d279dd..03b7cbb 100644 --- a/lua/plugins/lint.lua +++ b/lua/plugins/lint.lua @@ -4,7 +4,7 @@ return { "BufReadPre", "BufNewFile", }, - config = function () + config = function() local lint = require("lint") lint.linters_by_ft = { @@ -18,7 +18,7 @@ return { vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { group = lint_augroup, - callback = function () + callback = function() lint.try_lint() end }) diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index ff69daa..d0c21e6 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -7,7 +7,7 @@ return { local builtin = require('telescope.builtin') vim.keymap.set('n', 'pp', builtin.git_files, { desc = "Search git_files" }) - vim.keymap.set('n', 'pf', builtin.find_files, { desc = "Search all files "}) + vim.keymap.set('n', 'pf', builtin.find_files, { desc = "Search all files " }) vim.keymap.set('n', 'fh', builtin.help_tags, { desc = "View help tags" }) vim.keymap.set('n', 'ps', function() builtin.grep_string({ search = vim.fn.input("Grep > ") }) @@ -18,11 +18,11 @@ return { "nvim-telescope/telescope-ui-select.nvim", config = function() require("telescope").setup { - extensions = { - ["ui-select"] = { - require("telescope.themes").get_dropdown {} + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown {} + } } - } } require("telescope").load_extension("ui-select") diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua index e7a9de2..4745503 100644 --- a/lua/plugins/trouble.lua +++ b/lua/plugins/trouble.lua @@ -4,4 +4,4 @@ return { config = function() vim.keymap.set("n", "tt", ":TroubleToggle", { desc = "Toggle Trouble" }) end - } +} From 9dc1ca27b3b042b2be911e2202fb6f91778d4dd5 Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Wed, 10 Jan 2024 10:09:06 -0800 Subject: [PATCH 014/240] feat: update plugins --- lazy-lock.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index abaf2df..0fd8ca5 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,22 +1,22 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "conform.nvim": { "branch": "master", "commit": "75e7c5c7eb5fbd53f8b12dc420b31ec70770b231" }, "hardtime.nvim": { "branch": "main", "commit": "4ba3be553fa0b713c7b817f6d201b07d282accf3" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, - "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, + "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, - "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, + "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-lint": { "branch": "master", "commit": "8df53b5dde8ea80f0a039775777eae6648a10229" }, - "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, - "nvim-treesitter": { "branch": "master", "commit": "65ef62092ef997d2ecf68ede01a0afbda17808c3" }, - "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" }, - "nvim-web-devicons": { "branch": "master", "commit": "cff25ce621e6d15fae0b0bfe38c00be50ce38468" }, + "nvim-lspconfig": { "branch": "master", "commit": "796394fd19fb878e8dbc4fd1e9c9c186ed07a5f4" }, + "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" }, + "nvim-treesitter-context": { "branch": "master", "commit": "400a99ad43ac78af1148061da3491cba2637ad29" }, + "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, From 3362873c0af235f1fec630aae2a14a8c9204a853 Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Wed, 10 Jan 2024 10:22:30 -0800 Subject: [PATCH 015/240] feat: add autocmds config --- README.md | 13 +++++++++++++ init.lua | 1 + lua/autocmds.lua | 7 +++++++ 3 files changed, 21 insertions(+) create mode 100644 README.md create mode 100644 lua/autocmds.lua diff --git a/README.md b/README.md new file mode 100644 index 0000000..285cf32 --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +# wonderfulfrog's Neovim configuration + +Uses [lazy.nvim][lazynvim] to manage plugins. + +It's pretty opinionated. You might not like it. + +## Installation + +1. Clone this repo into Neovim's config folder. +2. Run Neovim. +3. Wait for everything to install. + +[lazynvim]: https://github.com/folke/lazy.nvim diff --git a/init.lua b/init.lua index 93f817c..9666a73 100644 --- a/init.lua +++ b/init.lua @@ -61,3 +61,4 @@ end require("lazy").setup("plugins") require("keybinds") +require("autocmds") diff --git a/lua/autocmds.lua b/lua/autocmds.lua new file mode 100644 index 0000000..7657ff3 --- /dev/null +++ b/lua/autocmds.lua @@ -0,0 +1,7 @@ +vim.api.nvim_create_autocmd({ "FileType" }, { + pattern = { "gitcommit", "markdown", "md", "mdx" }, + callback = function() + vim.opt_local.spell = true + vim.opt.wrap = true + end +}) From f6baa11fb62fce0fd041c8b450ee41bc78b6d651 Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Wed, 10 Jan 2024 10:46:11 -0800 Subject: [PATCH 016/240] feat: add alpha-nvim plugin --- lazy-lock.json | 1 + lua/plugins/alpha-nvim.lua | 43 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 lua/plugins/alpha-nvim.lua diff --git a/lazy-lock.json b/lazy-lock.json index 0fd8ca5..8dbcce7 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" }, + "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "conform.nvim": { "branch": "master", "commit": "75e7c5c7eb5fbd53f8b12dc420b31ec70770b231" }, "hardtime.nvim": { "branch": "main", "commit": "4ba3be553fa0b713c7b817f6d201b07d282accf3" }, diff --git a/lua/plugins/alpha-nvim.lua b/lua/plugins/alpha-nvim.lua new file mode 100644 index 0000000..b4ee958 --- /dev/null +++ b/lua/plugins/alpha-nvim.lua @@ -0,0 +1,43 @@ +return { + 'goolord/alpha-nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + local alpha = require("alpha") + local dashboard = require("alpha.themes.dashboard") + + -- https://github.com/MaximilianLloyd/ascii.nvim + dashboard.section.header.val = { + " ", + " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", + " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", + " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", + " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", + " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", + " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", + " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", + " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", + " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", + " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", + " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", + " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", + " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", + " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", + " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", + " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", + " ▄█████████▄▄ ", + " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", + " ▄▄█████▀▀▀▀ ▀■ ", + " ▄███▀▀▀▀ ", + " ■▀▀ ", + " ", + } + + dashboard.section.buttons.val = { + dashboard.button("e", " > New File", "ene"), + dashboard.button("SPC ee", " > File explorer", "Neotree"), + dashboard.button("q", " > Quit", "qa"), + } + + alpha.setup(dashboard.opts) + end +}; From 01060300d104dad919f02c8d6be29a101a439f49 Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Wed, 10 Jan 2024 12:19:56 -0800 Subject: [PATCH 017/240] feat: update neotree binding to toggle --- lua/plugins/neo-tree.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index 3855db3..34193f2 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -7,7 +7,7 @@ return { "MunifTanjim/nui.nvim", }, config = function() - vim.keymap.set("n", "nn", ":Neotree", { desc = "Open Neotree" }) + vim.keymap.set("n", "nn", ":Neotree toggle", { desc = "Toggle Neotree" }) local nt = require("neo-tree") From 9ade6862af1c9269f643fc90c516d8ae83aa29b2 Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Wed, 10 Jan 2024 12:20:20 -0800 Subject: [PATCH 018/240] feat: restructure config --- init.lua | 34 +++------------------------------- lua/autocmds.lua | 2 +- lua/options.lua | 31 +++++++++++++++++++++++++++++++ lua/plugins/colorscheme.lua | 8 ++++++++ lua/plugins/tokyonight.lua | 9 --------- 5 files changed, 43 insertions(+), 41 deletions(-) create mode 100644 lua/options.lua create mode 100644 lua/plugins/colorscheme.lua delete mode 100644 lua/plugins/tokyonight.lua diff --git a/init.lua b/init.lua index 9666a73..b6c32bd 100644 --- a/init.lua +++ b/init.lua @@ -1,34 +1,4 @@ -vim.g.mapleader = " " -vim.g.maplocalleader = " " - -vim.opt.belloff = "all" -vim.opt.backspace = "2" -vim.opt.showcmd = true -vim.opt.laststatus = 2 -vim.opt.swapfile = false - -vim.opt.number = true -vim.opt.relativenumber = true -vim.opt.signcolumn = "yes" - -vim.opt.autoindent = true -vim.opt.smartindent = true -vim.opt.smarttab = true -vim.opt.expandtab = true -vim.opt.shiftwidth = 4 -vim.opt.tabstop = 2 -vim.opt.softtabstop = 2 -vim.opt.copyindent = true - -vim.opt.scrolloff = 2 -vim.opt.splitright = true -vim.opt.splitbelow = true -vim.opt.wrap = false -vim.opt.cursorline = true -vim.opt.cmdheight = 2 - -vim.opt.hlsearch = false -vim.opt.incsearch = true +require("options") local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then @@ -62,3 +32,5 @@ end require("lazy").setup("plugins") require("keybinds") require("autocmds") + +vim.cmd.colorscheme("tokyonight") diff --git a/lua/autocmds.lua b/lua/autocmds.lua index 7657ff3..2aee9f5 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -2,6 +2,6 @@ vim.api.nvim_create_autocmd({ "FileType" }, { pattern = { "gitcommit", "markdown", "md", "mdx" }, callback = function() vim.opt_local.spell = true - vim.opt.wrap = true + vim.opt_local.wrap = true end }) diff --git a/lua/options.lua b/lua/options.lua new file mode 100644 index 0000000..6fbe25e --- /dev/null +++ b/lua/options.lua @@ -0,0 +1,31 @@ +vim.g.mapleader = " " +vim.g.maplocalleader = " " + +vim.opt.belloff = "all" +vim.opt.backspace = "2" +vim.opt.showcmd = true +vim.opt.laststatus = 2 +vim.opt.swapfile = false + +vim.opt.number = true +vim.opt.relativenumber = true +vim.opt.signcolumn = "yes" + +vim.opt.autoindent = true +vim.opt.smartindent = true +vim.opt.smarttab = true +vim.opt.expandtab = true +vim.opt.shiftwidth = 4 +vim.opt.tabstop = 2 +vim.opt.softtabstop = 2 +vim.opt.copyindent = true + +vim.opt.scrolloff = 2 +vim.opt.splitright = true +vim.opt.splitbelow = true +vim.opt.wrap = false +vim.opt.cursorline = true +vim.opt.cmdheight = 2 + +vim.opt.hlsearch = false +vim.opt.incsearch = true diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua new file mode 100644 index 0000000..890c312 --- /dev/null +++ b/lua/plugins/colorscheme.lua @@ -0,0 +1,8 @@ +return { + "folke/tokyonight.nvim", + lazy = true, + opts = { + transparent = true, + dim_inactive = true, + } +} diff --git a/lua/plugins/tokyonight.lua b/lua/plugins/tokyonight.lua deleted file mode 100644 index 6c6b53e..0000000 --- a/lua/plugins/tokyonight.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "folke/tokyonight.nvim", - lazy = false, - priority = 1000, - opts = {}, - config = function() - vim.cmd.colorscheme "tokyonight" - end -} From e0c7a3e0340eabd8ff3b5949d41f9f56a565acd1 Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Wed, 10 Jan 2024 15:56:52 -0800 Subject: [PATCH 019/240] feat: update neotree for moving files --- lua/plugins/neo-tree.lua | 11 +++++++++++ lua/plugins/telescope.lua | 1 + 2 files changed, 12 insertions(+) diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index 34193f2..2286417 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -12,6 +12,7 @@ return { local nt = require("neo-tree") nt.setup({ + enable_normal_mode_for_inputs = true, filesystem = { filtered_items = { show_hidden_count = false, @@ -26,6 +27,16 @@ return { ".DS_Store" } }, + }, + window = { + mappings = { + ["m"] = { + "move", + config = { + show_path = "relative" + } + }, + } } }) end diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index d0c21e6..18ff6dd 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -9,6 +9,7 @@ return { vim.keymap.set('n', 'pp', builtin.git_files, { desc = "Search git_files" }) vim.keymap.set('n', 'pf', builtin.find_files, { desc = "Search all files " }) vim.keymap.set('n', 'fh', builtin.help_tags, { desc = "View help tags" }) + vim.keymap.set('n', 'gc', builtin.git_branches, { desc = "Checkout git branches" }) vim.keymap.set('n', 'ps', function() builtin.grep_string({ search = vim.fn.input("Grep > ") }) end, { desc = "Grep entire project for string" }) From cd2b5e1ea4ed1c3958a25b8bc7499452a2b8f8d5 Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Mon, 29 Jan 2024 10:15:09 -0800 Subject: [PATCH 020/240] feat: start in normal mode when using telescope --- lua/plugins/telescope.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 18ff6dd..d9c7326 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -19,6 +19,9 @@ return { "nvim-telescope/telescope-ui-select.nvim", config = function() require("telescope").setup { + defaults = { + initial_mode = "normal" + }, extensions = { ["ui-select"] = { require("telescope.themes").get_dropdown {} From 27cdbb02c1c82bea23fd7921e025d7b31c07d11e Mon Sep 17 00:00:00 2001 From: Devin Lumley <2636402+devinwl@users.noreply.github.com> Date: Mon, 29 Jan 2024 10:18:50 -0800 Subject: [PATCH 021/240] feat: add Telescope buffers keybind --- lua/plugins/telescope.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index d9c7326..51e53fb 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -13,6 +13,7 @@ return { vim.keymap.set('n', 'ps', function() builtin.grep_string({ search = vim.fn.input("Grep > ") }) end, { desc = "Grep entire project for string" }) + vim.keymap.set('n', 'b', builtin.buffers, { desc = "Search buffers" }) end }, { From fb248145ad63f3ca47d635e7154b6c706721023c Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Mon, 29 Jan 2024 14:18:49 -0800 Subject: [PATCH 022/240] feat: add binding for git checkout --- lua/plugins/fugitive.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua index b9a587d..1a989fb 100644 --- a/lua/plugins/fugitive.lua +++ b/lua/plugins/fugitive.lua @@ -5,5 +5,6 @@ return { vim.keymap.set("n", "gh", "diffget //2", { desc = "Pick gitdiff on left" }) vim.keymap.set("n", "gl", "diffget //3", { desc = "Pick gitdiff on right" }) vim.keymap.set("n", "gp", ":Git push", { desc = "Run `git push`" }) + vim.keymap.set("n", "gc", ":Git checkout ", { desc = "Git checkout" }) end } From 47e9e6c5eea539fee91a51441f4f5e167bf6f55d Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Mon, 29 Jan 2024 14:19:04 -0800 Subject: [PATCH 023/240] feat: add scope-related plugins --- lazy-lock.json | 2 ++ lua/plugins/ui.lua | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 lua/plugins/ui.lua diff --git a/lazy-lock.json b/lazy-lock.json index 8dbcce7..897034e 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -4,11 +4,13 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "conform.nvim": { "branch": "master", "commit": "75e7c5c7eb5fbd53f8b12dc420b31ec70770b231" }, "hardtime.nvim": { "branch": "main", "commit": "4ba3be553fa0b713c7b817f6d201b07d282accf3" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, + "mini.indentscope": { "branch": "main", "commit": "ca129b71edb672d30b8d7ec3138106db1b1f6a8b" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua new file mode 100644 index 0000000..9aa07d6 --- /dev/null +++ b/lua/plugins/ui.lua @@ -0,0 +1,55 @@ +return { + { + "lukas-reineke/indent-blankline.nvim", + opts = { + indent = { + char = "│", + tab_char = "│", + }, + scope = { enabled = false }, + exclude = { + filetypes = { + "help", + "alpha", + "dashboard", + "neo-tree", + "Trouble", + "trouble", + "lazy", + "mason", + "notify", + "toggleterm", + "lazyterm", + }, + }, + }, + main = "ibl", + }, + { + "echasnovski/mini.indentscope", + opts = { + symbol = "│", + options = { try_as_border = true }, + }, + init = function() + vim.api.nvim_create_autocmd("FileType", { + pattern = { + "help", + "alpha", + "dashboard", + "neo-tree", + "Trouble", + "trouble", + "lazy", + "mason", + "notify", + "toggleterm", + "lazyterm", + }, + callback = function() + vim.b.miniindentscope_disable = true + end, + }) + end, + }, +} From 885cddefa71ffcb866510d55e33fa692b0ab3d63 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Mon, 29 Jan 2024 14:35:59 -0800 Subject: [PATCH 024/240] fix: neo-tree tweak --- lua/plugins/neo-tree.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index 2286417..06390e6 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -12,6 +12,7 @@ return { local nt = require("neo-tree") nt.setup({ + open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, enable_normal_mode_for_inputs = true, filesystem = { filtered_items = { From 34e6fe54865fbf7024d43edb836a491d484295a7 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Mon, 29 Jan 2024 14:52:18 -0800 Subject: [PATCH 025/240] feat: add folding options --- lua/options.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lua/options.lua b/lua/options.lua index 6fbe25e..68e05f4 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -29,3 +29,16 @@ vim.opt.cmdheight = 2 vim.opt.hlsearch = false vim.opt.incsearch = true + +vim.opt.fillchars = { + foldopen = "", + foldclose = "", + -- fold = "⸱", + fold = " ", + foldsep = " ", + diff = "╱", + eob = " ", +} + +vim.opt.foldlevel = 99 +vim.opt.foldmethod = "indent" From 7faba0c08a612566816d4f0b0ce3d2f68db21b44 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Mon, 29 Jan 2024 16:34:30 -0800 Subject: [PATCH 026/240] feat: add `jk` binding to exit insert mode --- lua/keybinds.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index ca9d9ea..c875b40 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -16,3 +16,5 @@ vim.keymap.set("v", "y", "\"*y", { desc = "Yank into system clipboard" } vim.keymap.set("n", "s", [[:%s/\<\>//gI]], { desc = "Like `ciw` for any highlighted text (doesn't have to be word)" }) + +vim.keymap.set("i", "jk", "", { desc = "Exit insert mode" }) From 65f3cf29283301dcaf6e005e8671d2f0abf31141 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Sun, 4 Feb 2024 11:17:56 -0800 Subject: [PATCH 027/240] feat: add some new language servers --- lua/plugins/lsp-config.lua | 8 ++++---- lua/plugins/treesitter.lua | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lua/plugins/lsp-config.lua b/lua/plugins/lsp-config.lua index a0b1eed..6a45483 100644 --- a/lua/plugins/lsp-config.lua +++ b/lua/plugins/lsp-config.lua @@ -9,7 +9,7 @@ return { "williamboman/mason-lspconfig.nvim", config = function() require("mason-lspconfig").setup({ - ensure_installed = { "lua_ls", "tsserver" } + ensure_installed = { "lua_ls", "tsserver", "html" } }) end }, @@ -24,7 +24,7 @@ return { }) lspconfig.tsserver.setup({ - capabilities = capabilities + capabilities = capabilities, }) vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = "Go to definition" }) @@ -41,6 +41,7 @@ return { mason_tool_installer.setup({ ensure_installed = { + "djlint", "prettierd", "eslint_d", }, @@ -60,12 +61,11 @@ return { yaml = { "prettierd" }, typescript = { "eslint_d" }, typescriptreact = { "eslint_d" }, - html = { "prettierd" }, + html = { "djlint" }, ejs = { "prettierd" }, css = { "prettierd" }, scss = { "prettierd" }, graphql = { "prettierd" }, - markdown = { "prettierd" }, ["_"] = { "trim_whitespace" }, }, format_on_save = { diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 81c7fae..b632f9d 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -5,7 +5,7 @@ return { config = function() local config = require("nvim-treesitter.configs") config.setup({ - ensure_installed = { "lua", "javascript", "typescript", "tsx" }, + ensure_installed = { "lua", "javascript", "typescript", "tsx", "htmldjango", "html", "jsonc", "json", "jsdoc", "markdown", "markdown_inline", "vim", "vimdoc" }, sync_install = false, highlight = { enable = true }, indent = { enable = true } From c9ef53245f1c0be0470659f28232e1135c90cddf Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Sun, 4 Feb 2024 11:19:04 -0800 Subject: [PATCH 028/240] feat: add some nice autocmds --- lua/autocmds.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lua/autocmds.lua b/lua/autocmds.lua index 2aee9f5..c22d83d 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -1,7 +1,21 @@ +local function augroup(name) + return vim.api.nvim_create_augroup("wf_" .. name, { clear = true }) +end + vim.api.nvim_create_autocmd({ "FileType" }, { + group = augroup("spellcheck"), pattern = { "gitcommit", "markdown", "md", "mdx" }, callback = function() vim.opt_local.spell = true vim.opt_local.wrap = true end }) + +vim.api.nvim_create_autocmd({ "FileType" }, { + group = augroup("close_with_q"), + pattern = { "fugitive", "git", "gitcommit" }, + callback = function(event) + vim.bo[event.buf].buflisted = false + vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) + end +}) From 2a2394f65f3772c0b66a324786b1329763e1431b Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Sun, 4 Feb 2024 11:19:13 -0800 Subject: [PATCH 029/240] feat: update plugins --- lazy-lock.json | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 897034e..89256fb 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,33 +1,33 @@ { - "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" }, - "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "conform.nvim": { "branch": "master", "commit": "75e7c5c7eb5fbd53f8b12dc420b31ec70770b231" }, + "conform.nvim": { "branch": "master", "commit": "4588008a7c5b57fbff97fdfb529c059235cdc7ee" }, "hardtime.nvim": { "branch": "main", "commit": "4ba3be553fa0b713c7b817f6d201b07d282accf3" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, - "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "2b3d247fce06f53934174f5dfe0362c42d65c00c" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mini.indentscope": { "branch": "main", "commit": "ca129b71edb672d30b8d7ec3138106db1b1f6a8b" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "e578fe7a5832421b0d2c5b3c0a7a1e40e0f6a47a" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, - "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, - "nvim-lint": { "branch": "master", "commit": "8df53b5dde8ea80f0a039775777eae6648a10229" }, - "nvim-lspconfig": { "branch": "master", "commit": "796394fd19fb878e8dbc4fd1e9c9c186ed07a5f4" }, - "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" }, - "nvim-treesitter-context": { "branch": "master", "commit": "400a99ad43ac78af1148061da3491cba2637ad29" }, - "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" }, - "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, + "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "nvim-lint": { "branch": "master", "commit": "76af3422e3c82ea40adf9ade1ccf1dc1eb361789" }, + "nvim-lspconfig": { "branch": "master", "commit": "9a6279953c82d01b58825a46ede032ab246a5983" }, + "nvim-treesitter": { "branch": "master", "commit": "a536ecad5744d03e6a56f63d635c35ceea3207c0" }, + "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, + "nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" }, + "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, - "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" }, + "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, + "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" }, - "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, + "vim-commentary": { "branch": "master", "commit": "f67e3e67ea516755005e6cccb178bc8439c6d402" }, + "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From 69231195db48d737b3d70f9552492a1a232caaef Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Thu, 8 Feb 2024 14:09:04 -0800 Subject: [PATCH 030/240] chore: update plugins --- lazy-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 89256fb..6294870 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,12 +2,12 @@ "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "conform.nvim": { "branch": "master", "commit": "4588008a7c5b57fbff97fdfb529c059235cdc7ee" }, - "hardtime.nvim": { "branch": "main", "commit": "4ba3be553fa0b713c7b817f6d201b07d282accf3" }, + "conform.nvim": { "branch": "master", "commit": "c0e0e80f0c233cb3a249f719a44324c660163a3f" }, + "hardtime.nvim": { "branch": "main", "commit": "860e912895176112868c97b46277f547e149f5e6" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "2b3d247fce06f53934174f5dfe0362c42d65c00c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mini.indentscope": { "branch": "main", "commit": "ca129b71edb672d30b8d7ec3138106db1b1f6a8b" }, @@ -15,11 +15,11 @@ "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, - "nvim-lint": { "branch": "master", "commit": "76af3422e3c82ea40adf9ade1ccf1dc1eb361789" }, - "nvim-lspconfig": { "branch": "master", "commit": "9a6279953c82d01b58825a46ede032ab246a5983" }, - "nvim-treesitter": { "branch": "master", "commit": "a536ecad5744d03e6a56f63d635c35ceea3207c0" }, + "nvim-lint": { "branch": "master", "commit": "966ab3dc37eee3e413692264b44a3011b05a6060" }, + "nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" }, + "nvim-treesitter": { "branch": "master", "commit": "b444afa1dacd3d031c0ffe4763671d89afda5ddb" }, "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, - "nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" }, + "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, From ddcd313eef7aaea8561c6d249df5532100219ea7 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 8 Feb 2024 19:05:55 -0800 Subject: [PATCH 031/240] fix: remove autocmd for quit on q This was causing issues with fugitive and committing changes via git. --- lua/autocmds.lua | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lua/autocmds.lua b/lua/autocmds.lua index c22d83d..df5c406 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -1,21 +1,21 @@ local function augroup(name) - return vim.api.nvim_create_augroup("wf_" .. name, { clear = true }) + return vim.api.nvim_create_augroup("wf_" .. name, { clear = true }) end vim.api.nvim_create_autocmd({ "FileType" }, { - group = augroup("spellcheck"), - pattern = { "gitcommit", "markdown", "md", "mdx" }, - callback = function() - vim.opt_local.spell = true - vim.opt_local.wrap = true - end + group = augroup("spellcheck"), + pattern = { "gitcommit", "markdown", "md", "mdx" }, + callback = function() + vim.opt_local.spell = true + vim.opt_local.wrap = true + end, }) -vim.api.nvim_create_autocmd({ "FileType" }, { - group = augroup("close_with_q"), - pattern = { "fugitive", "git", "gitcommit" }, - callback = function(event) - vim.bo[event.buf].buflisted = false - vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) - end -}) +-- vim.api.nvim_create_autocmd({ "FileType" }, { +-- group = augroup("close_with_q"), +-- pattern = { "fugitive", "git", "gitcommit" }, +-- callback = function(event) +-- vim.bo[event.buf].buflisted = false +-- vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) +-- end +-- }) From 5e1b760c7e19e4ded076919bedd1956c943c4ddc Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Mon, 1 Apr 2024 10:49:16 -0700 Subject: [PATCH 032/240] feat: update neo-tree config --- lazy-lock.json | 50 +++++++++++------------ lua/plugins/neo-tree.lua | 88 ++++++++++++++++++++++------------------ 2 files changed, 73 insertions(+), 65 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 6294870..06761ad 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,33 +1,33 @@ { - "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, - "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, + "LuaSnip": { "branch": "master", "commit": "79cc25c39878401d4e8b6ec42fcf14639426bafc" }, + "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "conform.nvim": { "branch": "master", "commit": "c0e0e80f0c233cb3a249f719a44324c660163a3f" }, - "hardtime.nvim": { "branch": "main", "commit": "860e912895176112868c97b46277f547e149f5e6" }, - "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, - "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, - "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, - "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mini.indentscope": { "branch": "main", "commit": "ca129b71edb672d30b8d7ec3138106db1b1f6a8b" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "e578fe7a5832421b0d2c5b3c0a7a1e40e0f6a47a" }, - "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, - "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, - "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, - "nvim-lint": { "branch": "master", "commit": "966ab3dc37eee3e413692264b44a3011b05a6060" }, - "nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" }, - "nvim-treesitter": { "branch": "master", "commit": "b444afa1dacd3d031c0ffe4763671d89afda5ddb" }, - "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, - "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" }, - "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, + "conform.nvim": { "branch": "master", "commit": "9d5ba06d6ee7418c674f498634617416d15b6239" }, + "hardtime.nvim": { "branch": "main", "commit": "21b0f9146198bb43fbc9f5ec66c8af3234f278ed" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, + "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, + "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" }, + "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, + "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "16d1b194376bf1fc2acd89ccb3c29ba8315bfcea" }, + "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, + "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, + "nvim-cmp": { "branch": "main", "commit": "2fb2a3cf78bbc1b0bea030e8c8728985af1cf302" }, + "nvim-lint": { "branch": "master", "commit": "6670b3ac73fa4caf720f017b91c619e9424d955e" }, + "nvim-lspconfig": { "branch": "master", "commit": "f4619ab31fc4676001ea05ae8200846e6e7700c7" }, + "nvim-treesitter": { "branch": "master", "commit": "30492e7e1c9e5af3642e8a74c2f88dc1f50ec305" }, + "nvim-treesitter-context": { "branch": "master", "commit": "f19766163c18515fb4d3c12d572bf9cba6cdb990" }, + "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" }, + "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, - "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" }, - "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, + "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, + "tokyonight.nvim": { "branch": "main", "commit": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5" }, + "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, "vim-commentary": { "branch": "master", "commit": "f67e3e67ea516755005e6cccb178bc8439c6d402" }, - "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" }, + "vim-fugitive": { "branch": "master", "commit": "c0b03f1cac242d96837326d300f42a660306fc1a" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index 06390e6..08755e1 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -1,44 +1,52 @@ return { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", - }, - config = function() - vim.keymap.set("n", "nn", ":Neotree toggle", { desc = "Toggle Neotree" }) + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + config = function() + vim.keymap.set("n", "nn", ":Neotree toggle", { desc = "Toggle Neotree" }) - local nt = require("neo-tree") + local nt = require("neo-tree") - nt.setup({ - open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, - enable_normal_mode_for_inputs = true, - filesystem = { - filtered_items = { - show_hidden_count = false, - hide_dotfiles = false, - hide_gitignored = true, - always_show = { - ".env" - }, - never_show = { - ".git", - "thumbs.db", - ".DS_Store" - } - }, - }, - window = { - mappings = { - ["m"] = { - "move", - config = { - show_path = "relative" - } - }, - } - } - }) - end + nt.setup({ + open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, + filesystem = { + filtered_items = { + show_hidden_count = false, + hide_dotfiles = false, + hide_gitignored = true, + always_show = { + ".env", + }, + never_show = { + ".git", + "thumbs.db", + ".DS_Store", + }, + }, + }, + window = { + mappings = { + ["m"] = { + "move", + config = { + show_path = "relative", + }, + }, + }, + }, + event_handlers = { + { + event = "neo_tree_popup_input_ready", + handler = function() + -- Switch to normal inside popups by default. + vim.cmd.stopinsert() + end, + }, + }, + }) + end, } From f7100e78719d45658850bc99b094033ca47db13b Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Mon, 1 Apr 2024 10:53:29 -0700 Subject: [PATCH 033/240] feat: ignore hardtime inside markdown --- lua/plugins/hardtime.lua | 49 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/lua/plugins/hardtime.lua b/lua/plugins/hardtime.lua index 2848a46..895467b 100644 --- a/lua/plugins/hardtime.lua +++ b/lua/plugins/hardtime.lua @@ -1,26 +1,27 @@ return { - "m4xshen/hardtime.nvim", - dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, - opts = { - disable_mouse = true, - disabled_keys = { - -- Drill Sergeant Demchuk! - [""] = { "", "i" }, - [""] = { "", "i" }, - [""] = { "", "i" }, - [""] = { "", "i" } - }, - disabled_filetypes = { - "checkhealth", - "fugitive", - "help", - "lazy", - "mason", - "neo-tree", - "neo-tree-popup", - "netrw", - "noice", - "notify", - } - } + "m4xshen/hardtime.nvim", + dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, + opts = { + disable_mouse = true, + disabled_keys = { + -- Drill Sergeant Demchuk! + [""] = { "", "i" }, + [""] = { "", "i" }, + [""] = { "", "i" }, + [""] = { "", "i" }, + }, + disabled_filetypes = { + "checkhealth", + "fugitive", + "help", + "lazy", + "mason", + "markdown", + "neo-tree", + "neo-tree-popup", + "netrw", + "noice", + "notify", + }, + }, } From 752e013e66b0cc976f2e5582ed70b91de449bac6 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Mon, 1 Apr 2024 10:58:15 -0700 Subject: [PATCH 034/240] feat: add djlint to html files --- lua/plugins/lint.lua | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/lua/plugins/lint.lua b/lua/plugins/lint.lua index 03b7cbb..23774e8 100644 --- a/lua/plugins/lint.lua +++ b/lua/plugins/lint.lua @@ -1,26 +1,27 @@ return { - "mfussenegger/nvim-lint", - event = { - "BufReadPre", - "BufNewFile", - }, - config = function() - local lint = require("lint") + "mfussenegger/nvim-lint", + event = { + "BufReadPre", + "BufNewFile", + }, + config = function() + local lint = require("lint") - lint.linters_by_ft = { - javascript = { "eslint_d" }, - typescript = { "eslint_d" }, - javascriptreact = { "eslint_d" }, - typescriptreact = { "eslint_d" }, - } + lint.linters_by_ft = { + html = { "djlint" }, + javascript = { "eslint_d" }, + typescript = { "eslint_d" }, + javascriptreact = { "eslint_d" }, + typescriptreact = { "eslint_d" }, + } - local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) + local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) - vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { - group = lint_augroup, - callback = function() - lint.try_lint() - end - }) - end + vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { + group = lint_augroup, + callback = function() + lint.try_lint() + end, + }) + end, } From ed33aafb0ff0b05eac36d258e450350c7195aa64 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Mon, 1 Apr 2024 10:58:39 -0700 Subject: [PATCH 035/240] feat: re-enable quit by q for certain filetypes --- lua/autocmds.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lua/autocmds.lua b/lua/autocmds.lua index df5c406..a60cb91 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -11,11 +11,11 @@ vim.api.nvim_create_autocmd({ "FileType" }, { end, }) --- vim.api.nvim_create_autocmd({ "FileType" }, { --- group = augroup("close_with_q"), --- pattern = { "fugitive", "git", "gitcommit" }, --- callback = function(event) --- vim.bo[event.buf].buflisted = false --- vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) --- end --- }) +vim.api.nvim_create_autocmd({ "FileType" }, { + group = augroup("close_with_q"), + pattern = { "fugitive", "git", "gitcommit" }, + callback = function(event) + vim.bo[event.buf].buflisted = false + vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) + end, +}) From 2bd9f0c06ed2a66a9d4c27148e74d0e7e926411e Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Mon, 1 Apr 2024 11:03:44 -0700 Subject: [PATCH 036/240] fix: add missing arg to djlint --- lua/plugins/lint.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lua/plugins/lint.lua b/lua/plugins/lint.lua index 23774e8..42fae39 100644 --- a/lua/plugins/lint.lua +++ b/lua/plugins/lint.lua @@ -7,6 +7,11 @@ return { config = function() local lint = require("lint") + local djlint = lint.linters.djlint + djlint.args = { + "--reformat", + } + lint.linters_by_ft = { html = { "djlint" }, javascript = { "eslint_d" }, From 30c47293b0132ec28fdc433e8a0f7929f39052e4 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Mon, 1 Apr 2024 11:04:10 -0700 Subject: [PATCH 037/240] fix: disable q to quit certain filetypes --- lua/autocmds.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lua/autocmds.lua b/lua/autocmds.lua index a60cb91..39927ae 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -11,11 +11,11 @@ vim.api.nvim_create_autocmd({ "FileType" }, { end, }) -vim.api.nvim_create_autocmd({ "FileType" }, { - group = augroup("close_with_q"), - pattern = { "fugitive", "git", "gitcommit" }, - callback = function(event) - vim.bo[event.buf].buflisted = false - vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) - end, -}) +-- vim.api.nvim_create_autocmd({ "FileType" }, { +-- group = augroup("close_with_q"), +-- pattern = { "fugitive", "git", "gitcommit" }, +-- callback = function(event) +-- vim.bo[event.buf].buflisted = false +-- vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) +-- end, +-- }) From 8591814ca5c3a0e2deb6f711279ea9dc5e836472 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Thu, 18 Apr 2024 10:01:22 -0700 Subject: [PATCH 038/240] fix: include qf in hardtime ignore --- lua/plugins/hardtime.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/hardtime.lua b/lua/plugins/hardtime.lua index 895467b..47b18eb 100644 --- a/lua/plugins/hardtime.lua +++ b/lua/plugins/hardtime.lua @@ -22,6 +22,7 @@ return { "netrw", "noice", "notify", + "qf", }, }, } From 10e4a3af37d7e933a46361dc64bf9d292ef8b2a1 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 10 May 2024 11:26:26 -0700 Subject: [PATCH 039/240] V2 (#1) Co-authored-by: Devin Haska --- lazy-lock.json | 53 ++++++----- lua/autocmds.lua | 23 ++--- lua/keybinds.lua | 7 +- lua/options.lua | 2 + lua/plugins/alpha-nvim.lua | 43 --------- lua/plugins/coding.lua | 100 ++++++++++++++++++++ lua/plugins/colorscheme.lua | 3 +- lua/plugins/commentary.lua | 3 - lua/plugins/completion.lua | 59 ------------ lua/plugins/editor.lua | 171 ++++++++++++++++++++++++++++++++++ lua/plugins/formatting.lua | 20 ++++ lua/plugins/fugitive.lua | 10 -- lua/plugins/hardtime.lua | 28 ------ lua/plugins/lint.lua | 32 ------- lua/plugins/linting.lua | 26 ++++++ lua/plugins/lsp-config.lua | 76 --------------- lua/plugins/lsp.lua | 60 ++++++++++++ lua/plugins/lualine.lua | 12 --- lua/plugins/neo-tree.lua | 52 ----------- lua/plugins/surround.lua | 3 - lua/plugins/telescope.lua | 36 ------- lua/plugins/todo-comments.lua | 5 - lua/plugins/treesitter.lua | 43 ++++++--- lua/plugins/trouble.lua | 7 -- lua/plugins/ui.lua | 111 ++++++++++++++++++++++ lua/plugins/which-key.lua | 9 -- 26 files changed, 564 insertions(+), 430 deletions(-) delete mode 100644 lua/plugins/alpha-nvim.lua create mode 100644 lua/plugins/coding.lua delete mode 100644 lua/plugins/commentary.lua delete mode 100644 lua/plugins/completion.lua create mode 100644 lua/plugins/editor.lua create mode 100644 lua/plugins/formatting.lua delete mode 100644 lua/plugins/fugitive.lua delete mode 100644 lua/plugins/hardtime.lua delete mode 100644 lua/plugins/lint.lua create mode 100644 lua/plugins/linting.lua delete mode 100644 lua/plugins/lsp-config.lua create mode 100644 lua/plugins/lsp.lua delete mode 100644 lua/plugins/lualine.lua delete mode 100644 lua/plugins/neo-tree.lua delete mode 100644 lua/plugins/surround.lua delete mode 100644 lua/plugins/telescope.lua delete mode 100644 lua/plugins/todo-comments.lua delete mode 100644 lua/plugins/trouble.lua delete mode 100644 lua/plugins/which-key.lua diff --git a/lazy-lock.json b/lazy-lock.json index 06761ad..83c8054 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,33 +1,44 @@ { - "LuaSnip": { "branch": "master", "commit": "79cc25c39878401d4e8b6ec42fcf14639426bafc" }, + "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, + "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, + "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "conform.nvim": { "branch": "master", "commit": "9d5ba06d6ee7418c674f498634617416d15b6239" }, - "hardtime.nvim": { "branch": "main", "commit": "21b0f9146198bb43fbc9f5ec66c8af3234f278ed" }, + "conform.nvim": { "branch": "master", "commit": "12b3995537f52ba2810a9857e8ca256881febbda" }, + "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" }, + "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, + "friendly-snippets": { "branch": "main", "commit": "d5f74ce4dfdd82848f3f4eac65fe6e29ac5df4c2" }, + "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, - "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" }, + "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" }, + "lazygit.nvim": { "branch": "main", "commit": "0ada6c6e7e138df92f5009b6952f4ac41248305a" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "b129892f783740e6cf741f2ea09fa5dd512aa584" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "16d1b194376bf1fc2acd89ccb3c29ba8315bfcea" }, + "mini.comment": { "branch": "main", "commit": "f9f1a646fd3d9df7397aa1b9550a875fe8189eb0" }, + "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" }, + "mini.pairs": { "branch": "main", "commit": "5c975d8f68dc1e11bf4b20ced71e7987ed782513" }, + "mini.surround": { "branch": "main", "commit": "0f528eb2e1bab420c0569d9e52615144c51db920" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, + "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, - "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, - "nvim-cmp": { "branch": "main", "commit": "2fb2a3cf78bbc1b0bea030e8c8728985af1cf302" }, - "nvim-lint": { "branch": "master", "commit": "6670b3ac73fa4caf720f017b91c619e9424d955e" }, - "nvim-lspconfig": { "branch": "master", "commit": "f4619ab31fc4676001ea05ae8200846e6e7700c7" }, - "nvim-treesitter": { "branch": "master", "commit": "30492e7e1c9e5af3642e8a74c2f88dc1f50ec305" }, - "nvim-treesitter-context": { "branch": "master", "commit": "f19766163c18515fb4d3c12d572bf9cba6cdb990" }, - "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" }, - "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, + "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, + "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, + "nvim-lint": { "branch": "master", "commit": "861a04313501563bb1b11f125ae9b7237a517b9b" }, + "nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" }, + "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, + "nvim-spectre": { "branch": "master", "commit": "4651801ba37a9407b7257287aec45b6653ffc5e9" }, + "nvim-treesitter": { "branch": "master", "commit": "b1f3f02027f1fd21956c1e219878764014498a59" }, + "nvim-treesitter-context": { "branch": "master", "commit": "2650e6431f7daba5d9c2c64134fa5eb2312eb3d7" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" }, + "nvim-web-devicons": { "branch": "master", "commit": "794bba734ec95eaff9bb82fbd112473be2087283" }, + "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, - "tokyonight.nvim": { "branch": "main", "commit": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5" }, + "tokyonight.nvim": { "branch": "main", "commit": "67afeaf7fd6ebba000633e89f63c31694057edde" }, "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, - "vim-commentary": { "branch": "master", "commit": "f67e3e67ea516755005e6cccb178bc8439c6d402" }, - "vim-fugitive": { "branch": "master", "commit": "c0b03f1cac242d96837326d300f42a660306fc1a" }, - "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/autocmds.lua b/lua/autocmds.lua index 39927ae..1f6502d 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -1,21 +1,12 @@ local function augroup(name) - return vim.api.nvim_create_augroup("wf_" .. name, { clear = true }) + return vim.api.nvim_create_augroup("wf_" .. name, { clear = true }) end vim.api.nvim_create_autocmd({ "FileType" }, { - group = augroup("spellcheck"), - pattern = { "gitcommit", "markdown", "md", "mdx" }, - callback = function() - vim.opt_local.spell = true - vim.opt_local.wrap = true - end, + group = augroup("spellcheck"), + pattern = { "gitcommit", "markdown", "md", "mdx" }, + callback = function() + vim.opt_local.spell = true + vim.opt_local.wrap = true + end, }) - --- vim.api.nvim_create_autocmd({ "FileType" }, { --- group = augroup("close_with_q"), --- pattern = { "fugitive", "git", "gitcommit" }, --- callback = function(event) --- vim.bo[event.buf].buflisted = false --- vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) --- end, --- }) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index c875b40..5f4a455 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -3,6 +3,10 @@ vim.keymap.set("n", "", "", { desc = "Go to split above" }) vim.keymap.set("n", "", "", { desc = "Go to split below" }) vim.keymap.set("n", "", "", { desc = "Go to split on right" }) +vim.keymap.set("n", "|", "v", { desc = "Split window right" }) +vim.keymap.set("n", "-", "s", { desc = "Split window below" }) +vim.keymap.set("n", "wd", "c", { desc = "Delete window" }) + vim.keymap.set("v", "J", ":m '>+1gv=gv", { desc = "Move lines under cursor up" }) vim.keymap.set("v", "K", ":m '<-2gv=gv", { desc = "Move lines under cursor down" }) @@ -14,7 +18,4 @@ vim.keymap.set("x", "p", "\"_dP", { desc = "Paste without replacing clip vim.keymap.set("n", "y", "\"*y", { desc = "Yank into system clipboard" }) vim.keymap.set("v", "y", "\"*y", { desc = "Yank into system clipboard" }) -vim.keymap.set("n", "s", [[:%s/\<\>//gI]], - { desc = "Like `ciw` for any highlighted text (doesn't have to be word)" }) - vim.keymap.set("i", "jk", "", { desc = "Exit insert mode" }) diff --git a/lua/options.lua b/lua/options.lua index 68e05f4..e08d218 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -42,3 +42,5 @@ vim.opt.fillchars = { vim.opt.foldlevel = 99 vim.opt.foldmethod = "indent" + +vim.opt.termguicolors = true diff --git a/lua/plugins/alpha-nvim.lua b/lua/plugins/alpha-nvim.lua deleted file mode 100644 index b4ee958..0000000 --- a/lua/plugins/alpha-nvim.lua +++ /dev/null @@ -1,43 +0,0 @@ -return { - 'goolord/alpha-nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, - config = function() - local alpha = require("alpha") - local dashboard = require("alpha.themes.dashboard") - - -- https://github.com/MaximilianLloyd/ascii.nvim - dashboard.section.header.val = { - " ", - " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", - " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", - " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", - " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", - " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", - " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", - " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", - " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", - " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", - " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", - " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", - " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", - " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", - " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", - " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", - " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", - " ▄█████████▄▄ ", - " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", - " ▄▄█████▀▀▀▀ ▀■ ", - " ▄███▀▀▀▀ ", - " ■▀▀ ", - " ", - } - - dashboard.section.buttons.val = { - dashboard.button("e", " > New File", "ene"), - dashboard.button("SPC ee", " > File explorer", "Neotree"), - dashboard.button("q", " > Quit", "qa"), - } - - alpha.setup(dashboard.opts) - end -}; diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua new file mode 100644 index 0000000..5ec6181 --- /dev/null +++ b/lua/plugins/coding.lua @@ -0,0 +1,100 @@ +return { + { + "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", + }, + + 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 = "luasnip" }, + }, { + { name = "buffer" }, + }), + }) + end, + }, + { + "L3MON4D3/LuaSnip", + dependencies = { "rafamadriz/friendly-snippets" }, + }, + { + "echasnovski/mini.pairs", + version = false, + opts = { + mappings = { + ["`"] = { action = "closeopen", pair = "``", neigh_pattern = "[^\\`].", register = { cr = false } }, + }, + }, + }, + { + "echasnovski/mini.surround", + version = false, + opts = { + mappings = { + add = "gsa", -- Add surrounding in Normal and Visual modes + delete = "gsd", -- Delete surrounding + find = "gsf", -- Find surrounding (to the right) + find_left = "gsF", -- Find surrounding (to the left) + highlight = "gsh", -- Highlight surrounding + replace = "gsr", -- Replace surrounding + update_n_lines = "gsn", -- Update `n_lines` + }, + }, + }, + { + "JoosepAlviste/nvim-ts-context-commentstring", + opts = { + enable_autocmd = false, + }, + }, + { + "echasnovski/mini.comment", + version = false, + opts = { + options = { + custom_commentstring = function() + return require("ts_context_commentstring.internal").calculate_commentstring() + or vim.bo.commentstring + end, + }, + }, + }, +} diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 890c312..cde1558 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -2,7 +2,8 @@ return { "folke/tokyonight.nvim", lazy = true, opts = { + style = "storm", transparent = true, dim_inactive = true, - } + }, } diff --git a/lua/plugins/commentary.lua b/lua/plugins/commentary.lua deleted file mode 100644 index 4e85c75..0000000 --- a/lua/plugins/commentary.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "tpope/vim-commentary" -} diff --git a/lua/plugins/completion.lua b/lua/plugins/completion.lua deleted file mode 100644 index 6696501..0000000 --- a/lua/plugins/completion.lua +++ /dev/null @@ -1,59 +0,0 @@ -return { - { - "hrsh7th/nvim-cmp", - config = function() - local cmp = require("cmp") - - cmp.setup({ - -- Highlights the first result always - completion = { - completeopt = "menu,menuone,noinsert" - }, - - 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({ - behaviour = cmp.ConfirmBehavior.Insert, - select = true - }) - }), - - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end - }, - - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "luasnip" } - }, { - { name = "buffer" } - }) - }) - end - }, - { - "hrsh7th/cmp-nvim-lsp" - }, - { - "L3MON4D3/LuaSnip" - } -} diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua new file mode 100644 index 0000000..cb91684 --- /dev/null +++ b/lua/plugins/editor.lua @@ -0,0 +1,171 @@ +return { + { + "nvim-neo-tree/neo-tree.nvim", + event = "VeryLazy", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + config = function() + vim.keymap.set("n", "ee", ":Neotree toggle", { desc = "Toggle Neotree" }) + vim.keymap.set("n", "er", ":Neotree reveal", { desc = "Reveal file" }) + + local nt = require("neo-tree") + + nt.setup({ + open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, + filesystem = { + filtered_items = { + show_hidden_count = false, + hide_dotfiles = false, + hide_gitignored = true, + always_show = { + ".env", + ".env.local", + }, + never_show = { + ".git", + "thumbs.db", + ".DS_Store", + }, + }, + }, + window = { + mappings = { + ["m"] = { + "move", + config = { + show_path = "relative", + }, + }, + }, + }, + event_handlers = { + { + event = "neo_tree_popup_input_ready", + handler = function() + -- Switch to normal inside popups by default. + vim.cmd.stopinsert() + end, + }, + }, + }) + end, + }, + { + "folke/which-key.nvim", + event = "VeryLazy", + init = function() + vim.o.timeout = true + vim.o.timeoutlen = 300 + end, + opts = {}, + }, + { + "folke/trouble.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + vim.keymap.set("n", "tt", ":TroubleToggle", { desc = "Toggle Trouble" }) + end, + }, + { + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = {}, + }, + { + "nvim-pack/nvim-spectre", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = { open_cmd = "noswapfile vnew" }, + keys = { + { + "sr", + function() + require("spectre").open() + end, + desc = "Replace in Files (Spectre)", + }, + }, + }, + { + "nvim-telescope/telescope.nvim", + tag = "0.1.5", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + local builtin = require("telescope.builtin") + + vim.keymap.set("n", "ff", builtin.git_files, { desc = "Search git_files" }) + vim.keymap.set("n", "fg", builtin.live_grep, { desc = "Grep git_files" }) + vim.keymap.set("n", "fh", builtin.help_tags, { desc = "View help tags" }) + vim.keymap.set("n", "fb", builtin.buffers, { desc = "Search buffers" }) + vim.keymap.set("n", "sk", builtin.keymaps, { desc = "View keymaps" }) + vim.keymap.set("n", "sR", builtin.resume, { desc = "Resume" }) + vim.keymap.set("n", "st", "TodoTelescope", { desc = "Search TODOs" }) + end, + }, + { + "nvim-telescope/telescope-ui-select.nvim", + config = function() + require("telescope").setup({ + defaults = { + initial_mode = "normal", + }, + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown({}), + }, + }, + }) + + require("telescope").load_extension("ui-select") + end, + }, + { + "folke/flash.nvim", + event = "VeryLazy", + ---@type Flash.Config + 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" }, + }, + }, + { + "kdheepak/lazygit.nvim", + event = "VeryLazy", + cmd = { + "LazyGit", + "LazyGitConfig", + "LazyGitCurrentFile", + "LazyGitFilter", + "LazyGitFilterCurrentFile", + }, + -- optional for floating window border decoration + dependencies = { + "nvim-lua/plenary.nvim", + }, + keys = { + { "gg", "LazyGit", desc = "LazyGit" } + } + }, + { + "lewis6991/gitsigns.nvim", + event = "VeryLazy", + opts = { + signs = { + add = { text = "▎" }, + change = { text = "▎" }, + delete = { text = "" }, + topdelete = { text = "" }, + changedelete = { text = "▎" }, + untracked = { text = "▎" }, + }, + } + } +} diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua new file mode 100644 index 0000000..ef27e71 --- /dev/null +++ b/lua/plugins/formatting.lua @@ -0,0 +1,20 @@ +return { + "stevearc/conform.nvim", + opts = { + formatters_by_ft = { + css = { "prettierd" }, + scss = { "prettierd" }, + html = { "djlint" }, + lua = { "stylelua" }, + javascript = { "eslint_d", "prettierd" }, + javascriptreact = { "eslint_d", "prettierd" }, + json = { "prettierd" }, + jsonc = { "prettierd" }, + typescript = { "eslint_d", "prettierd" }, + typescriptreact = { "eslint_d", "prettierd" }, + }, + format_on_save = { + lsp_fallback = true, + }, + }, +} diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua deleted file mode 100644 index 1a989fb..0000000 --- a/lua/plugins/fugitive.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - "tpope/vim-fugitive", - config = function() - vim.keymap.set("n", "gs", vim.cmd.Git, { desc = "View `git status`" }) - vim.keymap.set("n", "gh", "diffget //2", { desc = "Pick gitdiff on left" }) - vim.keymap.set("n", "gl", "diffget //3", { desc = "Pick gitdiff on right" }) - vim.keymap.set("n", "gp", ":Git push", { desc = "Run `git push`" }) - vim.keymap.set("n", "gc", ":Git checkout ", { desc = "Git checkout" }) - end -} diff --git a/lua/plugins/hardtime.lua b/lua/plugins/hardtime.lua deleted file mode 100644 index 47b18eb..0000000 --- a/lua/plugins/hardtime.lua +++ /dev/null @@ -1,28 +0,0 @@ -return { - "m4xshen/hardtime.nvim", - dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, - opts = { - disable_mouse = true, - disabled_keys = { - -- Drill Sergeant Demchuk! - [""] = { "", "i" }, - [""] = { "", "i" }, - [""] = { "", "i" }, - [""] = { "", "i" }, - }, - disabled_filetypes = { - "checkhealth", - "fugitive", - "help", - "lazy", - "mason", - "markdown", - "neo-tree", - "neo-tree-popup", - "netrw", - "noice", - "notify", - "qf", - }, - }, -} diff --git a/lua/plugins/lint.lua b/lua/plugins/lint.lua deleted file mode 100644 index 42fae39..0000000 --- a/lua/plugins/lint.lua +++ /dev/null @@ -1,32 +0,0 @@ -return { - "mfussenegger/nvim-lint", - event = { - "BufReadPre", - "BufNewFile", - }, - config = function() - local lint = require("lint") - - local djlint = lint.linters.djlint - djlint.args = { - "--reformat", - } - - lint.linters_by_ft = { - html = { "djlint" }, - javascript = { "eslint_d" }, - typescript = { "eslint_d" }, - javascriptreact = { "eslint_d" }, - typescriptreact = { "eslint_d" }, - } - - local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) - - vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { - group = lint_augroup, - callback = function() - lint.try_lint() - end, - }) - end, -} diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua new file mode 100644 index 0000000..995389c --- /dev/null +++ b/lua/plugins/linting.lua @@ -0,0 +1,26 @@ +return { + "mfussenegger/nvim-lint", + opts = { + events = { "BufWritePost", "BufReadPost", "InsertLeave" }, + linters_by_ft = { + html = { "djlint" }, + javascript = { "eslint_d" }, + typescript = { "eslint_d" }, + javascriptreact = { "eslint_d" }, + typescriptreact = { "eslint_d" }, + }, + }, + config = function(_, opts) + local lint = require("lint") + lint.linters_by_ft = opts.linters_by_ft + + local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) + + vim.api.nvim_create_autocmd(opts.events, { + group = lint_augroup, + callback = function() + lint.try_lint() + end, + }) + end, +} diff --git a/lua/plugins/lsp-config.lua b/lua/plugins/lsp-config.lua deleted file mode 100644 index 6a45483..0000000 --- a/lua/plugins/lsp-config.lua +++ /dev/null @@ -1,76 +0,0 @@ -return { - { - "williamboman/mason.nvim", - config = function() - require("mason").setup() - end - }, - { - "williamboman/mason-lspconfig.nvim", - config = function() - require("mason-lspconfig").setup({ - ensure_installed = { "lua_ls", "tsserver", "html" } - }) - end - }, - { - "neovim/nvim-lspconfig", - config = function() - local lspconfig = require("lspconfig") - local capabilities = require("cmp_nvim_lsp").default_capabilities() - - lspconfig.lua_ls.setup({ - capabilities = capabilities - }) - - lspconfig.tsserver.setup({ - capabilities = capabilities, - }) - - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = "Go to definition" }) - vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { desc = "Go to implementation" }) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, { desc = "Show signature" }) - vim.keymap.set('n', 'f', vim.lsp.buf.format, { desc = "Format buffer" }) - vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, { desc = "View code actions" }) - end - }, - { - "WhoIsSethDaniel/mason-tool-installer.nvim", - config = function() - local mason_tool_installer = require("mason-tool-installer") - - mason_tool_installer.setup({ - ensure_installed = { - "djlint", - "prettierd", - "eslint_d", - }, - automatic_installation = true - }) - end - }, - { - "stevearc/conform.nvim", - opts = { - formatters_by_ft = { - lua = { "stylua" }, - javascript = { "eslint_d" }, - javascriptreact = { "eslint_d" }, - json = { "prettierd" }, - jsonc = { "prettierd" }, - yaml = { "prettierd" }, - typescript = { "eslint_d" }, - typescriptreact = { "eslint_d" }, - html = { "djlint" }, - ejs = { "prettierd" }, - css = { "prettierd" }, - scss = { "prettierd" }, - graphql = { "prettierd" }, - ["_"] = { "trim_whitespace" }, - }, - format_on_save = { - lsp_fallback = true, - }, - }, - } -} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua new file mode 100644 index 0000000..860226c --- /dev/null +++ b/lua/plugins/lsp.lua @@ -0,0 +1,60 @@ +return { + { + "williamboman/mason.nvim", + opts = {}, + }, + { + "williamboman/mason-lspconfig.nvim", + opts = { + ensure_installed = { + "lua_ls", + "tsserver", + "html", + } + } + }, + { + "WhoIsSethDaniel/mason-tool-installer.nvim", + opts = { + ensure_installed = { + "djlint", + "eslint", + "eslint_d", + "prettierd", + "stylua", + }, + automatic_installation = true, + } + }, + -- lspconfig should be the last step. + { + "neovim/nvim-lspconfig", + event = "VeryLazy", + dependencies = { + "mason.nvim", + "williamboman/mason-lspconfig.nvim", + }, + opts = { + servers = { + tsserver = {}, + lua_ls = {}, + } + }, + config = function(_, opts) + local lspconfig = require("lspconfig") + + local servers = opts.servers + + for server, server_opts in pairs(servers) do + lspconfig[server].setup(server_opts) + end + + vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "Go to definition" }) + vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { desc = "Go to implementation" }) + vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "Show signature" }) + vim.keymap.set("n", "f", vim.lsp.buf.format, { desc = "Format buffer" }) + vim.keymap.set("n", "ca", vim.lsp.buf.code_action, { desc = "View code actions" }) + vim.keymap.set("n", "cr", vim.lsp.buf.rename, { desc = "Rename" }) + end, + }, +} diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua deleted file mode 100644 index b368357..0000000 --- a/lua/plugins/lualine.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, - config = function() - require('lualine').setup({ - options = { - icons_enabled = true, - theme = 'tokyonight' - } - }) - end -} diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua deleted file mode 100644 index 08755e1..0000000 --- a/lua/plugins/neo-tree.lua +++ /dev/null @@ -1,52 +0,0 @@ -return { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", - }, - config = function() - vim.keymap.set("n", "nn", ":Neotree toggle", { desc = "Toggle Neotree" }) - - local nt = require("neo-tree") - - nt.setup({ - open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, - filesystem = { - filtered_items = { - show_hidden_count = false, - hide_dotfiles = false, - hide_gitignored = true, - always_show = { - ".env", - }, - never_show = { - ".git", - "thumbs.db", - ".DS_Store", - }, - }, - }, - window = { - mappings = { - ["m"] = { - "move", - config = { - show_path = "relative", - }, - }, - }, - }, - event_handlers = { - { - event = "neo_tree_popup_input_ready", - handler = function() - -- Switch to normal inside popups by default. - vim.cmd.stopinsert() - end, - }, - }, - }) - end, -} diff --git a/lua/plugins/surround.lua b/lua/plugins/surround.lua deleted file mode 100644 index b5dd6ff..0000000 --- a/lua/plugins/surround.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "tpope/vim-surround" -} diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua deleted file mode 100644 index 51e53fb..0000000 --- a/lua/plugins/telescope.lua +++ /dev/null @@ -1,36 +0,0 @@ -return { - { - 'nvim-telescope/telescope.nvim', - tag = '0.1.5', - dependencies = { 'nvim-lua/plenary.nvim' }, - config = function() - local builtin = require('telescope.builtin') - - vim.keymap.set('n', 'pp', builtin.git_files, { desc = "Search git_files" }) - vim.keymap.set('n', 'pf', builtin.find_files, { desc = "Search all files " }) - vim.keymap.set('n', 'fh', builtin.help_tags, { desc = "View help tags" }) - vim.keymap.set('n', 'gc', builtin.git_branches, { desc = "Checkout git branches" }) - vim.keymap.set('n', 'ps', function() - builtin.grep_string({ search = vim.fn.input("Grep > ") }) - end, { desc = "Grep entire project for string" }) - vim.keymap.set('n', 'b', builtin.buffers, { desc = "Search buffers" }) - end - }, - { - "nvim-telescope/telescope-ui-select.nvim", - config = function() - require("telescope").setup { - defaults = { - initial_mode = "normal" - }, - extensions = { - ["ui-select"] = { - require("telescope.themes").get_dropdown {} - } - } - } - - require("telescope").load_extension("ui-select") - end - } -} diff --git a/lua/plugins/todo-comments.lua b/lua/plugins/todo-comments.lua deleted file mode 100644 index 2ca05d6..0000000 --- a/lua/plugins/todo-comments.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "folke/todo-comments.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, - opts = {}, -} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index b632f9d..85cf8f5 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -1,26 +1,41 @@ return { { "nvim-treesitter/nvim-treesitter", + version = false, build = ":TSUpdate", - config = function() - local config = require("nvim-treesitter.configs") - config.setup({ - ensure_installed = { "lua", "javascript", "typescript", "tsx", "htmldjango", "html", "jsonc", "json", "jsdoc", "markdown", "markdown_inline", "vim", "vimdoc" }, - sync_install = false, - highlight = { enable = true }, - indent = { enable = true } - }) - end + opts = { + ensure_installed = { + "lua", + "javascript", + "typescript", + "tsx", + "htmldjango", + "html", + "jsonc", + "json", + "jsdoc", + "markdown", + "markdown_inline", + "vim", + "vimdoc", + }, + highlight = { enable = true }, + indent = { enable = true }, + }, + config = function(_, opts) + require("nvim-treesitter.configs").setup(opts) + end, }, { "nvim-treesitter/nvim-treesitter-context", opts = { max_lines = 2, - } + }, }, { - 'windwp/nvim-autopairs', - event = "InsertEnter", - opts = {} - } + -- TODO: Figure out why this plugin is not working. + "windwp/nvim-autopairs", + event = "VeryLazy", + opts = {}, + }, } diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua deleted file mode 100644 index 4745503..0000000 --- a/lua/plugins/trouble.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - "folke/trouble.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - vim.keymap.set("n", "tt", ":TroubleToggle", { desc = "Toggle Trouble" }) - end -} diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 9aa07d6..467aeb7 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,4 +1,48 @@ return { + { + "nvim-lualine/lualine.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + opts = { + options = { + icons_enabled = true, + theme = "tokyonight", + disabled_filetypes = { + statusline = { + "alpha", + "neo-tree", + } + } + } + }, + }, + { + "famiu/bufdelete.nvim", + keys = { + { "bd", "Bdelete", desc = "Close Buffer" }, + }, + }, + { + "akinsho/bufferline.nvim", + event = "VeryLazy", + keys = { + { "bp", "BufferLineTogglePin", desc = "Toggle Pin" }, + { "[b", "BufferLineCyclePrev", desc = "Prev Buffer" }, + { "]b", "BufferLineCycleNext", desc = "Next Buffer" }, + }, + opts = { + options = { + diagnostics = "nvim_lsp", + offsets = { + { + filetype = "neo-tree", + text = "Neo-tree", + highlight = "Directory", + text_align = "left", + }, + }, + } + } + }, { "lukas-reineke/indent-blankline.nvim", opts = { @@ -52,4 +96,71 @@ return { }) end, }, + { + "stevearc/dressing.nvim", + event = "VeryLazy", + opts = {} + }, + { + "rcarriga/nvim-notify", + opts = { + timeout = 2000, + stages = "static", + } + }, + { + "MunifTanjim/nui.nvim" + }, + { + "folke/noice.nvim", + event = "VeryLazy", + opts = {}, + dependencies = { + "MunifTanjim/nui.nvim", + "rcarriga/nvim-notify", + } + }, + { + "goolord/alpha-nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + local alpha = require("alpha") + local dashboard = require("alpha.themes.dashboard") + + -- https://github.com/MaximilianLloyd/ascii.nvim + dashboard.section.header.val = { + " ", + " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", + " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", + " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", + " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", + " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", + " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", + " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", + " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", + " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", + " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", + " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", + " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", + " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", + " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", + " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", + " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", + " ▄█████████▄▄ ", + " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", + " ▄▄█████▀▀▀▀ ▀■ ", + " ▄███▀▀▀▀ ", + " ■▀▀ ", + " ", + } + + dashboard.section.buttons.val = { + dashboard.button("e", " > New File", "ene"), + dashboard.button("SPC ee", " > File explorer", "Neotree"), + dashboard.button("q", " > Quit", "qa"), + } + + alpha.setup(dashboard.opts) + end, + } } diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua deleted file mode 100644 index 410f8db..0000000 --- a/lua/plugins/which-key.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "folke/which-key.nvim", - event = "VeryLazy", - init = function() - vim.o.timeout = true - vim.o.timeoutlen = 300 - end, - opts = {} -} From 5b8a97456aff52e726cba2855b72d9067c670a94 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 29 May 2024 14:15:03 -0700 Subject: [PATCH 040/240] feat: update colorscheme to catppuccin --- init.lua | 2 +- lazy-lock.json | 71 +++++++++++++++++++------------------ lua/plugins/colorscheme.lua | 50 ++++++++++++++++++++++---- lua/plugins/ui.lua | 13 ++++--- 4 files changed, 89 insertions(+), 47 deletions(-) diff --git a/init.lua b/init.lua index b6c32bd..242952b 100644 --- a/init.lua +++ b/init.lua @@ -33,4 +33,4 @@ require("lazy").setup("plugins") require("keybinds") require("autocmds") -vim.cmd.colorscheme("tokyonight") +vim.cmd.colorscheme("catppuccin") diff --git a/lazy-lock.json b/lazy-lock.json index 83c8054..797979b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,44 +1,45 @@ { - "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" }, + "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, - "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, + "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, + "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "conform.nvim": { "branch": "master", "commit": "12b3995537f52ba2810a9857e8ca256881febbda" }, - "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" }, - "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, - "friendly-snippets": { "branch": "main", "commit": "d5f74ce4dfdd82848f3f4eac65fe6e29ac5df4c2" }, - "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" }, - "lazygit.nvim": { "branch": "main", "commit": "0ada6c6e7e138df92f5009b6952f4ac41248305a" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" }, + "dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" }, + "flash.nvim": { "branch": "main", "commit": "11a2e667d19d8f48c93c6ed2e2e525ac6b1b79be" }, + "friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" }, + "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, + "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, + "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, + "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "b129892f783740e6cf741f2ea09fa5dd512aa584" }, - "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.comment": { "branch": "main", "commit": "f9f1a646fd3d9df7397aa1b9550a875fe8189eb0" }, - "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" }, - "mini.pairs": { "branch": "main", "commit": "5c975d8f68dc1e11bf4b20ced71e7987ed782513" }, - "mini.surround": { "branch": "main", "commit": "0f528eb2e1bab420c0569d9e52615144c51db920" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, - "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, - "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, - "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, - "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, - "nvim-lint": { "branch": "master", "commit": "861a04313501563bb1b11f125ae9b7237a517b9b" }, - "nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" }, - "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-spectre": { "branch": "master", "commit": "4651801ba37a9407b7257287aec45b6653ffc5e9" }, - "nvim-treesitter": { "branch": "master", "commit": "b1f3f02027f1fd21956c1e219878764014498a59" }, - "nvim-treesitter-context": { "branch": "master", "commit": "2650e6431f7daba5d9c2c64134fa5eb2312eb3d7" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" }, - "nvim-web-devicons": { "branch": "master", "commit": "794bba734ec95eaff9bb82fbd112473be2087283" }, - "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "c1fbdcb0d8d1295314f1612c4a247253e70299d9" }, + "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, + "mini.comment": { "branch": "main", "commit": "c8406379987c321ecdef9f53e1ca741a55002104" }, + "mini.indentscope": { "branch": "main", "commit": "f0d7faa064c892b96997810afcddfadc3f2a15b3" }, + "mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" }, + "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, + "noice.nvim": { "branch": "main", "commit": "69c6ad5c1f1c0777125d0275f9871d8609cb0521" }, + "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, + "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, + "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, + "nvim-lint": { "branch": "master", "commit": "e19842a05aae484957ad20710444757bc0a61d63" }, + "nvim-lspconfig": { "branch": "master", "commit": "38de86f82efd9ba0881203767d6a8e1815abca28" }, + "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, + "nvim-spectre": { "branch": "master", "commit": "366f46fdd4a1593cc237aea13d5ef113739a472c" }, + "nvim-treesitter": { "branch": "master", "commit": "b91ae14fc3bb801c7ea69bc283fe860b32b5163d" }, + "nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, + "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, - "tokyonight.nvim": { "branch": "main", "commit": "67afeaf7fd6ebba000633e89f63c31694057edde" }, - "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, + "todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" }, + "tokyonight.nvim": { "branch": "main", "commit": "0fae425aaab04a5f97666bd431b96f2f19c36935" }, + "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index cde1558..6441cff 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -1,9 +1,47 @@ return { - "folke/tokyonight.nvim", - lazy = true, - opts = { - style = "storm", - transparent = true, - dim_inactive = true, + { + "folke/tokyonight.nvim", + lazy = true, + opts = { + style = "storm", + transparent = true, + dim_inactive = true, + }, }, + { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, + opts = { + default_integrations = true, + dim_inactive = { + enabled = true + }, + flavour = "macchiato", + integrations = { + alpha = true, + cmp = true, + flash = true, + gitsigns = true, + lsp_trouble = true, + native_lsp = { + enabled = true, + underlines = { + errors = { "undercurl" }, + hints = { "undercurl" }, + warnings = { "undercurl" }, + information = { "undercurl" }, + }, + }, + neotree = true, + noice = true, + telescope = { + enabled = true, + }, + treesitter = true, + treesitter_context = true, + which_key = true, + } + } + } } diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 467aeb7..93c616b 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -4,14 +4,15 @@ return { dependencies = { "nvim-tree/nvim-web-devicons" }, opts = { options = { - icons_enabled = true, - theme = "tokyonight", disabled_filetypes = { statusline = { "alpha", - "neo-tree", } - } + }, + }, + extensions = { + "lazy", + "neo-tree", } }, }, @@ -24,18 +25,20 @@ return { { "akinsho/bufferline.nvim", event = "VeryLazy", + after = "catppuccin", keys = { { "bp", "BufferLineTogglePin", desc = "Toggle Pin" }, { "[b", "BufferLineCyclePrev", desc = "Prev Buffer" }, { "]b", "BufferLineCycleNext", desc = "Next Buffer" }, }, opts = { + highlights = require("catppuccin.groups.integrations.bufferline").get(), options = { diagnostics = "nvim_lsp", offsets = { { filetype = "neo-tree", - text = "Neo-tree", + text = "", highlight = "Directory", text_align = "left", }, From e17e2149588737852607382163611ee71c553e98 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 29 May 2024 20:43:16 -0700 Subject: [PATCH 041/240] feat: add feline --- lazy-lock.json | 2 +- lua/options.lua | 2 +- lua/plugins/ui.lua | 25 ++++++++++--------------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 797979b..2a1415e 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -8,13 +8,13 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" }, "dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" }, + "feline.nvim": { "branch": "main", "commit": "8bc28b94a16304aad2f53b8c3653b14803748c28" }, "flash.nvim": { "branch": "main", "commit": "11a2e667d19d8f48c93c6ed2e2e525ac6b1b79be" }, "friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" }, "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c1fbdcb0d8d1295314f1612c4a247253e70299d9" }, "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, diff --git a/lua/options.lua b/lua/options.lua index e08d218..c8870dc 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -4,7 +4,7 @@ vim.g.maplocalleader = " " vim.opt.belloff = "all" vim.opt.backspace = "2" vim.opt.showcmd = true -vim.opt.laststatus = 2 +vim.opt.laststatus = 3 -- global status bar vim.opt.swapfile = false vim.opt.number = true diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 93c616b..d3fa655 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,20 +1,15 @@ return { { - "nvim-lualine/lualine.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - opts = { - options = { - disabled_filetypes = { - statusline = { - "alpha", - } - }, - }, - extensions = { - "lazy", - "neo-tree", - } - }, + 'freddiehaddad/feline.nvim', + init = function() + local ctp_feline = require('catppuccin.groups.integrations.feline') + + ctp_feline.setup() + + require("feline").setup({ + components = ctp_feline.get(), + }) + end }, { "famiu/bufdelete.nvim", From 41367e3235f3fd78d73ef7e3a095d95fbb0dd321 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:05:47 -0700 Subject: [PATCH 042/240] feat: move linting to nvim-lint This also removes linting from conform.nvim, as it should be focused only on formatting --- lua/plugins/formatting.lua | 8 ++++---- lua/plugins/linting.lua | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index ef27e71..d3ca74e 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -6,12 +6,12 @@ return { scss = { "prettierd" }, html = { "djlint" }, lua = { "stylelua" }, - javascript = { "eslint_d", "prettierd" }, - javascriptreact = { "eslint_d", "prettierd" }, + javascript = { "prettierd" }, + javascriptreact = { "prettierd" }, json = { "prettierd" }, jsonc = { "prettierd" }, - typescript = { "eslint_d", "prettierd" }, - typescriptreact = { "eslint_d", "prettierd" }, + typescript = { "prettierd" }, + typescriptreact = { "prettierd" }, }, format_on_save = { lsp_fallback = true, diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua index 995389c..660ea46 100644 --- a/lua/plugins/linting.lua +++ b/lua/plugins/linting.lua @@ -4,10 +4,10 @@ return { events = { "BufWritePost", "BufReadPost", "InsertLeave" }, linters_by_ft = { html = { "djlint" }, - javascript = { "eslint_d" }, - typescript = { "eslint_d" }, - javascriptreact = { "eslint_d" }, - typescriptreact = { "eslint_d" }, + javascript = { "eslint" }, + typescript = { "eslint" }, + javascriptreact = { "eslint" }, + typescriptreact = { "eslint" }, }, }, config = function(_, opts) From 4aed78a5b3103fd5810f6916124ecfb87862047d Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 5 Jun 2024 12:43:21 -0700 Subject: [PATCH 043/240] feat: add markdown linting/formatting --- lua/plugins/formatting.lua | 1 + lua/plugins/linting.lua | 16 ++++++++++++++-- lua/plugins/lsp.lua | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index d3ca74e..ee276c1 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -6,6 +6,7 @@ return { scss = { "prettierd" }, html = { "djlint" }, lua = { "stylelua" }, + markdown = { "prettierd" }, javascript = { "prettierd" }, javascriptreact = { "prettierd" }, json = { "prettierd" }, diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua index 660ea46..66ce712 100644 --- a/lua/plugins/linting.lua +++ b/lua/plugins/linting.lua @@ -1,4 +1,4 @@ -return { +return { { "mfussenegger/nvim-lint", opts = { events = { "BufWritePost", "BufReadPost", "InsertLeave" }, @@ -23,4 +23,16 @@ return { end, }) end, -} +}, { + "jose-elias-alvarez/null-ls.nvim", + event = { "BufWritePost", "BufReadPost", "InsertLeave" }, + opts = function() + local null_ls = require("null-ls") + local diagnostics = null_ls.builtins.diagnostics + return { + sources = { + diagnostics.vale, + } + } + end +} } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 860226c..c8a3210 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -22,6 +22,7 @@ return { "eslint_d", "prettierd", "stylua", + "vale", }, automatic_installation = true, } From 6028c15c07a1136bef478684386c14748e5a586e Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 5 Jun 2024 12:43:45 -0700 Subject: [PATCH 044/240] fix: invalid opt --- lazy-lock.json | 1 + lua/plugins/ui.lua | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lazy-lock.json b/lazy-lock.json index 2a1415e..33c422a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -25,6 +25,7 @@ "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "noice.nvim": { "branch": "main", "commit": "69c6ad5c1f1c0777125d0275f9871d8609cb0521" }, "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, + "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-lint": { "branch": "master", "commit": "e19842a05aae484957ad20710444757bc0a61d63" }, diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index d3fa655..60ca8c4 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -20,7 +20,6 @@ return { { "akinsho/bufferline.nvim", event = "VeryLazy", - after = "catppuccin", keys = { { "bp", "BufferLineTogglePin", desc = "Toggle Pin" }, { "[b", "BufferLineCyclePrev", desc = "Prev Buffer" }, From 4e1bf4d043ac5aecce342ef59ff9dca5eda0c14f Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 5 Jun 2024 12:53:09 -0700 Subject: [PATCH 045/240] feat: add post-install note --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 285cf32..3c54a5d 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,9 @@ It's pretty opinionated. You might not like it. 2. Run Neovim. 3. Wait for everything to install. +# Post Installation + +- `vale` requires a configuration file to work. [Make sure one is present][valeconfig]. You may also need to run `vale sync` after adding it (if installed using Mason, make sure to run the binary installed by Mason and not the global one, if present). + [lazynvim]: https://github.com/folke/lazy.nvim +[valeconfig]: https://vale.sh/docs/topics/config/#global-configuration From c6affee6c19f70b2e689996b098e6d0dd2efcee4 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 5 Jun 2024 12:59:09 -0700 Subject: [PATCH 046/240] fix: use correct formatter for lua --- lua/plugins/formatting.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index ee276c1..dd49a97 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -5,7 +5,7 @@ return { css = { "prettierd" }, scss = { "prettierd" }, html = { "djlint" }, - lua = { "stylelua" }, + lua = { "stylua" }, markdown = { "prettierd" }, javascript = { "prettierd" }, javascriptreact = { "prettierd" }, From eebbb6c4b7bbe282ac4066f11ea605f380fbce43 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 5 Jun 2024 12:59:50 -0700 Subject: [PATCH 047/240] fix: formatting --- init.lua | 42 ++--- lua/autocmds.lua | 14 +- lua/keybinds.lua | 6 +- lua/options.lua | 14 +- lua/plugins/coding.lua | 187 +++++++++++---------- lua/plugins/colorscheme.lua | 90 +++++------ lua/plugins/editor.lua | 314 ++++++++++++++++++------------------ lua/plugins/formatting.lua | 38 ++--- lua/plugins/linting.lua | 75 ++++----- lua/plugins/lsp.lua | 112 ++++++------- lua/plugins/treesitter.lua | 78 ++++----- lua/plugins/ui.lua | 312 +++++++++++++++++------------------ 12 files changed, 642 insertions(+), 640 deletions(-) diff --git a/init.lua b/init.lua index 242952b..856ff0d 100644 --- a/init.lua +++ b/init.lua @@ -2,31 +2,31 @@ require("options") local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) end vim.opt.rtp:prepend(lazypath) -- Fix for yanking to system clipboard on Windows -if vim.fn.has('wsl') == 1 then - vim.g.clipboard = { - name = 'WslClipboard', - copy = { - ['+'] = 'clip.exe', - ['*'] = 'clip.exe', - }, - paste = { - ['+'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', - ['*'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', - }, - cache_enabled = 0, - } +if vim.fn.has("wsl") == 1 then + vim.g.clipboard = { + name = "WslClipboard", + copy = { + ["+"] = "clip.exe", + ["*"] = "clip.exe", + }, + paste = { + ["+"] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', + ["*"] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', + }, + cache_enabled = 0, + } end require("lazy").setup("plugins") diff --git a/lua/autocmds.lua b/lua/autocmds.lua index 1f6502d..260e358 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -1,12 +1,12 @@ local function augroup(name) - return vim.api.nvim_create_augroup("wf_" .. name, { clear = true }) + return vim.api.nvim_create_augroup("wf_" .. name, { clear = true }) end vim.api.nvim_create_autocmd({ "FileType" }, { - group = augroup("spellcheck"), - pattern = { "gitcommit", "markdown", "md", "mdx" }, - callback = function() - vim.opt_local.spell = true - vim.opt_local.wrap = true - end, + group = augroup("spellcheck"), + pattern = { "gitcommit", "markdown", "md", "mdx" }, + callback = function() + vim.opt_local.spell = true + vim.opt_local.wrap = true + end, }) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index 5f4a455..c7baf36 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -13,9 +13,9 @@ vim.keymap.set("v", "K", ":m '<-2gv=gv", { desc = "Move lines under cursor d vim.keymap.set("n", "n", "nzzzv", { desc = "Go to next search result and keep cursor centered on screen" }) vim.keymap.set("n", "N", "Nzzzv", { desc = "Go to previous search result and keep cursor centered on screen" }) -vim.keymap.set("x", "p", "\"_dP", { desc = "Paste without replacing clipboard contents" }) +vim.keymap.set("x", "p", '"_dP', { desc = "Paste without replacing clipboard contents" }) -vim.keymap.set("n", "y", "\"*y", { desc = "Yank into system clipboard" }) -vim.keymap.set("v", "y", "\"*y", { desc = "Yank into system clipboard" }) +vim.keymap.set("n", "y", '"*y', { desc = "Yank into system clipboard" }) +vim.keymap.set("v", "y", '"*y', { desc = "Yank into system clipboard" }) vim.keymap.set("i", "jk", "", { desc = "Exit insert mode" }) diff --git a/lua/options.lua b/lua/options.lua index c8870dc..ca0f843 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -31,13 +31,13 @@ vim.opt.hlsearch = false vim.opt.incsearch = true vim.opt.fillchars = { - foldopen = "", - foldclose = "", - -- fold = "⸱", - fold = " ", - foldsep = " ", - diff = "╱", - eob = " ", + foldopen = "", + foldclose = "", + -- fold = "⸱", + fold = " ", + foldsep = " ", + diff = "╱", + eob = " ", } vim.opt.foldlevel = 99 diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 5ec6181..4fe3313 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -1,100 +1,99 @@ return { - { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - }, - config = function() - local cmp = require("cmp") + { + "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", - }, + cmp.setup({ + -- Highlights the first result always + completion = { + completeopt = "menu,menuone,noinsert", + }, - 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 }), - }), + 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 - }, + snippet = { + expand = function(args) + require("luasnip").lsp_expand(args.body) + end, + }, - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "luasnip" }, - }, { - { name = "buffer" }, - }), - }) - end, - }, - { - "L3MON4D3/LuaSnip", - dependencies = { "rafamadriz/friendly-snippets" }, - }, - { - "echasnovski/mini.pairs", - version = false, - opts = { - mappings = { - ["`"] = { action = "closeopen", pair = "``", neigh_pattern = "[^\\`].", register = { cr = false } }, - }, - }, - }, - { - "echasnovski/mini.surround", - version = false, - opts = { - mappings = { - add = "gsa", -- Add surrounding in Normal and Visual modes - delete = "gsd", -- Delete surrounding - find = "gsf", -- Find surrounding (to the right) - find_left = "gsF", -- Find surrounding (to the left) - highlight = "gsh", -- Highlight surrounding - replace = "gsr", -- Replace surrounding - update_n_lines = "gsn", -- Update `n_lines` - }, - }, - }, - { - "JoosepAlviste/nvim-ts-context-commentstring", - opts = { - enable_autocmd = false, - }, - }, - { - "echasnovski/mini.comment", - version = false, - opts = { - options = { - custom_commentstring = function() - return require("ts_context_commentstring.internal").calculate_commentstring() - or vim.bo.commentstring - end, - }, - }, - }, + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + { name = "luasnip" }, + }, { + { name = "buffer" }, + }), + }) + end, + }, + { + "L3MON4D3/LuaSnip", + dependencies = { "rafamadriz/friendly-snippets" }, + }, + { + "echasnovski/mini.pairs", + version = false, + opts = { + mappings = { + ["`"] = { action = "closeopen", pair = "``", neigh_pattern = "[^\\`].", register = { cr = false } }, + }, + }, + }, + { + "echasnovski/mini.surround", + version = false, + opts = { + mappings = { + add = "gsa", -- Add surrounding in Normal and Visual modes + delete = "gsd", -- Delete surrounding + find = "gsf", -- Find surrounding (to the right) + find_left = "gsF", -- Find surrounding (to the left) + highlight = "gsh", -- Highlight surrounding + replace = "gsr", -- Replace surrounding + update_n_lines = "gsn", -- Update `n_lines` + }, + }, + }, + { + "JoosepAlviste/nvim-ts-context-commentstring", + opts = { + enable_autocmd = false, + }, + }, + { + "echasnovski/mini.comment", + version = false, + opts = { + options = { + custom_commentstring = function() + return require("ts_context_commentstring.internal").calculate_commentstring() or vim.bo.commentstring + end, + }, + }, + }, } diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 6441cff..e15d03b 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -1,47 +1,47 @@ return { - { - "folke/tokyonight.nvim", - lazy = true, - opts = { - style = "storm", - transparent = true, - dim_inactive = true, - }, - }, - { - "catppuccin/nvim", - name = "catppuccin", - priority = 1000, - opts = { - default_integrations = true, - dim_inactive = { - enabled = true - }, - flavour = "macchiato", - integrations = { - alpha = true, - cmp = true, - flash = true, - gitsigns = true, - lsp_trouble = true, - native_lsp = { - enabled = true, - underlines = { - errors = { "undercurl" }, - hints = { "undercurl" }, - warnings = { "undercurl" }, - information = { "undercurl" }, - }, - }, - neotree = true, - noice = true, - telescope = { - enabled = true, - }, - treesitter = true, - treesitter_context = true, - which_key = true, - } - } - } + { + "folke/tokyonight.nvim", + lazy = true, + opts = { + style = "storm", + transparent = true, + dim_inactive = true, + }, + }, + { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, + opts = { + default_integrations = true, + dim_inactive = { + enabled = true, + }, + flavour = "macchiato", + integrations = { + alpha = true, + cmp = true, + flash = true, + gitsigns = true, + lsp_trouble = true, + native_lsp = { + enabled = true, + underlines = { + errors = { "undercurl" }, + hints = { "undercurl" }, + warnings = { "undercurl" }, + information = { "undercurl" }, + }, + }, + neotree = true, + noice = true, + telescope = { + enabled = true, + }, + treesitter = true, + treesitter_context = true, + which_key = true, + }, + }, + }, } diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index cb91684..3e8f243 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -1,132 +1,132 @@ return { - { - "nvim-neo-tree/neo-tree.nvim", - event = "VeryLazy", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", - }, - config = function() - vim.keymap.set("n", "ee", ":Neotree toggle", { desc = "Toggle Neotree" }) - vim.keymap.set("n", "er", ":Neotree reveal", { desc = "Reveal file" }) + { + "nvim-neo-tree/neo-tree.nvim", + event = "VeryLazy", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + config = function() + vim.keymap.set("n", "ee", ":Neotree toggle", { desc = "Toggle Neotree" }) + vim.keymap.set("n", "er", ":Neotree reveal", { desc = "Reveal file" }) - local nt = require("neo-tree") + local nt = require("neo-tree") - nt.setup({ - open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, - filesystem = { - filtered_items = { - show_hidden_count = false, - hide_dotfiles = false, - hide_gitignored = true, - always_show = { - ".env", - ".env.local", - }, - never_show = { - ".git", - "thumbs.db", - ".DS_Store", - }, - }, - }, - window = { - mappings = { - ["m"] = { - "move", - config = { - show_path = "relative", - }, - }, - }, - }, - event_handlers = { - { - event = "neo_tree_popup_input_ready", - handler = function() - -- Switch to normal inside popups by default. - vim.cmd.stopinsert() - end, - }, - }, - }) - end, - }, - { - "folke/which-key.nvim", - event = "VeryLazy", - init = function() - vim.o.timeout = true - vim.o.timeoutlen = 300 - end, - opts = {}, - }, - { - "folke/trouble.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - vim.keymap.set("n", "tt", ":TroubleToggle", { desc = "Toggle Trouble" }) - end, - }, - { - "folke/todo-comments.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, - opts = {}, - }, - { - "nvim-pack/nvim-spectre", - dependencies = { "nvim-lua/plenary.nvim" }, - opts = { open_cmd = "noswapfile vnew" }, - keys = { - { - "sr", - function() - require("spectre").open() - end, - desc = "Replace in Files (Spectre)", - }, - }, - }, - { - "nvim-telescope/telescope.nvim", - tag = "0.1.5", - dependencies = { "nvim-lua/plenary.nvim" }, - config = function() - local builtin = require("telescope.builtin") + nt.setup({ + open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, + filesystem = { + filtered_items = { + show_hidden_count = false, + hide_dotfiles = false, + hide_gitignored = true, + always_show = { + ".env", + ".env.local", + }, + never_show = { + ".git", + "thumbs.db", + ".DS_Store", + }, + }, + }, + window = { + mappings = { + ["m"] = { + "move", + config = { + show_path = "relative", + }, + }, + }, + }, + event_handlers = { + { + event = "neo_tree_popup_input_ready", + handler = function() + -- Switch to normal inside popups by default. + vim.cmd.stopinsert() + end, + }, + }, + }) + end, + }, + { + "folke/which-key.nvim", + event = "VeryLazy", + init = function() + vim.o.timeout = true + vim.o.timeoutlen = 300 + end, + opts = {}, + }, + { + "folke/trouble.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + vim.keymap.set("n", "tt", ":TroubleToggle", { desc = "Toggle Trouble" }) + end, + }, + { + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = {}, + }, + { + "nvim-pack/nvim-spectre", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = { open_cmd = "noswapfile vnew" }, + keys = { + { + "sr", + function() + require("spectre").open() + end, + desc = "Replace in Files (Spectre)", + }, + }, + }, + { + "nvim-telescope/telescope.nvim", + tag = "0.1.5", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + local builtin = require("telescope.builtin") - vim.keymap.set("n", "ff", builtin.git_files, { desc = "Search git_files" }) - vim.keymap.set("n", "fg", builtin.live_grep, { desc = "Grep git_files" }) - vim.keymap.set("n", "fh", builtin.help_tags, { desc = "View help tags" }) - vim.keymap.set("n", "fb", builtin.buffers, { desc = "Search buffers" }) - vim.keymap.set("n", "sk", builtin.keymaps, { desc = "View keymaps" }) - vim.keymap.set("n", "sR", builtin.resume, { desc = "Resume" }) - vim.keymap.set("n", "st", "TodoTelescope", { desc = "Search TODOs" }) - end, - }, - { - "nvim-telescope/telescope-ui-select.nvim", - config = function() - require("telescope").setup({ - defaults = { - initial_mode = "normal", - }, - extensions = { - ["ui-select"] = { - require("telescope.themes").get_dropdown({}), - }, - }, - }) + vim.keymap.set("n", "ff", builtin.git_files, { desc = "Search git_files" }) + vim.keymap.set("n", "fg", builtin.live_grep, { desc = "Grep git_files" }) + vim.keymap.set("n", "fh", builtin.help_tags, { desc = "View help tags" }) + vim.keymap.set("n", "fb", builtin.buffers, { desc = "Search buffers" }) + vim.keymap.set("n", "sk", builtin.keymaps, { desc = "View keymaps" }) + vim.keymap.set("n", "sR", builtin.resume, { desc = "Resume" }) + vim.keymap.set("n", "st", "TodoTelescope", { desc = "Search TODOs" }) + end, + }, + { + "nvim-telescope/telescope-ui-select.nvim", + config = function() + require("telescope").setup({ + defaults = { + initial_mode = "normal", + }, + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown({}), + }, + }, + }) - require("telescope").load_extension("ui-select") - end, - }, - { - "folke/flash.nvim", - event = "VeryLazy", - ---@type Flash.Config - opts = {}, + require("telescope").load_extension("ui-select") + end, + }, + { + "folke/flash.nvim", + event = "VeryLazy", + ---@type Flash.Config + opts = {}, -- stylua: ignore keys = { { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, @@ -135,37 +135,37 @@ return { { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, }, - }, - { - "kdheepak/lazygit.nvim", - event = "VeryLazy", - cmd = { - "LazyGit", - "LazyGitConfig", - "LazyGitCurrentFile", - "LazyGitFilter", - "LazyGitFilterCurrentFile", - }, - -- optional for floating window border decoration - dependencies = { - "nvim-lua/plenary.nvim", - }, - keys = { - { "gg", "LazyGit", desc = "LazyGit" } - } - }, - { - "lewis6991/gitsigns.nvim", - event = "VeryLazy", - opts = { - signs = { - add = { text = "▎" }, - change = { text = "▎" }, - delete = { text = "" }, - topdelete = { text = "" }, - changedelete = { text = "▎" }, - untracked = { text = "▎" }, - }, - } - } + }, + { + "kdheepak/lazygit.nvim", + event = "VeryLazy", + cmd = { + "LazyGit", + "LazyGitConfig", + "LazyGitCurrentFile", + "LazyGitFilter", + "LazyGitFilterCurrentFile", + }, + -- optional for floating window border decoration + dependencies = { + "nvim-lua/plenary.nvim", + }, + keys = { + { "gg", "LazyGit", desc = "LazyGit" }, + }, + }, + { + "lewis6991/gitsigns.nvim", + event = "VeryLazy", + opts = { + signs = { + add = { text = "▎" }, + change = { text = "▎" }, + delete = { text = "" }, + topdelete = { text = "" }, + changedelete = { text = "▎" }, + untracked = { text = "▎" }, + }, + }, + }, } diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index dd49a97..c5b7efc 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -1,21 +1,21 @@ return { - "stevearc/conform.nvim", - opts = { - formatters_by_ft = { - css = { "prettierd" }, - scss = { "prettierd" }, - html = { "djlint" }, - lua = { "stylua" }, - markdown = { "prettierd" }, - javascript = { "prettierd" }, - javascriptreact = { "prettierd" }, - json = { "prettierd" }, - jsonc = { "prettierd" }, - typescript = { "prettierd" }, - typescriptreact = { "prettierd" }, - }, - format_on_save = { - lsp_fallback = true, - }, - }, + "stevearc/conform.nvim", + opts = { + formatters_by_ft = { + css = { "prettierd" }, + scss = { "prettierd" }, + html = { "djlint" }, + lua = { "stylua" }, + markdown = { "prettierd" }, + javascript = { "prettierd" }, + javascriptreact = { "prettierd" }, + json = { "prettierd" }, + jsonc = { "prettierd" }, + typescript = { "prettierd" }, + typescriptreact = { "prettierd" }, + }, + format_on_save = { + lsp_fallback = true, + }, + }, } diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua index 66ce712..99d4ad2 100644 --- a/lua/plugins/linting.lua +++ b/lua/plugins/linting.lua @@ -1,38 +1,41 @@ -return { { - "mfussenegger/nvim-lint", - opts = { - events = { "BufWritePost", "BufReadPost", "InsertLeave" }, - linters_by_ft = { - html = { "djlint" }, - javascript = { "eslint" }, - typescript = { "eslint" }, - javascriptreact = { "eslint" }, - typescriptreact = { "eslint" }, - }, - }, - config = function(_, opts) - local lint = require("lint") - lint.linters_by_ft = opts.linters_by_ft +return { + { + "mfussenegger/nvim-lint", + opts = { + events = { "BufWritePost", "BufReadPost", "InsertLeave" }, + linters_by_ft = { + html = { "djlint" }, + javascript = { "eslint" }, + typescript = { "eslint" }, + javascriptreact = { "eslint" }, + typescriptreact = { "eslint" }, + }, + }, + config = function(_, opts) + local lint = require("lint") + lint.linters_by_ft = opts.linters_by_ft - local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) + local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) - vim.api.nvim_create_autocmd(opts.events, { - group = lint_augroup, - callback = function() - lint.try_lint() - end, - }) - end, -}, { - "jose-elias-alvarez/null-ls.nvim", - event = { "BufWritePost", "BufReadPost", "InsertLeave" }, - opts = function() - local null_ls = require("null-ls") - local diagnostics = null_ls.builtins.diagnostics - return { - sources = { - diagnostics.vale, - } - } - end -} } + vim.api.nvim_create_autocmd(opts.events, { + group = lint_augroup, + callback = function() + lint.try_lint() + end, + }) + end, + }, + { + "jose-elias-alvarez/null-ls.nvim", + event = { "BufWritePost", "BufReadPost", "InsertLeave" }, + opts = function() + local null_ls = require("null-ls") + local diagnostics = null_ls.builtins.diagnostics + return { + sources = { + diagnostics.vale, + }, + } + end, + }, +} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index c8a3210..037ace4 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -1,61 +1,61 @@ return { - { - "williamboman/mason.nvim", - opts = {}, - }, - { - "williamboman/mason-lspconfig.nvim", - opts = { - ensure_installed = { - "lua_ls", - "tsserver", - "html", - } - } - }, - { - "WhoIsSethDaniel/mason-tool-installer.nvim", - opts = { - ensure_installed = { - "djlint", - "eslint", - "eslint_d", - "prettierd", - "stylua", - "vale", - }, - automatic_installation = true, - } - }, - -- lspconfig should be the last step. - { - "neovim/nvim-lspconfig", - event = "VeryLazy", - dependencies = { - "mason.nvim", - "williamboman/mason-lspconfig.nvim", - }, - opts = { - servers = { - tsserver = {}, - lua_ls = {}, - } - }, - config = function(_, opts) - local lspconfig = require("lspconfig") + { + "williamboman/mason.nvim", + opts = {}, + }, + { + "williamboman/mason-lspconfig.nvim", + opts = { + ensure_installed = { + "lua_ls", + "tsserver", + "html", + }, + }, + }, + { + "WhoIsSethDaniel/mason-tool-installer.nvim", + opts = { + ensure_installed = { + "djlint", + "eslint", + "eslint_d", + "prettierd", + "stylua", + "vale", + }, + automatic_installation = true, + }, + }, + -- lspconfig should be the last step. + { + "neovim/nvim-lspconfig", + event = "VeryLazy", + dependencies = { + "mason.nvim", + "williamboman/mason-lspconfig.nvim", + }, + opts = { + servers = { + tsserver = {}, + lua_ls = {}, + }, + }, + config = function(_, opts) + local lspconfig = require("lspconfig") - local servers = opts.servers + local servers = opts.servers - for server, server_opts in pairs(servers) do - lspconfig[server].setup(server_opts) - end + for server, server_opts in pairs(servers) do + lspconfig[server].setup(server_opts) + end - vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "Go to definition" }) - vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { desc = "Go to implementation" }) - vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "Show signature" }) - vim.keymap.set("n", "f", vim.lsp.buf.format, { desc = "Format buffer" }) - vim.keymap.set("n", "ca", vim.lsp.buf.code_action, { desc = "View code actions" }) - vim.keymap.set("n", "cr", vim.lsp.buf.rename, { desc = "Rename" }) - end, - }, + vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "Go to definition" }) + vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { desc = "Go to implementation" }) + vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "Show signature" }) + vim.keymap.set("n", "f", vim.lsp.buf.format, { desc = "Format buffer" }) + vim.keymap.set("n", "ca", vim.lsp.buf.code_action, { desc = "View code actions" }) + vim.keymap.set("n", "cr", vim.lsp.buf.rename, { desc = "Rename" }) + end, + }, } diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 85cf8f5..f1fbb6f 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -1,41 +1,41 @@ return { - { - "nvim-treesitter/nvim-treesitter", - version = false, - build = ":TSUpdate", - opts = { - ensure_installed = { - "lua", - "javascript", - "typescript", - "tsx", - "htmldjango", - "html", - "jsonc", - "json", - "jsdoc", - "markdown", - "markdown_inline", - "vim", - "vimdoc", - }, - highlight = { enable = true }, - indent = { enable = true }, - }, - config = function(_, opts) - require("nvim-treesitter.configs").setup(opts) - end, - }, - { - "nvim-treesitter/nvim-treesitter-context", - opts = { - max_lines = 2, - }, - }, - { - -- TODO: Figure out why this plugin is not working. - "windwp/nvim-autopairs", - event = "VeryLazy", - opts = {}, - }, + { + "nvim-treesitter/nvim-treesitter", + version = false, + build = ":TSUpdate", + opts = { + ensure_installed = { + "lua", + "javascript", + "typescript", + "tsx", + "htmldjango", + "html", + "jsonc", + "json", + "jsdoc", + "markdown", + "markdown_inline", + "vim", + "vimdoc", + }, + highlight = { enable = true }, + indent = { enable = true }, + }, + config = function(_, opts) + require("nvim-treesitter.configs").setup(opts) + end, + }, + { + "nvim-treesitter/nvim-treesitter-context", + opts = { + max_lines = 2, + }, + }, + { + -- TODO: Figure out why this plugin is not working. + "windwp/nvim-autopairs", + event = "VeryLazy", + opts = {}, + }, } diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 60ca8c4..77f87c7 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,163 +1,163 @@ return { - { - 'freddiehaddad/feline.nvim', - init = function() - local ctp_feline = require('catppuccin.groups.integrations.feline') + { + "freddiehaddad/feline.nvim", + init = function() + local ctp_feline = require("catppuccin.groups.integrations.feline") - ctp_feline.setup() + ctp_feline.setup() - require("feline").setup({ - components = ctp_feline.get(), - }) - end - }, - { - "famiu/bufdelete.nvim", - keys = { - { "bd", "Bdelete", desc = "Close Buffer" }, - }, - }, - { - "akinsho/bufferline.nvim", - event = "VeryLazy", - keys = { - { "bp", "BufferLineTogglePin", desc = "Toggle Pin" }, - { "[b", "BufferLineCyclePrev", desc = "Prev Buffer" }, - { "]b", "BufferLineCycleNext", desc = "Next Buffer" }, - }, - opts = { - highlights = require("catppuccin.groups.integrations.bufferline").get(), - options = { - diagnostics = "nvim_lsp", - offsets = { - { - filetype = "neo-tree", - text = "", - highlight = "Directory", - text_align = "left", - }, - }, - } - } - }, - { - "lukas-reineke/indent-blankline.nvim", - opts = { - indent = { - char = "│", - tab_char = "│", - }, - scope = { enabled = false }, - exclude = { - filetypes = { - "help", - "alpha", - "dashboard", - "neo-tree", - "Trouble", - "trouble", - "lazy", - "mason", - "notify", - "toggleterm", - "lazyterm", - }, - }, - }, - main = "ibl", - }, - { - "echasnovski/mini.indentscope", - opts = { - symbol = "│", - options = { try_as_border = true }, - }, - init = function() - vim.api.nvim_create_autocmd("FileType", { - pattern = { - "help", - "alpha", - "dashboard", - "neo-tree", - "Trouble", - "trouble", - "lazy", - "mason", - "notify", - "toggleterm", - "lazyterm", - }, - callback = function() - vim.b.miniindentscope_disable = true - end, - }) - end, - }, - { - "stevearc/dressing.nvim", - event = "VeryLazy", - opts = {} - }, - { - "rcarriga/nvim-notify", - opts = { - timeout = 2000, - stages = "static", - } - }, - { - "MunifTanjim/nui.nvim" - }, - { - "folke/noice.nvim", - event = "VeryLazy", - opts = {}, - dependencies = { - "MunifTanjim/nui.nvim", - "rcarriga/nvim-notify", - } - }, - { - "goolord/alpha-nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - local alpha = require("alpha") - local dashboard = require("alpha.themes.dashboard") + require("feline").setup({ + components = ctp_feline.get(), + }) + end, + }, + { + "famiu/bufdelete.nvim", + keys = { + { "bd", "Bdelete", desc = "Close Buffer" }, + }, + }, + { + "akinsho/bufferline.nvim", + event = "VeryLazy", + keys = { + { "bp", "BufferLineTogglePin", desc = "Toggle Pin" }, + { "[b", "BufferLineCyclePrev", desc = "Prev Buffer" }, + { "]b", "BufferLineCycleNext", desc = "Next Buffer" }, + }, + opts = { + highlights = require("catppuccin.groups.integrations.bufferline").get(), + options = { + diagnostics = "nvim_lsp", + offsets = { + { + filetype = "neo-tree", + text = "", + highlight = "Directory", + text_align = "left", + }, + }, + }, + }, + }, + { + "lukas-reineke/indent-blankline.nvim", + opts = { + indent = { + char = "│", + tab_char = "│", + }, + scope = { enabled = false }, + exclude = { + filetypes = { + "help", + "alpha", + "dashboard", + "neo-tree", + "Trouble", + "trouble", + "lazy", + "mason", + "notify", + "toggleterm", + "lazyterm", + }, + }, + }, + main = "ibl", + }, + { + "echasnovski/mini.indentscope", + opts = { + symbol = "│", + options = { try_as_border = true }, + }, + init = function() + vim.api.nvim_create_autocmd("FileType", { + pattern = { + "help", + "alpha", + "dashboard", + "neo-tree", + "Trouble", + "trouble", + "lazy", + "mason", + "notify", + "toggleterm", + "lazyterm", + }, + callback = function() + vim.b.miniindentscope_disable = true + end, + }) + end, + }, + { + "stevearc/dressing.nvim", + event = "VeryLazy", + opts = {}, + }, + { + "rcarriga/nvim-notify", + opts = { + timeout = 2000, + stages = "static", + }, + }, + { + "MunifTanjim/nui.nvim", + }, + { + "folke/noice.nvim", + event = "VeryLazy", + opts = {}, + dependencies = { + "MunifTanjim/nui.nvim", + "rcarriga/nvim-notify", + }, + }, + { + "goolord/alpha-nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + local alpha = require("alpha") + local dashboard = require("alpha.themes.dashboard") - -- https://github.com/MaximilianLloyd/ascii.nvim - dashboard.section.header.val = { - " ", - " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", - " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", - " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", - " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", - " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", - " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", - " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", - " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", - " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", - " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", - " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", - " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", - " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", - " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", - " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", - " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", - " ▄█████████▄▄ ", - " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", - " ▄▄█████▀▀▀▀ ▀■ ", - " ▄███▀▀▀▀ ", - " ■▀▀ ", - " ", - } + -- https://github.com/MaximilianLloyd/ascii.nvim + dashboard.section.header.val = { + " ", + " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", + " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", + " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", + " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", + " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", + " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", + " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", + " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", + " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", + " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", + " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", + " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", + " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", + " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", + " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", + " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", + " ▄█████████▄▄ ", + " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", + " ▄▄█████▀▀▀▀ ▀■ ", + " ▄███▀▀▀▀ ", + " ■▀▀ ", + " ", + } - dashboard.section.buttons.val = { - dashboard.button("e", " > New File", "ene"), - dashboard.button("SPC ee", " > File explorer", "Neotree"), - dashboard.button("q", " > Quit", "qa"), - } + dashboard.section.buttons.val = { + dashboard.button("e", " > New File", "ene"), + dashboard.button("SPC ee", " > File explorer", "Neotree"), + dashboard.button("q", " > Quit", "qa"), + } - alpha.setup(dashboard.opts) - end, - } + alpha.setup(dashboard.opts) + end, + }, } From 6a3774706a6eaa2ca505d270a40624294f783a78 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 6 Jun 2024 09:30:29 -0700 Subject: [PATCH 048/240] feat: switch to tokyonight theme --- init.lua | 2 +- lua/plugins/colorscheme.lua | 1 - lua/plugins/ui.lua | 11 +---------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/init.lua b/init.lua index 856ff0d..c602a71 100644 --- a/init.lua +++ b/init.lua @@ -33,4 +33,4 @@ require("lazy").setup("plugins") require("keybinds") require("autocmds") -vim.cmd.colorscheme("catppuccin") +vim.cmd.colorscheme("tokyonight") diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index e15d03b..fd432b5 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -4,7 +4,6 @@ return { lazy = true, opts = { style = "storm", - transparent = true, dim_inactive = true, }, }, diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 77f87c7..e06e51b 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,15 +1,7 @@ return { { "freddiehaddad/feline.nvim", - init = function() - local ctp_feline = require("catppuccin.groups.integrations.feline") - - ctp_feline.setup() - - require("feline").setup({ - components = ctp_feline.get(), - }) - end, + opts = {}, }, { "famiu/bufdelete.nvim", @@ -26,7 +18,6 @@ return { { "]b", "BufferLineCycleNext", desc = "Next Buffer" }, }, opts = { - highlights = require("catppuccin.groups.integrations.bufferline").get(), options = { diagnostics = "nvim_lsp", offsets = { From 88bc81f090dce7be11ee893c18a9dbb93117f5c0 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 6 Jun 2024 09:30:38 -0700 Subject: [PATCH 049/240] feat: plugin update --- lazy-lock.json | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 33c422a..057ee4b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,46 +1,46 @@ { - "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" }, + "LuaSnip": { "branch": "master", "commit": "2b6860d15aaab01d3fb90859c0ba97f20ad7bc5f" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" }, - "dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" }, + "conform.nvim": { "branch": "master", "commit": "069e971295a34a810484b7b2ef54b3c735214181" }, + "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" }, "feline.nvim": { "branch": "main", "commit": "8bc28b94a16304aad2f53b8c3653b14803748c28" }, - "flash.nvim": { "branch": "main", "commit": "11a2e667d19d8f48c93c6ed2e2e525ac6b1b79be" }, - "friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" }, - "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, + "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, + "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, + "gitsigns.nvim": { "branch": "main", "commit": "379a5a915aea3e9ba0d4a778e8478584ac0f9011" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, + "lazy.nvim": { "branch": "main", "commit": "70f2c090d3ffb14f8702d468e05beb240b768881" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "c1fbdcb0d8d1295314f1612c4a247253e70299d9" }, - "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, + "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, "mini.comment": { "branch": "main", "commit": "c8406379987c321ecdef9f53e1ca741a55002104" }, "mini.indentscope": { "branch": "main", "commit": "f0d7faa064c892b96997810afcddfadc3f2a15b3" }, "mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" }, "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "noice.nvim": { "branch": "main", "commit": "69c6ad5c1f1c0777125d0275f9871d8609cb0521" }, - "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, + "noice.nvim": { "branch": "main", "commit": "29c7f030b0920e2f17263a9ab8742cde144b9140" }, + "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, - "nvim-lint": { "branch": "master", "commit": "e19842a05aae484957ad20710444757bc0a61d63" }, - "nvim-lspconfig": { "branch": "master", "commit": "38de86f82efd9ba0881203767d6a8e1815abca28" }, + "nvim-lint": { "branch": "master", "commit": "1a3a8d047bc01f1760ae4a0f5e80f111ea222e67" }, + "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-spectre": { "branch": "master", "commit": "366f46fdd4a1593cc237aea13d5ef113739a472c" }, - "nvim-treesitter": { "branch": "master", "commit": "b91ae14fc3bb801c7ea69bc283fe860b32b5163d" }, - "nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" }, + "nvim-spectre": { "branch": "master", "commit": "4d22fe03554056de4325762add3e546c77e3a275" }, + "nvim-treesitter": { "branch": "master", "commit": "3a74b5831058d0daf8952a5b8c556c61b30a3f46" }, + "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" }, - "tokyonight.nvim": { "branch": "main", "commit": "0fae425aaab04a5f97666bd431b96f2f19c36935" }, - "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } + "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, + "tokyonight.nvim": { "branch": "main", "commit": "9d88650502bc331f43eb0bef6286e58144ac5a96" }, + "trouble.nvim": { "branch": "main", "commit": "39595e883e2f91456413ca4df287575d31665940" }, + "which-key.nvim": { "branch": "main", "commit": "0539da005b98b02cf730c1d9da82b8e8edb1c2d2" } } \ No newline at end of file From 5a2c7c9453042120e7cf316fd11a8edd7633759a Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 6 Jun 2024 09:34:02 -0700 Subject: [PATCH 050/240] feat: revert to lualine --- lazy-lock.json | 2 +- lua/plugins/ui.lua | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 057ee4b..6f020aa 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -8,13 +8,13 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "conform.nvim": { "branch": "master", "commit": "069e971295a34a810484b7b2ef54b3c735214181" }, "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" }, - "feline.nvim": { "branch": "main", "commit": "8bc28b94a16304aad2f53b8c3653b14803748c28" }, "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, "gitsigns.nvim": { "branch": "main", "commit": "379a5a915aea3e9ba0d4a778e8478584ac0f9011" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, "lazy.nvim": { "branch": "main", "commit": "70f2c090d3ffb14f8702d468e05beb240b768881" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index e06e51b..ea17230 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,7 +1,15 @@ return { { - "freddiehaddad/feline.nvim", - opts = {}, + "nvim-lualine/lualine.nvim", + dependencies = { + "nvim-tree/nvim-web-devicons", + }, + opts = { + options = { + icons_enabled = true, + theme = "tokyonight", + }, + }, }, { "famiu/bufdelete.nvim", From 55c38a8cf9065da6c82903b1da5a129087584440 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:10:53 -0700 Subject: [PATCH 051/240] fix: trouble breaking changes v3 --- lua/plugins/editor.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 3e8f243..9fc1285 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -66,9 +66,15 @@ return { { "folke/trouble.nvim", dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - vim.keymap.set("n", "tt", ":TroubleToggle", { desc = "Toggle Trouble" }) - end, + opts = {}, + cmd = "Trouble", + keys = { + { + "tt", + "Trouble diagnostics toggle", + desc = "Toggle Trouble", + }, + }, }, { "folke/todo-comments.nvim", From 9bcfb6db677e3a6f567c7522a7faebec1602941c Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:11:03 -0700 Subject: [PATCH 052/240] fix: snippets not loading for nvim-cmp --- lazy-lock.json | 1 + lua/plugins/coding.lua | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 6f020aa..322a61d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -6,6 +6,7 @@ "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "conform.nvim": { "branch": "master", "commit": "069e971295a34a810484b7b2ef54b3c735214181" }, "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" }, "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 4fe3313..282ad3e 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -1,4 +1,5 @@ return { + { "saadparwaiz1/cmp_luasnip" }, { "hrsh7th/nvim-cmp", dependencies = { @@ -13,7 +14,6 @@ return { completion = { completeopt = "menu,menuone,noinsert", }, - mapping = cmp.mapping.preset.insert({ [""] = cmp.mapping.scroll_docs(-4), [""] = cmp.mapping.scroll_docs(4), @@ -44,6 +44,7 @@ return { sources = cmp.config.sources({ { name = "nvim_lsp" }, + { name = "nvim_lsp_signature_help" }, { name = "luasnip" }, }, { { name = "buffer" }, @@ -53,7 +54,19 @@ return { }, { "L3MON4D3/LuaSnip", - dependencies = { "rafamadriz/friendly-snippets" }, + dependencies = { + { + "rafamadriz/friendly-snippets", + config = function() + require("luasnip.loaders.from_vscode").lazy_load() + end, + }, + }, + build = "make install_jsregexp", + opts = { + history = true, + delete_check_events = "TextChanged", + }, }, { "echasnovski/mini.pairs", From eb0b2e9bccadf05c63980b204396928fa6135027 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:48:25 -0700 Subject: [PATCH 053/240] feat: small tweak to nvim-cmp menu --- lua/plugins/coding.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 282ad3e..03fecd5 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -14,6 +14,12 @@ return { 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), From 807e1fc4f2aca0a5e745a2fe818cf82c464a9bc0 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 6 Jun 2024 21:48:25 -0700 Subject: [PATCH 054/240] feat: update neo-tree config --- lazy-lock.json | 8 +++--- lua/plugins/editor.lua | 64 ++++++++++++++---------------------------- 2 files changed, 25 insertions(+), 47 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 322a61d..40d226a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,7 +13,7 @@ "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, "gitsigns.nvim": { "branch": "main", "commit": "379a5a915aea3e9ba0d4a778e8478584ac0f9011" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "70f2c090d3ffb14f8702d468e05beb240b768881" }, + "lazy.nvim": { "branch": "main", "commit": "89ddc59d19513c5c19c8f8d2ad8573890bd00eef" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, @@ -36,12 +36,12 @@ "nvim-treesitter": { "branch": "master", "commit": "3a74b5831058d0daf8952a5b8c556c61b30a3f46" }, "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, - "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, + "nvim-web-devicons": { "branch": "master", "commit": "b4b302d6ae229f67df7a87ef69fa79473fe788a9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, "tokyonight.nvim": { "branch": "main", "commit": "9d88650502bc331f43eb0bef6286e58144ac5a96" }, - "trouble.nvim": { "branch": "main", "commit": "39595e883e2f91456413ca4df287575d31665940" }, - "which-key.nvim": { "branch": "main", "commit": "0539da005b98b02cf730c1d9da82b8e8edb1c2d2" } + "trouble.nvim": { "branch": "main", "commit": "791278e498e1147520e4214982767f77ca4a99df" }, + "which-key.nvim": { "branch": "main", "commit": "ccf027625df6c4e22febfdd786c5e1f7521c2ccb" } } \ No newline at end of file diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 9fc1285..7dfa40e 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -8,51 +8,29 @@ return { "nvim-tree/nvim-web-devicons", "MunifTanjim/nui.nvim", }, - config = function() - vim.keymap.set("n", "ee", ":Neotree toggle", { desc = "Toggle Neotree" }) - vim.keymap.set("n", "er", ":Neotree reveal", { desc = "Reveal file" }) - - local nt = require("neo-tree") - - nt.setup({ - open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, - filesystem = { - filtered_items = { - show_hidden_count = false, - hide_dotfiles = false, - hide_gitignored = true, - always_show = { - ".env", - ".env.local", - }, - never_show = { - ".git", - "thumbs.db", - ".DS_Store", - }, + keys = { + { "ee", "Neotree toggle", desc = "Toggle Neotree" }, + { "er", "Neotree reveal", desc = "Reveal file" }, + }, + opts = { + open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, + filesystem = { + filtered_items = { + show_hidden_count = false, + hide_dotfiles = false, + hide_gitignored = true, + always_show = { + ".env", + ".env.local", + }, + never_show = { + ".git", + "thumbs.db", + ".DS_Store", }, }, - window = { - mappings = { - ["m"] = { - "move", - config = { - show_path = "relative", - }, - }, - }, - }, - event_handlers = { - { - event = "neo_tree_popup_input_ready", - handler = function() - -- Switch to normal inside popups by default. - vim.cmd.stopinsert() - end, - }, - }, - }) - end, + }, + }, }, { "folke/which-key.nvim", From e4c5dff132f8293fb955f3f4589c62ea4aeaff6c Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 6 Jun 2024 22:00:57 -0700 Subject: [PATCH 055/240] feat: update telescope config --- lazy-lock.json | 2 +- lua/plugins/editor.lua | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 40d226a..f7dcf10 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -39,7 +39,7 @@ "nvim-web-devicons": { "branch": "master", "commit": "b4b302d6ae229f67df7a87ef69fa79473fe788a9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, "tokyonight.nvim": { "branch": "main", "commit": "9d88650502bc331f43eb0bef6286e58144ac5a96" }, "trouble.nvim": { "branch": "main", "commit": "791278e498e1147520e4214982767f77ca4a99df" }, diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 7dfa40e..9905e90 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -75,7 +75,7 @@ return { }, { "nvim-telescope/telescope.nvim", - tag = "0.1.5", + tag = "0.1.6", dependencies = { "nvim-lua/plenary.nvim" }, config = function() local builtin = require("telescope.builtin") @@ -93,9 +93,6 @@ return { "nvim-telescope/telescope-ui-select.nvim", config = function() require("telescope").setup({ - defaults = { - initial_mode = "normal", - }, extensions = { ["ui-select"] = { require("telescope.themes").get_dropdown({}), From 1ac79d049576f4dd08da691ef76468e44e9cd891 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 6 Jun 2024 22:51:18 -0700 Subject: [PATCH 056/240] feat: redo telescope keybinds --- lua/plugins/editor.lua | 48 ++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 9905e90..f7c84ff 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -77,17 +77,43 @@ return { "nvim-telescope/telescope.nvim", tag = "0.1.6", dependencies = { "nvim-lua/plenary.nvim" }, - config = function() - local builtin = require("telescope.builtin") - - vim.keymap.set("n", "ff", builtin.git_files, { desc = "Search git_files" }) - vim.keymap.set("n", "fg", builtin.live_grep, { desc = "Grep git_files" }) - vim.keymap.set("n", "fh", builtin.help_tags, { desc = "View help tags" }) - vim.keymap.set("n", "fb", builtin.buffers, { desc = "Search buffers" }) - vim.keymap.set("n", "sk", builtin.keymaps, { desc = "View keymaps" }) - vim.keymap.set("n", "sR", builtin.resume, { desc = "Resume" }) - vim.keymap.set("n", "st", "TodoTelescope", { desc = "Search TODOs" }) - end, + keys = { + { + "ff", + "lua require'telescope.builtin'.git_files{}", + desc = "Search git_files", + }, + { + "fg", + "lua require'telescope.builtin'.live_grep{}", + desc = "Grep git_files", + }, + { + "fh", + "lua require'telescope.builtin'.help_tags{}", + desc = "View help tags", + }, + { + "fb", + "lua require'telescope.builtin'.buffers{}", + desc = "Search buffers", + }, + { + "sk", + "lua require'telescope.builtin'.keymaps{}", + desc = "View keymaps", + }, + { + "sR", + "lua require'telescope.builtin'.resume{}", + desc = "Resume", + }, + { + "st", + "TodoTelescope", + desc = "Search TODOs", + }, + }, }, { "nvim-telescope/telescope-ui-select.nvim", From f6718d4c2bdd08eac4c46c00cb01b3785979af02 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 6 Jun 2024 22:58:54 -0700 Subject: [PATCH 057/240] feat: autopairs is working --- lua/plugins/treesitter.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index f1fbb6f..a79cfc6 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -33,9 +33,10 @@ return { }, }, { - -- TODO: Figure out why this plugin is not working. "windwp/nvim-autopairs", - event = "VeryLazy", - opts = {}, + event = "InsertEnter", + opts = { + disable_filetype = { "TelescopePrompt" }, + }, }, } From 7c658a83e17fa238913965dffd5f883377a9d53f Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 6 Jun 2024 23:17:41 -0700 Subject: [PATCH 058/240] feat: colorscheme tweak --- lua/plugins/colorscheme.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index fd432b5..3aa8984 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -5,6 +5,7 @@ return { opts = { style = "storm", dim_inactive = true, + terminal_colors = true, }, }, { From 04f50fa21638b549296b36d217c2ead08d519c7f Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 10:25:57 -0700 Subject: [PATCH 059/240] feat: switch to none-ls --- lazy-lock.json | 2 +- lua/plugins/linting.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index f7dcf10..fcb9d88 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -25,8 +25,8 @@ "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "noice.nvim": { "branch": "main", "commit": "29c7f030b0920e2f17263a9ab8742cde144b9140" }, + "none-ls.nvim": { "branch": "main", "commit": "8691504118b252d64fc5023a104aedd100ab754a" }, "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, - "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-lint": { "branch": "master", "commit": "1a3a8d047bc01f1760ae4a0f5e80f111ea222e67" }, diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua index 99d4ad2..087ba3e 100644 --- a/lua/plugins/linting.lua +++ b/lua/plugins/linting.lua @@ -26,7 +26,7 @@ return { end, }, { - "jose-elias-alvarez/null-ls.nvim", + "nvimtools/none-ls.nvim", event = { "BufWritePost", "BufReadPost", "InsertLeave" }, opts = function() local null_ls = require("null-ls") From dbe56a72fc8b6e682f44b8219af18f2d705ac0e3 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 10:26:22 -0700 Subject: [PATCH 060/240] feat: ensure eslint is added to lsp servers --- lua/plugins/lsp.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 037ace4..3cf85e7 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -37,6 +37,7 @@ return { }, opts = { servers = { + eslint = {}, tsserver = {}, lua_ls = {}, }, From 2f99d9a9af06b73e9f0f696917039ba4fe22a4c8 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 10:33:06 -0700 Subject: [PATCH 061/240] feat: add autotags plugin --- lazy-lock.json | 1 + lua/plugins/treesitter.lua | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/lazy-lock.json b/lazy-lock.json index fcb9d88..e801ed9 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -35,6 +35,7 @@ "nvim-spectre": { "branch": "master", "commit": "4d22fe03554056de4325762add3e546c77e3a275" }, "nvim-treesitter": { "branch": "master", "commit": "3a74b5831058d0daf8952a5b8c556c61b30a3f46" }, "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, + "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, "nvim-web-devicons": { "branch": "master", "commit": "b4b302d6ae229f67df7a87ef69fa79473fe788a9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index a79cfc6..7fa7c7e 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -39,4 +39,16 @@ return { disable_filetype = { "TelescopePrompt" }, }, }, + { + "windwp/nvim-ts-autotag", + event = "VeryLazy", + ft = { + "javascript", + "javascriptreact", + "typescript", + "typescriptreact", + "html", + }, + opts = {}, + }, } From cd401374448e336ea9484cf4039fc735650dfd74 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 10:33:46 -0700 Subject: [PATCH 062/240] feat: add filetypes configuration --- init.lua | 1 + lua/filetypes.lua | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 lua/filetypes.lua diff --git a/init.lua b/init.lua index c602a71..19f8a58 100644 --- a/init.lua +++ b/init.lua @@ -32,5 +32,6 @@ end require("lazy").setup("plugins") require("keybinds") require("autocmds") +require("filetypes") vim.cmd.colorscheme("tokyonight") diff --git a/lua/filetypes.lua b/lua/filetypes.lua new file mode 100644 index 0000000..587b138 --- /dev/null +++ b/lua/filetypes.lua @@ -0,0 +1,5 @@ +vim.filetype.add({ + extension = { + njk = "html", + }, +}) From 19ebbf1a6fb30dd483a62eaf0311667e7329f322 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 10:37:24 -0700 Subject: [PATCH 063/240] feat: add cssls --- lua/plugins/lsp.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 3cf85e7..7fa9f0b 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -7,6 +7,7 @@ return { "williamboman/mason-lspconfig.nvim", opts = { ensure_installed = { + "cssls", "lua_ls", "tsserver", "html", @@ -37,6 +38,7 @@ return { }, opts = { servers = { + cssls = {}, eslint = {}, tsserver = {}, lua_ls = {}, From b770e48da00faa3b22de2f9c2bcfc0121493589e Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 10:38:59 -0700 Subject: [PATCH 064/240] chore: plugin update --- lazy-lock.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index e801ed9..69e1ceb 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "2b6860d15aaab01d3fb90859c0ba97f20ad7bc5f" }, + "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, @@ -11,12 +11,12 @@ "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" }, "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, - "gitsigns.nvim": { "branch": "main", "commit": "379a5a915aea3e9ba0d4a778e8478584ac0f9011" }, + "gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "89ddc59d19513c5c19c8f8d2ad8573890bd00eef" }, + "lazy.nvim": { "branch": "main", "commit": "eb4957442e3182f051b0ae11da32e06d22c190e3" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "8db12610bcb7ce67013cfdfaba4dd47a23c6e851" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, "mini.comment": { "branch": "main", "commit": "c8406379987c321ecdef9f53e1ca741a55002104" }, @@ -24,16 +24,16 @@ "mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" }, "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "noice.nvim": { "branch": "main", "commit": "29c7f030b0920e2f17263a9ab8742cde144b9140" }, + "noice.nvim": { "branch": "main", "commit": "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64" }, "none-ls.nvim": { "branch": "main", "commit": "8691504118b252d64fc5023a104aedd100ab754a" }, "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, - "nvim-lint": { "branch": "master", "commit": "1a3a8d047bc01f1760ae4a0f5e80f111ea222e67" }, + "nvim-lint": { "branch": "master", "commit": "cf6ffafe158441b8c5e2051ab0fe5b1983527ba7" }, "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "4d22fe03554056de4325762add3e546c77e3a275" }, - "nvim-treesitter": { "branch": "master", "commit": "3a74b5831058d0daf8952a5b8c556c61b30a3f46" }, + "nvim-treesitter": { "branch": "master", "commit": "c5cbd3ec74f6f5ddbac939e6f24b99fe78262b4c" }, "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, @@ -42,7 +42,7 @@ "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, - "tokyonight.nvim": { "branch": "main", "commit": "9d88650502bc331f43eb0bef6286e58144ac5a96" }, - "trouble.nvim": { "branch": "main", "commit": "791278e498e1147520e4214982767f77ca4a99df" }, - "which-key.nvim": { "branch": "main", "commit": "ccf027625df6c4e22febfdd786c5e1f7521c2ccb" } + "tokyonight.nvim": { "branch": "main", "commit": "02e9028fe3560f38363c2d38f1c87e45eb04fdb3" }, + "trouble.nvim": { "branch": "main", "commit": "c11dc2777d52da2c8da25836817e43608ec951a5" }, + "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } } \ No newline at end of file From fbcda4b50b47862b613a684c60fb5bf37a225e1d Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 10:54:25 -0700 Subject: [PATCH 065/240] fix: exclude html snippets The autotag plugin can handle the majority of these snippets for me, so I'm happy to omit them so they don't conflict with each other. --- lua/plugins/coding.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 03fecd5..37e415e 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -64,7 +64,9 @@ return { { "rafamadriz/friendly-snippets", config = function() - require("luasnip.loaders.from_vscode").lazy_load() + require("luasnip.loaders.from_vscode").lazy_load({ + exclude = { "html" }, + }) end, }, }, From bc2b8d99a482a35d1fd2108fe98eabf7932c4e58 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:04:33 -0700 Subject: [PATCH 066/240] fix: adjust lsp config --- lua/plugins/lsp.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 7fa9f0b..5f1ff37 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -8,9 +8,11 @@ return { opts = { ensure_installed = { "cssls", + "eslint", "lua_ls", "tsserver", "html", + "vale_ls", }, }, }, @@ -19,12 +21,10 @@ return { opts = { ensure_installed = { "djlint", - "eslint", - "eslint_d", "prettierd", "stylua", - "vale", }, + auto_update = true, automatic_installation = true, }, }, From 3550e0d209c43f176d36b9c58f7e99dcb43cff51 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:06:15 -0700 Subject: [PATCH 067/240] feat: remove none-ls I figured out how to make Vale work with nvim-lint which was my preference. --- lua/plugins/linting.lua | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua index 087ba3e..85a8160 100644 --- a/lua/plugins/linting.lua +++ b/lua/plugins/linting.lua @@ -5,6 +5,7 @@ return { events = { "BufWritePost", "BufReadPost", "InsertLeave" }, linters_by_ft = { html = { "djlint" }, + markdown = { "vale" }, javascript = { "eslint" }, typescript = { "eslint" }, javascriptreact = { "eslint" }, @@ -25,17 +26,4 @@ return { }) end, }, - { - "nvimtools/none-ls.nvim", - event = { "BufWritePost", "BufReadPost", "InsertLeave" }, - opts = function() - local null_ls = require("null-ls") - local diagnostics = null_ls.builtins.diagnostics - return { - sources = { - diagnostics.vale, - }, - } - end, - }, } From d5cbe7bc984187a5a6f882d1b8f53256a79e1965 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:11:41 -0700 Subject: [PATCH 068/240] feat: add yml and toml language servers --- lua/plugins/lsp.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 5f1ff37..7cc9d31 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -9,10 +9,12 @@ return { ensure_installed = { "cssls", "eslint", - "lua_ls", - "tsserver", "html", + "lua_ls", + "taplo", -- .toml + "tsserver", "vale_ls", + "yamlls", -- .yml }, }, }, @@ -40,8 +42,11 @@ return { servers = { cssls = {}, eslint = {}, - tsserver = {}, + html = {}, lua_ls = {}, + taplo = {}, + tsserver = {}, + yamlls = {}, }, }, config = function(_, opts) From aa8502302298ceb0880deafcd7d627cbb230444d Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:34:29 -0700 Subject: [PATCH 069/240] feat: use vale-ls for formatting This still requires the Vale CLI which is installed. --- lua/plugins/lsp.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 7cc9d31..a8a7799 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -25,6 +25,7 @@ return { "djlint", "prettierd", "stylua", + "vale", -- Vale CLI }, auto_update = true, automatic_installation = true, @@ -46,6 +47,7 @@ return { lua_ls = {}, taplo = {}, tsserver = {}, + vale_ls = {}, yamlls = {}, }, }, From 15ff0e244bf52095ac1a06fe6f5b1ad93509f3eb Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:34:59 -0700 Subject: [PATCH 070/240] fix: remove vale from linters The language server will take care of this now, don't need it. --- lua/plugins/linting.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua index 85a8160..41239a5 100644 --- a/lua/plugins/linting.lua +++ b/lua/plugins/linting.lua @@ -5,7 +5,6 @@ return { events = { "BufWritePost", "BufReadPost", "InsertLeave" }, linters_by_ft = { html = { "djlint" }, - markdown = { "vale" }, javascript = { "eslint" }, typescript = { "eslint" }, javascriptreact = { "eslint" }, From fc8cf6a208c13ce6bc71c610336ce887bb75aab8 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:35:07 -0700 Subject: [PATCH 071/240] chore: update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 3c54a5d..164cd2b 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,12 @@ Uses [lazy.nvim][lazynvim] to manage plugins. It's pretty opinionated. You might not like it. +## Who is this geared for? + +I'm a web developer, so this setup is configured for that environment. Anyone who works with React (and Native), JavaScript/TypeScript, CSS, HTML, etc. + +I've also added some plugins for writing in Markdown as I prefer it. + ## Installation 1. Clone this repo into Neovim's config folder. From 446e2ce6200e4ed32e491c5f63609cec9f59317d Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:55:54 -0700 Subject: [PATCH 072/240] chore: remove @type --- lua/plugins/editor.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index f7c84ff..245f1a0 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -132,7 +132,6 @@ return { { "folke/flash.nvim", event = "VeryLazy", - ---@type Flash.Config opts = {}, -- stylua: ignore keys = { From c9cbb72e6c35f23d086509f47d47272e8fdfffc5 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:09:53 -0700 Subject: [PATCH 073/240] chore: tidy up alpha --- lua/plugins/ui.lua | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index ea17230..1b8c49c 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -125,29 +125,29 @@ return { -- https://github.com/MaximilianLloyd/ascii.nvim dashboard.section.header.val = { - " ", - " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", - " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", - " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", - " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", - " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", - " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", - " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", - " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", - " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", - " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", - " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", - " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", - " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", - " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", - " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", - " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", - " ▄█████████▄▄ ", - " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", - " ▄▄█████▀▀▀▀ ▀■ ", - " ▄███▀▀▀▀ ", - " ■▀▀ ", - " ", + " ", + " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", + " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", + " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", + " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", + " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", + " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", + " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", + " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", + " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", + " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", + " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", + " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", + " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", + " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", + " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", + " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", + " ▄█████████▄▄ ", + " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", + " ▄▄█████▀▀▀▀ ▀■ ", + " ▄███▀▀▀▀ ", + " ■▀▀ ", + " ", } dashboard.section.buttons.val = { From d427df09f0b20bc254fcca57fb2ef428ea7392c1 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:10:39 -0700 Subject: [PATCH 074/240] chore: plugin update --- lazy-lock.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 69e1ceb..ce1021c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -25,11 +25,10 @@ "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "noice.nvim": { "branch": "main", "commit": "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64" }, - "none-ls.nvim": { "branch": "main", "commit": "8691504118b252d64fc5023a104aedd100ab754a" }, "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, - "nvim-lint": { "branch": "master", "commit": "cf6ffafe158441b8c5e2051ab0fe5b1983527ba7" }, + "nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" }, "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "4d22fe03554056de4325762add3e546c77e3a275" }, @@ -43,6 +42,6 @@ "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, "tokyonight.nvim": { "branch": "main", "commit": "02e9028fe3560f38363c2d38f1c87e45eb04fdb3" }, - "trouble.nvim": { "branch": "main", "commit": "c11dc2777d52da2c8da25836817e43608ec951a5" }, + "trouble.nvim": { "branch": "main", "commit": "38915023a777b7f2422e503dc603f6a64b465bf5" }, "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } } \ No newline at end of file From 5f03aaedaf52e5de47af7556617f0940489c3fbb Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:07:43 -0700 Subject: [PATCH 075/240] feat: add floating terminal plugin --- lua/keybinds.lua | 15 +++++++++++---- lua/plugins/ui.lua | 11 +++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index c7baf36..c89b74d 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -1,7 +1,7 @@ -vim.keymap.set("n", "", "", { desc = "Go to split on left" }) -vim.keymap.set("n", "", "", { desc = "Go to split above" }) -vim.keymap.set("n", "", "", { desc = "Go to split below" }) -vim.keymap.set("n", "", "", { desc = "Go to split on right" }) +vim.keymap.set("n", "", "wincmd h", { desc = "Go to split on left" }) +vim.keymap.set("n", "", "wincmd j", { desc = "Go to split above" }) +vim.keymap.set("n", "", "wincmd k", { desc = "Go to split below" }) +vim.keymap.set("n", "", "wincmd l", { desc = "Go to split on right" }) vim.keymap.set("n", "|", "v", { desc = "Split window right" }) vim.keymap.set("n", "-", "s", { desc = "Split window below" }) @@ -19,3 +19,10 @@ vim.keymap.set("n", "y", '"*y', { desc = "Yank into system clipboard" }) vim.keymap.set("v", "y", '"*y', { desc = "Yank into system clipboard" }) vim.keymap.set("i", "jk", "", { desc = "Exit insert mode" }) + +vim.keymap.set("t", "", "", { desc = "Exit insert mode (Terminal)" }) +vim.keymap.set("t", "jk", "", { desc = "Exit insert mode (Terminal)" }) +vim.keymap.set("t", "", "wincmd h", { desc = "Go to split on left (Terminal)" }) +vim.keymap.set("t", "", "wincmd j", { desc = "Go to split above (Terminal)" }) +vim.keymap.set("t", "", "wincmd k", { desc = "Go to split below (Terminal)" }) +vim.keymap.set("t", "", "wincmd l", { desc = "Go to split on right (Terminal)" }) diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 1b8c49c..9203729 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -159,4 +159,15 @@ return { alpha.setup(dashboard.opts) end, }, + { + "akinsho/toggleterm.nvim", + opts = {}, + keys = { + { + "T", + "ToggleTerm direction=float", + desc = "Open floating terminal", + }, + }, + }, } From 51b484764de2fd92ab107633f658c954b11acc8d Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:12:37 -0700 Subject: [PATCH 076/240] chore: add plugin to lazy-lock --- lazy-lock.json | 1 + 1 file changed, 1 insertion(+) diff --git a/lazy-lock.json b/lazy-lock.json index ce1021c..4cda85d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -41,6 +41,7 @@ "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, + "toggleterm.nvim": { "branch": "main", "commit": "fee58a0473fd92b28c34f8f724e4918b15ba30a3" }, "tokyonight.nvim": { "branch": "main", "commit": "02e9028fe3560f38363c2d38f1c87e45eb04fdb3" }, "trouble.nvim": { "branch": "main", "commit": "38915023a777b7f2422e503dc603f6a64b465bf5" }, "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } From a4a51853e15f1cfdb25297b2f76f791aad07b6ac Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:30:20 -0700 Subject: [PATCH 077/240] feat: add proselint This also removes vale from my config. I was annoyed at how much setup vale needed before it could work, and find that proselint does what I want without the extras of vale. --- README.md | 7 +------ lua/plugins/linting.lua | 1 + lua/plugins/lsp.lua | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 164cd2b..ff6f2a2 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Uses [lazy.nvim][lazynvim] to manage plugins. -It's pretty opinionated. You might not like it. +It's opinionated. You might not like it. ## Who is this geared for? @@ -16,9 +16,4 @@ I've also added some plugins for writing in Markdown as I prefer it. 2. Run Neovim. 3. Wait for everything to install. -# Post Installation - -- `vale` requires a configuration file to work. [Make sure one is present][valeconfig]. You may also need to run `vale sync` after adding it (if installed using Mason, make sure to run the binary installed by Mason and not the global one, if present). - [lazynvim]: https://github.com/folke/lazy.nvim -[valeconfig]: https://vale.sh/docs/topics/config/#global-configuration diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua index 41239a5..f441d4d 100644 --- a/lua/plugins/linting.lua +++ b/lua/plugins/linting.lua @@ -5,6 +5,7 @@ return { events = { "BufWritePost", "BufReadPost", "InsertLeave" }, linters_by_ft = { html = { "djlint" }, + markdown = { "proselint" }, javascript = { "eslint" }, typescript = { "eslint" }, javascriptreact = { "eslint" }, diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index a8a7799..c34003c 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -13,7 +13,6 @@ return { "lua_ls", "taplo", -- .toml "tsserver", - "vale_ls", "yamlls", -- .yml }, }, @@ -24,8 +23,8 @@ return { ensure_installed = { "djlint", "prettierd", + "proselint", "stylua", - "vale", -- Vale CLI }, auto_update = true, automatic_installation = true, @@ -47,7 +46,6 @@ return { lua_ls = {}, taplo = {}, tsserver = {}, - vale_ls = {}, yamlls = {}, }, }, From 0ef76a68af38c1af05bf52543da7bc6e23584812 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Sat, 8 Jun 2024 16:50:04 -0700 Subject: [PATCH 078/240] feat: remove unused plugins --- lua/plugins/treesitter.lua | 7 ------- lua/plugins/ui.lua | 5 ----- 2 files changed, 12 deletions(-) diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 7fa7c7e..0f277eb 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -32,13 +32,6 @@ return { max_lines = 2, }, }, - { - "windwp/nvim-autopairs", - event = "InsertEnter", - opts = { - disable_filetype = { "TelescopePrompt" }, - }, - }, { "windwp/nvim-ts-autotag", event = "VeryLazy", diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 9203729..a8c4e1f 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -92,11 +92,6 @@ return { }) end, }, - { - "stevearc/dressing.nvim", - event = "VeryLazy", - opts = {}, - }, { "rcarriga/nvim-notify", opts = { From 339d648dc418e5ffbd10df22ece79f4b2b3cfa0a Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Mon, 17 Jun 2024 12:14:07 -0700 Subject: [PATCH 079/240] feat: revise config for markdown etc --- lazy-lock.json | 2 -- lua/autocmds.lua | 11 ++++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 4cda85d..e327bb4 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -8,7 +8,6 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "conform.nvim": { "branch": "master", "commit": "069e971295a34a810484b7b2ef54b3c735214181" }, - "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" }, "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, "gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" }, @@ -26,7 +25,6 @@ "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "noice.nvim": { "branch": "main", "commit": "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64" }, "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, - "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" }, "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" }, diff --git a/lua/autocmds.lua b/lua/autocmds.lua index 260e358..17c3268 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -7,6 +7,15 @@ vim.api.nvim_create_autocmd({ "FileType" }, { pattern = { "gitcommit", "markdown", "md", "mdx" }, callback = function() vim.opt_local.spell = true - vim.opt_local.wrap = true + end, +}) + +vim.api.nvim_create_autocmd({ "FileType" }, { + group = augroup("prose"), + pattern = { "gitcommit", "markdown", "md", "mdx" }, + callback = function() + vim.opt_local.wrap = true + vim.opt_local.textwidth = 80 + vim.opt_local.linebreak = true end, }) From 1494a321f6ab614af9d0003b4a21ac594092616e Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Mon, 17 Jun 2024 17:58:17 -0700 Subject: [PATCH 080/240] feat: update lualine config --- lua/plugins/ui.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index a8c4e1f..4a231dd 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -8,6 +8,21 @@ return { options = { icons_enabled = true, theme = "tokyonight", + component_separators = { left = "", right = "" }, + section_separators = { left = "", right = "" }, + }, + sections = { + lualine_c = { + { + "filename", + file_status = true, + path = 1, + symbols = { + modified = "●", + }, + }, + }, + lualine_x = { "filetype" }, }, }, }, From e5f0d9bc25816f6f59cb45782f2eab0fda31b70e Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Mon, 17 Jun 2024 20:14:44 -0700 Subject: [PATCH 081/240] feat: remove bufferline --- lazy-lock.json | 2 -- lua/plugins/ui.lua | 28 ---------------------------- 2 files changed, 30 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index e327bb4..12ce6e6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,8 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, - "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 4a231dd..0d8bf45 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -26,34 +26,6 @@ return { }, }, }, - { - "famiu/bufdelete.nvim", - keys = { - { "bd", "Bdelete", desc = "Close Buffer" }, - }, - }, - { - "akinsho/bufferline.nvim", - event = "VeryLazy", - keys = { - { "bp", "BufferLineTogglePin", desc = "Toggle Pin" }, - { "[b", "BufferLineCyclePrev", desc = "Prev Buffer" }, - { "]b", "BufferLineCycleNext", desc = "Next Buffer" }, - }, - opts = { - options = { - diagnostics = "nvim_lsp", - offsets = { - { - filetype = "neo-tree", - text = "", - highlight = "Directory", - text_align = "left", - }, - }, - }, - }, - }, { "lukas-reineke/indent-blankline.nvim", opts = { From 36de7c527d9a0dd6b0e0f6f88296fa9e12180873 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Mon, 17 Jun 2024 21:21:13 -0700 Subject: [PATCH 082/240] feat: add toml formatting --- lua/plugins/formatting.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index c5b7efc..82c9b4a 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -11,11 +11,26 @@ return { javascriptreact = { "prettierd" }, json = { "prettierd" }, jsonc = { "prettierd" }, + toml = { "taplo" }, typescript = { "prettierd" }, typescriptreact = { "prettierd" }, }, format_on_save = { lsp_fallback = true, }, + formatters = { + taplo = { + args = function() + -- conform.nvim does not parse bash envvars, so we do it ourselves + local CONFIG_PATH = os.getenv("HOME") .. "/.config/taplo/taplo.toml" + return { + "format", + "--config", + CONFIG_PATH, + "-", + } + end, + }, + }, }, } From e9ec11636f0f424c6ee9e1f3efb6edeedba9c85a Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Sat, 22 Jun 2024 21:13:48 -0700 Subject: [PATCH 083/240] chore: plugin update --- lazy-lock.json | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 12ce6e6..9a3b5b3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,44 +1,44 @@ { "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" }, + "catppuccin": { "branch": "main", "commit": "67565cd353fa543fa30cb738570c2e4c87da3e9c" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "069e971295a34a810484b7b2ef54b3c735214181" }, + "conform.nvim": { "branch": "master", "commit": "9a06e83527407a7600a2fe4e0d10adf432b6215e" }, "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, - "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, - "gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" }, + "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, + "gitsigns.nvim": { "branch": "main", "commit": "8df63f2ddc615feb71fd4aee45a4cee022876df1" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "eb4957442e3182f051b0ae11da32e06d22c190e3" }, + "lazy.nvim": { "branch": "main", "commit": "bc620783663ab09d16bff9fdecc07da65b2a1528" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "8db12610bcb7ce67013cfdfaba4dd47a23c6e851" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.comment": { "branch": "main", "commit": "c8406379987c321ecdef9f53e1ca741a55002104" }, - "mini.indentscope": { "branch": "main", "commit": "f0d7faa064c892b96997810afcddfadc3f2a15b3" }, - "mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" }, - "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" }, + "mini.comment": { "branch": "main", "commit": "0b4ff4f594bc7d87a9e796e30760bf784b769f6d" }, + "mini.indentscope": { "branch": "main", "commit": "f15c61e71318b16c6616c2ace907136b76674f13" }, + "mini.pairs": { "branch": "main", "commit": "49edfefffeac6a339753339c3482dec33903b43a" }, + "mini.surround": { "branch": "main", "commit": "99eb6175801434d26496e81e47632d4e4543994a" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "noice.nvim": { "branch": "main", "commit": "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64" }, - "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, - "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, + "noice.nvim": { "branch": "main", "commit": "88ac36864b5976a64b14a8f156c616f41b32f228" }, + "nui.nvim": { "branch": "main", "commit": "a2bc1e9d0359caa5d11ad967cd1e30e8d4676226" }, + "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, "nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" }, - "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" }, + "nvim-lspconfig": { "branch": "master", "commit": "0630abde4d99740773b6f7da70937268c20854a4" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-spectre": { "branch": "master", "commit": "4d22fe03554056de4325762add3e546c77e3a275" }, - "nvim-treesitter": { "branch": "master", "commit": "c5cbd3ec74f6f5ddbac939e6f24b99fe78262b4c" }, + "nvim-spectre": { "branch": "master", "commit": "ec67d4b5370094b923dfcf6b09b39142f2964861" }, + "nvim-treesitter": { "branch": "master", "commit": "122b4d3db1616c1f1305b847c5ed2217c4c329f1" }, "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, - "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" }, + "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, - "nvim-web-devicons": { "branch": "master", "commit": "b4b302d6ae229f67df7a87ef69fa79473fe788a9" }, + "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, - "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, + "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, "toggleterm.nvim": { "branch": "main", "commit": "fee58a0473fd92b28c34f8f724e4918b15ba30a3" }, - "tokyonight.nvim": { "branch": "main", "commit": "02e9028fe3560f38363c2d38f1c87e45eb04fdb3" }, - "trouble.nvim": { "branch": "main", "commit": "38915023a777b7f2422e503dc603f6a64b465bf5" }, + "tokyonight.nvim": { "branch": "main", "commit": "81c867c5f638597a82c82094dcb90ed42444dabc" }, + "trouble.nvim": { "branch": "main", "commit": "82042f7bf42ebedc8f2751f0ab16ebaff42c1ce7" }, "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } } \ No newline at end of file From ad4dfe73ea558d3ae428949dd5a9a564621bd967 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Sat, 22 Jun 2024 21:14:52 -0700 Subject: [PATCH 084/240] feat: disable treesitter-context This plugin is flooding my editor with errors when editing Markdown files. Disabling for now until I can look into it more. --- lazy-lock.json | 1 - lua/plugins/treesitter.lua | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 9a3b5b3..664ab00 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -29,7 +29,6 @@ "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "ec67d4b5370094b923dfcf6b09b39142f2964861" }, "nvim-treesitter": { "branch": "master", "commit": "122b4d3db1616c1f1305b847c5ed2217c4c329f1" }, - "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 0f277eb..3dcacaf 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -26,12 +26,12 @@ return { require("nvim-treesitter.configs").setup(opts) end, }, - { - "nvim-treesitter/nvim-treesitter-context", - opts = { - max_lines = 2, - }, - }, + -- { + -- "nvim-treesitter/nvim-treesitter-context", + -- opts = { + -- max_lines = 2, + -- }, + -- }, { "windwp/nvim-ts-autotag", event = "VeryLazy", From 7a4646c8d4bef81f9371a646f262019c4f8c8db7 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Tue, 2 Jul 2024 17:53:09 -0700 Subject: [PATCH 085/240] chore: plugin update --- lazy-lock.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 664ab00..329b5a3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,34 +1,34 @@ { - "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, + "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "catppuccin": { "branch": "main", "commit": "67565cd353fa543fa30cb738570c2e4c87da3e9c" }, + "catppuccin": { "branch": "main", "commit": "31fcfb02c47952d5c75aec893b93b2878abe5fbb" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "9a06e83527407a7600a2fe4e0d10adf432b6215e" }, + "conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" }, "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gitsigns.nvim": { "branch": "main", "commit": "8df63f2ddc615feb71fd4aee45a4cee022876df1" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "bc620783663ab09d16bff9fdecc07da65b2a1528" }, + "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" }, + "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "lazy.nvim": { "branch": "main", "commit": "d0921f5b9b3d2c5e09618da55a018228edcc4d16" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.comment": { "branch": "main", "commit": "0b4ff4f594bc7d87a9e796e30760bf784b769f6d" }, - "mini.indentscope": { "branch": "main", "commit": "f15c61e71318b16c6616c2ace907136b76674f13" }, - "mini.pairs": { "branch": "main", "commit": "49edfefffeac6a339753339c3482dec33903b43a" }, - "mini.surround": { "branch": "main", "commit": "99eb6175801434d26496e81e47632d4e4543994a" }, + "mini.comment": { "branch": "main", "commit": "080f00bb91fea4bab799820bd2ce835a88d0703a" }, + "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, + "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, + "mini.surround": { "branch": "main", "commit": "7098744c8d4573a4b32cb172965f6b2ba03465d2" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "noice.nvim": { "branch": "main", "commit": "88ac36864b5976a64b14a8f156c616f41b32f228" }, - "nui.nvim": { "branch": "main", "commit": "a2bc1e9d0359caa5d11ad967cd1e30e8d4676226" }, + "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, - "nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" }, - "nvim-lspconfig": { "branch": "master", "commit": "0630abde4d99740773b6f7da70937268c20854a4" }, + "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, + "nvim-lspconfig": { "branch": "master", "commit": "53a3c6444ec5006b567071614c83edc8ad651f6d" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-spectre": { "branch": "master", "commit": "ec67d4b5370094b923dfcf6b09b39142f2964861" }, - "nvim-treesitter": { "branch": "master", "commit": "122b4d3db1616c1f1305b847c5ed2217c4c329f1" }, + "nvim-spectre": { "branch": "master", "commit": "49fae98ef2bfa8342522b337892992e3495065d5" }, + "nvim-treesitter": { "branch": "master", "commit": "6cd4ce6cab184e8787f164a182954534221f2af2" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, @@ -36,8 +36,8 @@ "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, - "toggleterm.nvim": { "branch": "main", "commit": "fee58a0473fd92b28c34f8f724e4918b15ba30a3" }, - "tokyonight.nvim": { "branch": "main", "commit": "81c867c5f638597a82c82094dcb90ed42444dabc" }, - "trouble.nvim": { "branch": "main", "commit": "82042f7bf42ebedc8f2751f0ab16ebaff42c1ce7" }, + "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, + "tokyonight.nvim": { "branch": "main", "commit": "c16eaeb9eaf4eb307431e58ec6101eecf2dbe52d" }, + "trouble.nvim": { "branch": "main", "commit": "e5d0e04121c662ce29190a57dd03655d43c59d44" }, "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } } \ No newline at end of file From e40388a48ffb21f14a61b787c18971c38d1d5073 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Tue, 2 Jul 2024 17:53:54 -0700 Subject: [PATCH 086/240] chore: remove catppuccin colorscheme --- lazy-lock.json | 1 - lua/plugins/colorscheme.lua | 36 ------------------------------------ 2 files changed, 37 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 329b5a3..16efa76 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,7 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "catppuccin": { "branch": "main", "commit": "31fcfb02c47952d5c75aec893b93b2878abe5fbb" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 3aa8984..251512c 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -8,40 +8,4 @@ return { terminal_colors = true, }, }, - { - "catppuccin/nvim", - name = "catppuccin", - priority = 1000, - opts = { - default_integrations = true, - dim_inactive = { - enabled = true, - }, - flavour = "macchiato", - integrations = { - alpha = true, - cmp = true, - flash = true, - gitsigns = true, - lsp_trouble = true, - native_lsp = { - enabled = true, - underlines = { - errors = { "undercurl" }, - hints = { "undercurl" }, - warnings = { "undercurl" }, - information = { "undercurl" }, - }, - }, - neotree = true, - noice = true, - telescope = { - enabled = true, - }, - treesitter = true, - treesitter_context = true, - which_key = true, - }, - }, - }, } From 39ff075293bda96024b9cf56b77250623a80db99 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 3 Jul 2024 10:00:18 -0700 Subject: [PATCH 087/240] fix: remove linebreak and textwidth opts This was causing more issues than solving, so I'm getting rid of it. --- lua/autocmds.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/lua/autocmds.lua b/lua/autocmds.lua index 17c3268..c65d83b 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -15,7 +15,5 @@ vim.api.nvim_create_autocmd({ "FileType" }, { pattern = { "gitcommit", "markdown", "md", "mdx" }, callback = function() vim.opt_local.wrap = true - vim.opt_local.textwidth = 80 - vim.opt_local.linebreak = true end, }) From 5d611968544ec4bc53db8eb37078a8d009492abd Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 3 Jul 2024 10:22:13 -0700 Subject: [PATCH 088/240] feat: add attempt.nvim This plugin is for creating new scratch windows. --- lazy-lock.json | 1 + lua/plugins/editor.lua | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/lazy-lock.json b/lazy-lock.json index 16efa76..671a5ae 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,7 @@ { "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, + "attempt.nvim": { "branch": "main", "commit": "3905db768478a2152fd927ab5a8def85bc2e34e7" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 245f1a0..2d11c4d 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -174,4 +174,20 @@ return { }, }, }, + { + "m-demare/attempt.nvim", + opts = { + ext_options = { "js", "lua" }, + }, + keys = function() + local attempt = require("attempt") + + return { + { "an", attempt.new_select, desc = "New attempt" }, + { "ar", attempt.run, desc = "Run attempt" }, + { "ad", attempt.delete_buf, desc = "Delete attempt buffer" }, + { "al", "Telescope attempt", desc = "Search attempts" }, + } + end, + }, } From e21b539a406690ca4a184bf06e1eba04d363271e Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 25 Jul 2024 21:40:39 -0700 Subject: [PATCH 089/240] chore: plugin update --- lazy-lock.json | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 671a5ae..671b6bb 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -5,39 +5,39 @@ "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" }, - "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, - "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" }, + "conform.nvim": { "branch": "master", "commit": "25d48271e3d4404ba017cb92a37d3a681c1ad149" }, + "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, + "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, + "gitsigns.nvim": { "branch": "main", "commit": "f074844b60f9e151970fbcdbeb8a2cd52b6ef25a" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "d0921f5b9b3d2c5e09618da55a018228edcc4d16" }, - "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" }, + "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, - "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.comment": { "branch": "main", "commit": "080f00bb91fea4bab799820bd2ce835a88d0703a" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.comment": { "branch": "main", "commit": "03c13e37318bdb18481311c0ac1adc9ed731caf1" }, "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, - "mini.surround": { "branch": "main", "commit": "7098744c8d4573a4b32cb172965f6b2ba03465d2" }, + "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, + "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, + "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, - "nvim-lspconfig": { "branch": "master", "commit": "53a3c6444ec5006b567071614c83edc8ad651f6d" }, + "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-spectre": { "branch": "master", "commit": "49fae98ef2bfa8342522b337892992e3495065d5" }, - "nvim-treesitter": { "branch": "master", "commit": "6cd4ce6cab184e8787f164a182954534221f2af2" }, - "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, - "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, + "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, + "nvim-treesitter": { "branch": "master", "commit": "63be47f203d3e9174fdac3872fb9766e5bcc5a11" }, + "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, + "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, - "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, - "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, - "tokyonight.nvim": { "branch": "main", "commit": "c16eaeb9eaf4eb307431e58ec6101eecf2dbe52d" }, - "trouble.nvim": { "branch": "main", "commit": "e5d0e04121c662ce29190a57dd03655d43c59d44" }, - "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } + "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, + "toggleterm.nvim": { "branch": "main", "commit": "8ed0f52006d3207ec6c94de7db62da840937ef2a" }, + "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, + "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, + "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } } \ No newline at end of file From 24d7d89b34fb309c0e78590b69bce73c5bb8df65 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 25 Jul 2024 21:49:13 -0700 Subject: [PATCH 090/240] feat: remove nvim-lint I found this plugin caused more issues than solved, so I'm dropping it in favour of using the ESLint LSP server instead. "EslintFixAll" covers the majority of my bases it seems. --- lua/plugins/linting.lua | 29 ----------------------------- lua/plugins/lsp.lua | 9 ++++++++- 2 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 lua/plugins/linting.lua diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua deleted file mode 100644 index f441d4d..0000000 --- a/lua/plugins/linting.lua +++ /dev/null @@ -1,29 +0,0 @@ -return { - { - "mfussenegger/nvim-lint", - opts = { - events = { "BufWritePost", "BufReadPost", "InsertLeave" }, - linters_by_ft = { - html = { "djlint" }, - markdown = { "proselint" }, - javascript = { "eslint" }, - typescript = { "eslint" }, - javascriptreact = { "eslint" }, - typescriptreact = { "eslint" }, - }, - }, - config = function(_, opts) - local lint = require("lint") - lint.linters_by_ft = opts.linters_by_ft - - local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) - - vim.api.nvim_create_autocmd(opts.events, { - group = lint_augroup, - callback = function() - lint.try_lint() - end, - }) - end, - }, -} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index c34003c..1b4c2aa 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -41,7 +41,14 @@ return { opts = { servers = { cssls = {}, - eslint = {}, + eslint = { + on_attach = function(_, bufnr) + vim.api.nvim_create_autocmd("BufWritePre", { + buffer = bufnr, + command = "EslintFixAll", + }) + end, + }, html = {}, lua_ls = {}, taplo = {}, From 317d42d32f05fd56f7fcc5c49e35650598a33568 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 25 Jul 2024 21:56:06 -0700 Subject: [PATCH 091/240] feat: remove nvim-ts-context-commentstring Added folke's ts-comments.nvim as it is simpler and works the same. --- lazy-lock.json | 5 ++--- lua/plugins/coding.lua | 18 +++--------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 671b6bb..3f4c6f4 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -24,13 +24,11 @@ "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, "nvim-treesitter": { "branch": "master", "commit": "63be47f203d3e9174fdac3872fb9766e5bcc5a11" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, @@ -39,5 +37,6 @@ "toggleterm.nvim": { "branch": "main", "commit": "8ed0f52006d3207ec6c94de7db62da840937ef2a" }, "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, + "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } -} \ No newline at end of file +} diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 37e415e..a32a6fa 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -101,20 +101,8 @@ return { }, }, { - "JoosepAlviste/nvim-ts-context-commentstring", - opts = { - enable_autocmd = false, - }, - }, - { - "echasnovski/mini.comment", - version = false, - opts = { - options = { - custom_commentstring = function() - return require("ts_context_commentstring.internal").calculate_commentstring() or vim.bo.commentstring - end, - }, - }, + "folke/ts-comments.nvim", + event = "VeryLazy", + opts = {}, }, } From b63351398d00d87aaa61f7bab1d693fc8398a88f Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 25 Jul 2024 22:41:09 -0700 Subject: [PATCH 092/240] feat: add keybinds for staging/resetting hunks --- lua/plugins/editor.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 2d11c4d..7b9b3c3 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -172,6 +172,18 @@ return { changedelete = { text = "▎" }, untracked = { text = "▎" }, }, + signs_staged = { + add = { text = "▎" }, + change = { text = "▎" }, + delete = { text = "" }, + topdelete = { text = "" }, + changedelete = { text = "▎" }, + }, + }, + keys = { + { "ghb", ":Gitsigns blame_line", desc = "Blame line" }, + { "ghs", ":Gitsigns stage_hunk", desc = "Stage hunk", mode = { "n", "v" } }, + { "ghr", ":Gitsigns reset_hunk", desc = "Reset hunk", mode = { "n", "v" } }, }, }, { From e750e9ba8ddc884f44c765cbac463f76c4386dda Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 25 Jul 2024 22:43:47 -0700 Subject: [PATCH 093/240] chore: clean plugins --- lazy-lock.json | 1 - 1 file changed, 1 deletion(-) diff --git a/lazy-lock.json b/lazy-lock.json index 3f4c6f4..f68eb97 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -16,7 +16,6 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.comment": { "branch": "main", "commit": "03c13e37318bdb18481311c0ac1adc9ed731caf1" }, "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" }, From ff2068e2d1053516f366d671dfc3ba1ee77c01c4 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 26 Jul 2024 09:04:45 -0700 Subject: [PATCH 094/240] chore: update plugins --- lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index f68eb97..b224a3c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -23,10 +23,10 @@ "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, + "nvim-lspconfig": { "branch": "master", "commit": "f95d371c1a274f60392edfd8ea5121b42dca736e" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, - "nvim-treesitter": { "branch": "master", "commit": "63be47f203d3e9174fdac3872fb9766e5bcc5a11" }, + "nvim-treesitter": { "branch": "master", "commit": "e265fec94c7dc0c8c64cb86820ff5ad3ee135c7d" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, From 395271da0f5645c116a9728af02dd2a44e9815a3 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Mon, 29 Jul 2024 12:10:18 -0700 Subject: [PATCH 095/240] feat: add markdown.nvim --- lazy-lock.json | 5 +++-- lua/plugins/editor.lua | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index b224a3c..f6f695b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,6 +13,7 @@ "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, + "markdown.nvim": { "branch": "main", "commit": "b512df739f1565950f7c5119a8258ed756c94fd4" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, @@ -23,10 +24,10 @@ "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-lspconfig": { "branch": "master", "commit": "f95d371c1a274f60392edfd8ea5121b42dca736e" }, + "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, - "nvim-treesitter": { "branch": "master", "commit": "e265fec94c7dc0c8c64cb86820ff5ad3ee135c7d" }, + "nvim-treesitter": { "branch": "master", "commit": "63be47f203d3e9174fdac3872fb9766e5bcc5a11" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 7b9b3c3..d816832 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -202,4 +202,10 @@ return { } end, }, + { + "MeanderingProgrammer/markdown.nvim", + main = "render-markdown", + opts = {}, + dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-tree/nvim-web-devicons" }, + }, } From 3554271dbe1a8d390e9f7c426b09b106c5f6a0e7 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Mon, 29 Jul 2024 12:10:56 -0700 Subject: [PATCH 096/240] chore: update plugins --- lazy-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index f6f695b..faf02ab 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -24,12 +24,12 @@ "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, + "nvim-lspconfig": { "branch": "master", "commit": "fdc44768a09a65140aa00c92872a5381ad486485" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, - "nvim-treesitter": { "branch": "master", "commit": "63be47f203d3e9174fdac3872fb9766e5bcc5a11" }, + "nvim-treesitter": { "branch": "master", "commit": "a7ba147b4b51631f7cf7d9da56f7d5763073b18d" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, - "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, + "nvim-web-devicons": { "branch": "master", "commit": "5be6c4e685618b99c3210a69375b38a1202369b4" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, From b265bca72693a908b8a342651f5d518a213f2b35 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 7 Aug 2024 09:28:35 -0700 Subject: [PATCH 097/240] chore: update plugins --- lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index faf02ab..36763ac 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,20 +1,20 @@ { - "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, + "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "attempt.nvim": { "branch": "main", "commit": "3905db768478a2152fd927ab5a8def85bc2e34e7" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "25d48271e3d4404ba017cb92a37d3a681c1ad149" }, + "conform.nvim": { "branch": "master", "commit": "2122fe2ff01e9a542fc358ee9398ce2cbddf345d" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "f074844b60f9e151970fbcdbeb8a2cd52b6ef25a" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, - "markdown.nvim": { "branch": "main", "commit": "b512df739f1565950f7c5119a8258ed756c94fd4" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6" }, + "markdown.nvim": { "branch": "main", "commit": "1c7b5ee30d8cf6e52628862dbd06f2e23ecb888e" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, @@ -23,13 +23,13 @@ "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-lspconfig": { "branch": "master", "commit": "fdc44768a09a65140aa00c92872a5381ad486485" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, - "nvim-treesitter": { "branch": "master", "commit": "a7ba147b4b51631f7cf7d9da56f7d5763073b18d" }, + "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, + "nvim-treesitter": { "branch": "master", "commit": "3e0feeb062b29bb7d6d6df1e32ba28111c2bb734" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, - "nvim-web-devicons": { "branch": "master", "commit": "5be6c4e685618b99c3210a69375b38a1202369b4" }, + "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, From eec24643a4e4a958bfc06d58f317d91c5fe91959 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 7 Aug 2024 17:12:53 -0700 Subject: [PATCH 098/240] feat: add pug support --- lua/plugins/treesitter.lua | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 3dcacaf..1c73413 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -5,17 +5,18 @@ return { build = ":TSUpdate", opts = { ensure_installed = { - "lua", - "javascript", - "typescript", - "tsx", - "htmldjango", "html", - "jsonc", - "json", + "htmldjango", + "javascript", "jsdoc", + "json", + "jsonc", + "lua", "markdown", "markdown_inline", + "pug", + "tsx", + "typescript", "vim", "vimdoc", }, From d5ce01c7207e01b37a368c62f43aa80968bb0da0 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 8 Aug 2024 11:14:22 -0700 Subject: [PATCH 099/240] feat: add pug comment support --- lua/plugins/coding.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index a32a6fa..3e58dca 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -103,6 +103,10 @@ return { { "folke/ts-comments.nvim", event = "VeryLazy", - opts = {}, + opts = { + lang = { + pug = "// %s", + }, + }, }, } From b37f5e3abdc475108080cd5b301fd95466807fa5 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Mon, 9 Sep 2024 21:27:42 -0700 Subject: [PATCH 100/240] feat: remove quit keybinds for terminal mode This was causing me so much grief while using `lazygit` within neovim. --- lua/keybinds.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index c89b74d..9ebff2f 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -18,10 +18,6 @@ vim.keymap.set("x", "p", '"_dP', { desc = "Paste without replacing clipb vim.keymap.set("n", "y", '"*y', { desc = "Yank into system clipboard" }) vim.keymap.set("v", "y", '"*y', { desc = "Yank into system clipboard" }) -vim.keymap.set("i", "jk", "", { desc = "Exit insert mode" }) - -vim.keymap.set("t", "", "", { desc = "Exit insert mode (Terminal)" }) -vim.keymap.set("t", "jk", "", { desc = "Exit insert mode (Terminal)" }) vim.keymap.set("t", "", "wincmd h", { desc = "Go to split on left (Terminal)" }) vim.keymap.set("t", "", "wincmd j", { desc = "Go to split above (Terminal)" }) vim.keymap.set("t", "", "wincmd k", { desc = "Go to split below (Terminal)" }) From d64a512297395dfdb2203c496cf04d227580f8ae Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Mon, 9 Sep 2024 21:30:29 -0700 Subject: [PATCH 101/240] chore: update plugins --- lazy-lock.json | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 36763ac..03be783 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,42 +1,42 @@ { - "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, - "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, + "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, + "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, "attempt.nvim": { "branch": "main", "commit": "3905db768478a2152fd927ab5a8def85bc2e34e7" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "2122fe2ff01e9a542fc358ee9398ce2cbddf345d" }, + "conform.nvim": { "branch": "master", "commit": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" }, - "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, - "markdown.nvim": { "branch": "main", "commit": "1c7b5ee30d8cf6e52628862dbd06f2e23ecb888e" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, + "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, + "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, + "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, + "lazygit.nvim": { "branch": "main", "commit": "2432b447483f42ff2e18b2d392cb2bb27e495c08" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, + "markdown.nvim": { "branch": "main", "commit": "a5e2d0b1215814c3d033be1fd8eccf59ce366399" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, - "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, - "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" }, + "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, + "mini.pairs": { "branch": "main", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" }, + "mini.surround": { "branch": "main", "commit": "0e67c4bc147f2a15cee94e7c94dcc0e115b9f55e" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" }, + "nvim-lspconfig": { "branch": "master", "commit": "38d4b239aab2dc3fdfe56b42e3f0f20c237ca695" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, - "nvim-treesitter": { "branch": "master", "commit": "3e0feeb062b29bb7d6d6df1e32ba28111c2bb734" }, - "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, - "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "nvim-treesitter": { "branch": "master", "commit": "4770d9a1a77b0cc2b723c646c3dbe43a9133e5db" }, + "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, + "nvim-web-devicons": { "branch": "master", "commit": "9793801f974bba70e4ac5d7eae6c4f5659993d8e" }, + "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, - "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, - "toggleterm.nvim": { "branch": "main", "commit": "8ed0f52006d3207ec6c94de7db62da840937ef2a" }, - "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, + "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, + "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" }, + "tokyonight.nvim": { "branch": "main", "commit": "4b386e66a9599057587c30538d5e6192e3d1c181" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, - "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } + "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" } } From a68ad5ac1d4d4299bc2006a75570a43eb986cf74 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Sun, 15 Sep 2024 20:06:33 -0700 Subject: [PATCH 102/240] feat: config refresh The goal of this commit was to break my config into smaller, logical chunks. I was having a hard time remembering which file contained which plugin config. I also took the time to clean out some plugins I added but never used, and add an old favourite (tpope/vim-surround). --- lua/plugins/cmp.lua | 78 ++++++++++++++++ lua/plugins/coding.lua | 96 ++------------------ lua/plugins/editor.lua | 181 ------------------------------------- lua/plugins/git.lua | 46 ++++++++++ lua/plugins/neotree.lua | 35 +++++++ lua/plugins/telescope.lua | 58 ++++++++++++ lua/plugins/treesitter.lua | 6 -- lua/plugins/trouble.lua | 15 +++ lua/plugins/ui.lua | 11 --- 9 files changed, 238 insertions(+), 288 deletions(-) create mode 100644 lua/plugins/cmp.lua create mode 100644 lua/plugins/git.lua create mode 100644 lua/plugins/neotree.lua create mode 100644 lua/plugins/telescope.lua create mode 100644 lua/plugins/trouble.lua diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua new file mode 100644 index 0000000..a608b93 --- /dev/null +++ b/lua/plugins/cmp.lua @@ -0,0 +1,78 @@ +return { + { + "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/coding.lua b/lua/plugins/coding.lua index 3e58dca..8aadbc2 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -1,80 +1,6 @@ return { - { "saadparwaiz1/cmp_luasnip" }, { - "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", - }, + "tpope/vim-surround", }, { "echasnovski/mini.pairs", @@ -85,21 +11,6 @@ return { }, }, }, - { - "echasnovski/mini.surround", - version = false, - opts = { - mappings = { - add = "gsa", -- Add surrounding in Normal and Visual modes - delete = "gsd", -- Delete surrounding - find = "gsf", -- Find surrounding (to the right) - find_left = "gsF", -- Find surrounding (to the left) - highlight = "gsh", -- Highlight surrounding - replace = "gsr", -- Replace surrounding - update_n_lines = "gsn", -- Update `n_lines` - }, - }, - }, { "folke/ts-comments.nvim", event = "VeryLazy", @@ -109,4 +20,9 @@ return { }, }, }, + { + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = {}, + }, } diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index d816832..bc774d6 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -1,37 +1,4 @@ return { - { - "nvim-neo-tree/neo-tree.nvim", - event = "VeryLazy", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", - }, - keys = { - { "ee", "Neotree toggle", desc = "Toggle Neotree" }, - { "er", "Neotree reveal", desc = "Reveal file" }, - }, - opts = { - open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, - filesystem = { - filtered_items = { - show_hidden_count = false, - hide_dotfiles = false, - hide_gitignored = true, - always_show = { - ".env", - ".env.local", - }, - never_show = { - ".git", - "thumbs.db", - ".DS_Store", - }, - }, - }, - }, - }, { "folke/which-key.nvim", event = "VeryLazy", @@ -41,94 +8,6 @@ return { end, opts = {}, }, - { - "folke/trouble.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - opts = {}, - cmd = "Trouble", - keys = { - { - "tt", - "Trouble diagnostics toggle", - desc = "Toggle Trouble", - }, - }, - }, - { - "folke/todo-comments.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, - opts = {}, - }, - { - "nvim-pack/nvim-spectre", - dependencies = { "nvim-lua/plenary.nvim" }, - opts = { open_cmd = "noswapfile vnew" }, - keys = { - { - "sr", - function() - require("spectre").open() - end, - desc = "Replace in Files (Spectre)", - }, - }, - }, - { - "nvim-telescope/telescope.nvim", - tag = "0.1.6", - dependencies = { "nvim-lua/plenary.nvim" }, - keys = { - { - "ff", - "lua require'telescope.builtin'.git_files{}", - desc = "Search git_files", - }, - { - "fg", - "lua require'telescope.builtin'.live_grep{}", - desc = "Grep git_files", - }, - { - "fh", - "lua require'telescope.builtin'.help_tags{}", - desc = "View help tags", - }, - { - "fb", - "lua require'telescope.builtin'.buffers{}", - desc = "Search buffers", - }, - { - "sk", - "lua require'telescope.builtin'.keymaps{}", - desc = "View keymaps", - }, - { - "sR", - "lua require'telescope.builtin'.resume{}", - desc = "Resume", - }, - { - "st", - "TodoTelescope", - desc = "Search TODOs", - }, - }, - }, - { - "nvim-telescope/telescope-ui-select.nvim", - config = function() - require("telescope").setup({ - extensions = { - ["ui-select"] = { - require("telescope.themes").get_dropdown({}), - }, - }, - }) - - require("telescope").load_extension("ui-select") - end, - }, { "folke/flash.nvim", event = "VeryLazy", @@ -142,66 +21,6 @@ return { { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, }, }, - { - "kdheepak/lazygit.nvim", - event = "VeryLazy", - cmd = { - "LazyGit", - "LazyGitConfig", - "LazyGitCurrentFile", - "LazyGitFilter", - "LazyGitFilterCurrentFile", - }, - -- optional for floating window border decoration - dependencies = { - "nvim-lua/plenary.nvim", - }, - keys = { - { "gg", "LazyGit", desc = "LazyGit" }, - }, - }, - { - "lewis6991/gitsigns.nvim", - event = "VeryLazy", - opts = { - signs = { - add = { text = "▎" }, - change = { text = "▎" }, - delete = { text = "" }, - topdelete = { text = "" }, - changedelete = { text = "▎" }, - untracked = { text = "▎" }, - }, - signs_staged = { - add = { text = "▎" }, - change = { text = "▎" }, - delete = { text = "" }, - topdelete = { text = "" }, - changedelete = { text = "▎" }, - }, - }, - keys = { - { "ghb", ":Gitsigns blame_line", desc = "Blame line" }, - { "ghs", ":Gitsigns stage_hunk", desc = "Stage hunk", mode = { "n", "v" } }, - { "ghr", ":Gitsigns reset_hunk", desc = "Reset hunk", mode = { "n", "v" } }, - }, - }, - { - "m-demare/attempt.nvim", - opts = { - ext_options = { "js", "lua" }, - }, - keys = function() - local attempt = require("attempt") - - return { - { "an", attempt.new_select, desc = "New attempt" }, - { "ar", attempt.run, desc = "Run attempt" }, - { "ad", attempt.delete_buf, desc = "Delete attempt buffer" }, - { "al", "Telescope attempt", desc = "Search attempts" }, - } - end, - }, { "MeanderingProgrammer/markdown.nvim", main = "render-markdown", diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua new file mode 100644 index 0000000..4fe605a --- /dev/null +++ b/lua/plugins/git.lua @@ -0,0 +1,46 @@ +return { + { + "kdheepak/lazygit.nvim", + event = "VeryLazy", + cmd = { + "LazyGit", + "LazyGitConfig", + "LazyGitCurrentFile", + "LazyGitFilter", + "LazyGitFilterCurrentFile", + }, + -- optional for floating window border decoration + dependencies = { + "nvim-lua/plenary.nvim", + }, + keys = { + { "gg", "LazyGit", desc = "LazyGit" }, + }, + }, + { + "lewis6991/gitsigns.nvim", + event = "VeryLazy", + opts = { + signs = { + add = { text = "▎" }, + change = { text = "▎" }, + delete = { text = "" }, + topdelete = { text = "" }, + changedelete = { text = "▎" }, + untracked = { text = "▎" }, + }, + signs_staged = { + add = { text = "▎" }, + change = { text = "▎" }, + delete = { text = "" }, + topdelete = { text = "" }, + changedelete = { text = "▎" }, + }, + }, + keys = { + { "ghb", ":Gitsigns blame_line", desc = "Blame line" }, + { "ghs", ":Gitsigns stage_hunk", desc = "Stage hunk", mode = { "n", "v" } }, + { "ghr", ":Gitsigns reset_hunk", desc = "Reset hunk", mode = { "n", "v" } }, + }, + }, +} diff --git a/lua/plugins/neotree.lua b/lua/plugins/neotree.lua new file mode 100644 index 0000000..604b0d5 --- /dev/null +++ b/lua/plugins/neotree.lua @@ -0,0 +1,35 @@ +return { + { + "nvim-neo-tree/neo-tree.nvim", + event = "VeryLazy", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + keys = { + { "ee", "Neotree toggle", desc = "Toggle Neotree" }, + { "er", "Neotree reveal", desc = "Reveal file" }, + }, + opts = { + open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, + filesystem = { + filtered_items = { + show_hidden_count = false, + hide_dotfiles = false, + hide_gitignored = true, + always_show = { + ".env", + ".env.local", + }, + never_show = { + ".git", + "thumbs.db", + ".DS_Store", + }, + }, + }, + }, + }, +} diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua new file mode 100644 index 0000000..350c3fe --- /dev/null +++ b/lua/plugins/telescope.lua @@ -0,0 +1,58 @@ +return { + { + "nvim-telescope/telescope.nvim", + tag = "0.1.6", + dependencies = { "nvim-lua/plenary.nvim" }, + keys = { + { + "ff", + "lua require'telescope.builtin'.git_files{}", + desc = "Search git_files", + }, + { + "fg", + "lua require'telescope.builtin'.live_grep{}", + desc = "Grep git_files", + }, + { + "fh", + "lua require'telescope.builtin'.help_tags{}", + desc = "View help tags", + }, + { + "fb", + "lua require'telescope.builtin'.buffers{}", + desc = "Search buffers", + }, + { + "sk", + "lua require'telescope.builtin'.keymaps{}", + desc = "View keymaps", + }, + { + "sR", + "lua require'telescope.builtin'.resume{}", + desc = "Resume", + }, + { + "st", + "TodoTelescope", + desc = "Search TODOs", + }, + }, + }, + { + "nvim-telescope/telescope-ui-select.nvim", + config = function() + require("telescope").setup({ + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown({}), + }, + }, + }) + + require("telescope").load_extension("ui-select") + end, + }, +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 1c73413..f0cb64b 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -27,12 +27,6 @@ return { require("nvim-treesitter.configs").setup(opts) end, }, - -- { - -- "nvim-treesitter/nvim-treesitter-context", - -- opts = { - -- max_lines = 2, - -- }, - -- }, { "windwp/nvim-ts-autotag", event = "VeryLazy", diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua new file mode 100644 index 0000000..1482c9e --- /dev/null +++ b/lua/plugins/trouble.lua @@ -0,0 +1,15 @@ +return { + { + "folke/trouble.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + opts = {}, + cmd = "Trouble", + keys = { + { + "tt", + "Trouble diagnostics toggle", + desc = "Toggle Trouble", + }, + }, + }, +} diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 0d8bf45..82a12fc 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -141,15 +141,4 @@ return { alpha.setup(dashboard.opts) end, }, - { - "akinsho/toggleterm.nvim", - opts = {}, - keys = { - { - "T", - "ToggleTerm direction=float", - desc = "Open floating terminal", - }, - }, - }, } From e5136f66df21386771fef299fd7cc768e454b00a Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Sun, 15 Sep 2024 20:16:43 -0700 Subject: [PATCH 103/240] fix: clean up keybinds Previous keybinds for flash.nvim were conflicting with tpope/vim-surround. --- lazy-lock.json | 20 ++++++++------------ lua/plugins/editor.lua | 10 +++++----- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 03be783..c7a4688 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,11 +1,9 @@ { - "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, + "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, - "attempt.nvim": { "branch": "main", "commit": "3905db768478a2152fd927ab5a8def85bc2e34e7" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d" }, + "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, @@ -13,30 +11,28 @@ "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, "lazygit.nvim": { "branch": "main", "commit": "2432b447483f42ff2e18b2d392cb2bb27e495c08" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "markdown.nvim": { "branch": "main", "commit": "a5e2d0b1215814c3d033be1fd8eccf59ce366399" }, + "markdown.nvim": { "branch": "main", "commit": "f84eeaebac278e26bd2906fd47747631716a5edb" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, "mini.pairs": { "branch": "main", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" }, - "mini.surround": { "branch": "main", "commit": "0e67c4bc147f2a15cee94e7c94dcc0e115b9f55e" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "38d4b239aab2dc3fdfe56b42e3f0f20c237ca695" }, + "nvim-lspconfig": { "branch": "master", "commit": "46ce5fd8c081f179a509da423077f8372e63ffc4" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, - "nvim-treesitter": { "branch": "master", "commit": "4770d9a1a77b0cc2b723c646c3dbe43a9133e5db" }, + "nvim-treesitter": { "branch": "master", "commit": "b7160e87aadbb3f5f6ee87ce139406fe3433044e" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, - "nvim-web-devicons": { "branch": "master", "commit": "9793801f974bba70e4ac5d7eae6c4f5659993d8e" }, + "nvim-web-devicons": { "branch": "master", "commit": "9154484705968658e9aab2b894d1b2a64bf9f83d" }, "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, - "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" }, "tokyonight.nvim": { "branch": "main", "commit": "4b386e66a9599057587c30538d5e6192e3d1c181" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, + "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" } } diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index bc774d6..a94c304 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -14,11 +14,11 @@ return { 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" }, + { "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" }, }, }, { From a25da27bd8d40af0592e7a4c1a054cc08c14f174 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Thu, 19 Sep 2024 14:16:46 -0700 Subject: [PATCH 104/240] fix: rename tsserver to ts_ls --- lua/plugins/lsp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 1b4c2aa..b75933a 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -12,7 +12,7 @@ return { "html", "lua_ls", "taplo", -- .toml - "tsserver", + "ts_ls", "yamlls", -- .yml }, }, From a718137e767e5c76f1ef2a01207a6a72b68d407f Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Tue, 1 Oct 2024 14:38:32 -0700 Subject: [PATCH 105/240] feat: update pug commentstring --- lua/plugins/coding.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 8aadbc2..1c3709f 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -16,7 +16,7 @@ return { event = "VeryLazy", opts = { lang = { - pug = "// %s", + pug = "//- %s", }, }, }, From 905fdd362da20026888c990c25cc4bed75defc83 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Tue, 1 Oct 2024 14:38:38 -0700 Subject: [PATCH 106/240] chore: update plugins --- lazy-lock.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index c7a4688..55656f6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,38 +1,38 @@ { "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, - "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, + "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, + "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" }, + "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, - "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, - "lazygit.nvim": { "branch": "main", "commit": "2432b447483f42ff2e18b2d392cb2bb27e495c08" }, + "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, + "lazygit.nvim": { "branch": "main", "commit": "56760339a81cd1540d5a72fd9d93010a2677b55d" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "markdown.nvim": { "branch": "main", "commit": "f84eeaebac278e26bd2906fd47747631716a5edb" }, + "markdown.nvim": { "branch": "main", "commit": "e91b042b3865d2d040a0e21e0a3b13fb57f24094" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, - "mini.pairs": { "branch": "main", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, + "mini.pairs": { "branch": "main", "commit": "919a89ed3c9f4142215a44c9fffca72fa8c8e792" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, + "noice.nvim": { "branch": "main", "commit": "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "46ce5fd8c081f179a509da423077f8372e63ffc4" }, - "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-treesitter": { "branch": "master", "commit": "b7160e87aadbb3f5f6ee87ce139406fe3433044e" }, + "nvim-lspconfig": { "branch": "master", "commit": "aa615f62300465eef5115e0b7dfcf6dedc274f5d" }, + "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, + "nvim-treesitter": { "branch": "master", "commit": "da61d31a3d51f38a78a739392aabf79e7b2f523f" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, - "nvim-web-devicons": { "branch": "master", "commit": "9154484705968658e9aab2b894d1b2a64bf9f83d" }, - "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, + "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, - "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, - "tokyonight.nvim": { "branch": "main", "commit": "4b386e66a9599057587c30538d5e6192e3d1c181" }, + "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, + "tokyonight.nvim": { "branch": "main", "commit": "817bb6ffff1b9ce72cdd45d9fcfa8c9cd1ad3839" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, - "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, + "vim-commentary": { "branch": "master", "commit": "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" } + "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" } } From a24128cfcac4f7bb96765bb9801b6228fc86dcd7 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Mon, 7 Oct 2024 09:40:13 -0700 Subject: [PATCH 107/240] chore: update plugins --- lazy-lock.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 55656f6..8de4e55 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,36 +3,36 @@ "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" }, + "conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, - "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" }, + "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, - "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, - "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, + "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, + "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, "lazygit.nvim": { "branch": "main", "commit": "56760339a81cd1540d5a72fd9d93010a2677b55d" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "markdown.nvim": { "branch": "main", "commit": "e91b042b3865d2d040a0e21e0a3b13fb57f24094" }, + "markdown.nvim": { "branch": "main", "commit": "fe1002fddc61207e4ef4325d4bc0ca33697bbc7a" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, "mini.pairs": { "branch": "main", "commit": "919a89ed3c9f4142215a44c9fffca72fa8c8e792" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "noice.nvim": { "branch": "main", "commit": "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65" }, + "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "aa615f62300465eef5115e0b7dfcf6dedc274f5d" }, + "nvim-lspconfig": { "branch": "master", "commit": "04680101ff79e99b4e33a4386ec27cbd0d360c75" }, "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, - "nvim-treesitter": { "branch": "master", "commit": "da61d31a3d51f38a78a739392aabf79e7b2f523f" }, + "nvim-treesitter": { "branch": "master", "commit": "45e0d66246f31306d890b91301993fa1623e79f1" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, - "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" }, + "nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "817bb6ffff1b9ce72cdd45d9fcfa8c9cd1ad3839" }, - "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, - "vim-commentary": { "branch": "master", "commit": "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07" }, + "tokyonight.nvim": { "branch": "main", "commit": "2c85fad417170d4572ead7bf9fdd706057bd73d7" }, + "trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" }, + "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" } + "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" } } From f956194c539d531efc8ce47437dfc25dcb821ec4 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Mon, 23 Dec 2024 18:47:58 -0800 Subject: [PATCH 108/240] feat: config refresh --- init.lua | 37 ++------------ lazy-lock.json | 49 +++++++++--------- lua/{ => config}/autocmds.lua | 0 lua/config/keybinds.lua | 12 +++++ lua/config/lazy.lua | 35 +++++++++++++ lua/{ => config}/options.lua | 0 lua/filetypes.lua | 5 -- lua/keybinds.lua | 24 --------- lua/plugins/coding.lua | 25 ++++++++++ lua/plugins/formatting.lua | 92 ++++++++++++++++++++++------------ lua/plugins/git.lua | 19 ------- lua/plugins/lsp.lua | 21 +++----- lua/plugins/neotree.lua | 10 ++-- lua/plugins/snack.lua | 23 +++++++++ lua/plugins/treesitter.lua | 5 ++ lua/plugins/ui.lua | 93 +++++++---------------------------- 16 files changed, 217 insertions(+), 233 deletions(-) rename lua/{ => config}/autocmds.lua (100%) create mode 100644 lua/config/keybinds.lua create mode 100644 lua/config/lazy.lua rename lua/{ => config}/options.lua (100%) delete mode 100644 lua/filetypes.lua delete mode 100644 lua/keybinds.lua create mode 100644 lua/plugins/snack.lua diff --git a/init.lua b/init.lua index 19f8a58..3313b58 100644 --- a/init.lua +++ b/init.lua @@ -1,37 +1,8 @@ -require("options") +require("config.options") -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) -end -vim.opt.rtp:prepend(lazypath) +require("config.lazy") --- Fix for yanking to system clipboard on Windows -if vim.fn.has("wsl") == 1 then - vim.g.clipboard = { - name = "WslClipboard", - copy = { - ["+"] = "clip.exe", - ["*"] = "clip.exe", - }, - paste = { - ["+"] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', - ["*"] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', - }, - cache_enabled = 0, - } -end - -require("lazy").setup("plugins") -require("keybinds") -require("autocmds") -require("filetypes") +require("config.autocmds") +require("config.keybinds") vim.cmd.colorscheme("tokyonight") diff --git a/lazy-lock.json b/lazy-lock.json index 8de4e55..5a43fe3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,38 +1,35 @@ { - "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, - "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, + "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, + "conform.nvim": { "branch": "master", "commit": "62055b40c4d0b001c87559c7adf96a4a464bcdd5" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, - "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, - "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, - "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, - "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, - "lazygit.nvim": { "branch": "main", "commit": "56760339a81cd1540d5a72fd9d93010a2677b55d" }, - "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "markdown.nvim": { "branch": "main", "commit": "fe1002fddc61207e4ef4325d4bc0ca33697bbc7a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, + "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, + "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, + "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, + "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, + "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, + "markdown.nvim": { "branch": "main", "commit": "0022a579ac7355966be5ade77699b88c76b6a549" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "2daa8921b7afdcfa47419a21ea343c3df6d74fa0" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, - "mini.pairs": { "branch": "main", "commit": "919a89ed3c9f4142215a44c9fffca72fa8c8e792" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" }, - "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "04680101ff79e99b4e33a4386ec27cbd0d360c75" }, - "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, - "nvim-treesitter": { "branch": "master", "commit": "45e0d66246f31306d890b91301993fa1623e79f1" }, - "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, - "nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" }, + "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, + "neo-tree.nvim": { "branch": "main", "commit": "694fc4b8a5a722fcc85a57515cb47eea58212b53" }, + "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, + "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, + "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" }, + "nvim-treesitter": { "branch": "master", "commit": "2405274937718d520a40e03df92030dca6b4f0fd" }, + "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, + "nvim-web-devicons": { "branch": "master", "commit": "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "snacks.nvim": { "branch": "main", "commit": "98df370703b3c47a297988f3e55ce99628639590" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "2c85fad417170d4572ead7bf9fdd706057bd73d7" }, - "trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" }, - "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, + "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" }, + "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, + "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" } + "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" } } diff --git a/lua/autocmds.lua b/lua/config/autocmds.lua similarity index 100% rename from lua/autocmds.lua rename to lua/config/autocmds.lua diff --git a/lua/config/keybinds.lua b/lua/config/keybinds.lua new file mode 100644 index 0000000..5f342cb --- /dev/null +++ b/lua/config/keybinds.lua @@ -0,0 +1,12 @@ +vim.keymap.set("n", "", "wincmd h", { desc = "Go to split on left" }) +vim.keymap.set("n", "", "wincmd j", { desc = "Go to split above" }) +vim.keymap.set("n", "", "wincmd k", { desc = "Go to split below" }) +vim.keymap.set("n", "", "wincmd l", { desc = "Go to split on right" }) + +vim.keymap.set("n", "|", "v", { desc = "Split window right" }) +vim.keymap.set("n", "-", "s", { desc = "Split window below" }) +vim.keymap.set("n", "wd", "c", { desc = "Delete window" }) + +vim.keymap.set("n", "y", '"*y', { desc = "Yank into system clipboard" }) +vim.keymap.set("v", "y", '"*y', { desc = "Yank into system clipboard" }) + diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua new file mode 100644 index 0000000..f5ee74c --- /dev/null +++ b/lua/config/lazy.lua @@ -0,0 +1,35 @@ +-- Bootstrap lazy.nvim +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +-- Make sure to setup `mapleader` and `maplocalleader` before +-- loading lazy.nvim so that mappings are correct. +-- This is also a good place to setup other settings (vim.opt) +vim.g.mapleader = " " +vim.g.maplocalleader = "\\" + +-- Setup lazy.nvim +require("lazy").setup({ + spec = { + -- import your plugins + { import = "plugins" }, + }, + -- Configure any other settings here. See the documentation for more details. + -- colorscheme that will be used when installing plugins. + install = { colorscheme = { "habamax" } }, + -- automatically check for plugin updates + checker = { enabled = true }, +}) diff --git a/lua/options.lua b/lua/config/options.lua similarity index 100% rename from lua/options.lua rename to lua/config/options.lua diff --git a/lua/filetypes.lua b/lua/filetypes.lua deleted file mode 100644 index 587b138..0000000 --- a/lua/filetypes.lua +++ /dev/null @@ -1,5 +0,0 @@ -vim.filetype.add({ - extension = { - njk = "html", - }, -}) diff --git a/lua/keybinds.lua b/lua/keybinds.lua deleted file mode 100644 index 9ebff2f..0000000 --- a/lua/keybinds.lua +++ /dev/null @@ -1,24 +0,0 @@ -vim.keymap.set("n", "", "wincmd h", { desc = "Go to split on left" }) -vim.keymap.set("n", "", "wincmd j", { desc = "Go to split above" }) -vim.keymap.set("n", "", "wincmd k", { desc = "Go to split below" }) -vim.keymap.set("n", "", "wincmd l", { desc = "Go to split on right" }) - -vim.keymap.set("n", "|", "v", { desc = "Split window right" }) -vim.keymap.set("n", "-", "s", { desc = "Split window below" }) -vim.keymap.set("n", "wd", "c", { desc = "Delete window" }) - -vim.keymap.set("v", "J", ":m '>+1gv=gv", { desc = "Move lines under cursor up" }) -vim.keymap.set("v", "K", ":m '<-2gv=gv", { desc = "Move lines under cursor down" }) - -vim.keymap.set("n", "n", "nzzzv", { desc = "Go to next search result and keep cursor centered on screen" }) -vim.keymap.set("n", "N", "Nzzzv", { desc = "Go to previous search result and keep cursor centered on screen" }) - -vim.keymap.set("x", "p", '"_dP', { desc = "Paste without replacing clipboard contents" }) - -vim.keymap.set("n", "y", '"*y', { desc = "Yank into system clipboard" }) -vim.keymap.set("v", "y", '"*y', { desc = "Yank into system clipboard" }) - -vim.keymap.set("t", "", "wincmd h", { desc = "Go to split on left (Terminal)" }) -vim.keymap.set("t", "", "wincmd j", { desc = "Go to split above (Terminal)" }) -vim.keymap.set("t", "", "wincmd k", { desc = "Go to split below (Terminal)" }) -vim.keymap.set("t", "", "wincmd l", { desc = "Go to split on right (Terminal)" }) diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 1c3709f..b134b8f 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -16,7 +16,32 @@ return { event = "VeryLazy", opts = { lang = { + graphql = "# %s", + html = "", + javascript = { + "// %s", -- default commentstring when no treesitter node matches + "/* %s */", + call_expression = "// %s", -- specific commentstring for call_expression + jsx_attribute = "// %s", + jsx_element = "{/* %s */}", + jsx_fragment = "{/* %s */}", + spread_element = "// %s", + statement_block = "// %s", + }, pug = "//- %s", + php = "// %s", + tsx = { + "// %s", -- default commentstring when no treesitter node matches + "/* %s */", + call_expression = "// %s", -- specific commentstring for call_expression + jsx_attribute = "// %s", + jsx_element = "{/* %s */}", + jsx_fragment = "{/* %s */}", + spread_element = "// %s", + statement_block = "// %s", + }, + twig = "{# %s #}", + typescript = { "// %s", "/* %s */" }, -- langs can have multiple commentstrings }, }, }, diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index 82c9b4a..c44b105 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -1,36 +1,66 @@ return { - "stevearc/conform.nvim", - opts = { - formatters_by_ft = { - css = { "prettierd" }, - scss = { "prettierd" }, - html = { "djlint" }, - lua = { "stylua" }, - markdown = { "prettierd" }, - javascript = { "prettierd" }, - javascriptreact = { "prettierd" }, - json = { "prettierd" }, - jsonc = { "prettierd" }, - toml = { "taplo" }, - typescript = { "prettierd" }, - typescriptreact = { "prettierd" }, - }, - format_on_save = { - lsp_fallback = true, - }, - formatters = { - taplo = { - args = function() - -- conform.nvim does not parse bash envvars, so we do it ourselves - local CONFIG_PATH = os.getenv("HOME") .. "/.config/taplo/taplo.toml" - return { - "format", - "--config", - CONFIG_PATH, - "-", - } - end, + { + "stevearc/conform.nvim", + opts = { + formatters_by_ft = { + css = { "prettierd" }, + scss = { "prettierd" }, + html = { "djlint" }, + lua = { "stylua" }, + markdown = { "prettierd" }, + javascript = { "prettierd" }, + javascriptreact = { "prettierd" }, + json = { "prettierd" }, + jsonc = { "prettierd" }, + php = { "php_cs_fixer" }, + toml = { "taplo" }, + typescript = { "prettierd" }, + typescriptreact = { "prettierd" }, + twig = { "twig-cs-fixer" }, + }, + format_on_save = { + lsp_fallback = true, + }, + formatters = { + taplo = { + args = function() + -- conform.nvim does not parse bash envvars, so we do it ourselves + local CONFIG_PATH = os.getenv("HOME") .. "/.config/taplo/taplo.toml" + return { + "format", + "--config", + CONFIG_PATH, + "-", + } + end, + }, + php_cs_fixer = { + args = function() + local CONFIG_PATH = os.getenv("HOME") .. "/.config/php-cs-fixer/php-cs-fixer.php" + return { + "fix", + "$FILENAME", + "--config", + CONFIG_PATH, + } + end, + }, }, }, }, + { + "WhoIsSethDaniel/mason-tool-installer.nvim", + opts = { + ensure_installed = { + "djlint", + "php-cs-fixer", + "prettierd", + "proselint", + "stylua", + "twig-cs-fixer", + }, + auto_update = true, + automatic_installation = true, + }, + }, } diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua index 4fe605a..9bc7cb0 100644 --- a/lua/plugins/git.lua +++ b/lua/plugins/git.lua @@ -1,22 +1,4 @@ return { - { - "kdheepak/lazygit.nvim", - event = "VeryLazy", - cmd = { - "LazyGit", - "LazyGitConfig", - "LazyGitCurrentFile", - "LazyGitFilter", - "LazyGitFilterCurrentFile", - }, - -- optional for floating window border decoration - dependencies = { - "nvim-lua/plenary.nvim", - }, - keys = { - { "gg", "LazyGit", desc = "LazyGit" }, - }, - }, { "lewis6991/gitsigns.nvim", event = "VeryLazy", @@ -38,7 +20,6 @@ return { }, }, keys = { - { "ghb", ":Gitsigns blame_line", desc = "Blame line" }, { "ghs", ":Gitsigns stage_hunk", desc = "Stage hunk", mode = { "n", "v" } }, { "ghr", ":Gitsigns reset_hunk", desc = "Reset hunk", mode = { "n", "v" } }, }, diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index b75933a..131e859 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -11,25 +11,14 @@ return { "eslint", "html", "lua_ls", + "psalm", -- .php "taplo", -- .toml "ts_ls", + "twiggy_language_server", -- .twig "yamlls", -- .yml }, }, }, - { - "WhoIsSethDaniel/mason-tool-installer.nvim", - opts = { - ensure_installed = { - "djlint", - "prettierd", - "proselint", - "stylua", - }, - auto_update = true, - automatic_installation = true, - }, - }, -- lspconfig should be the last step. { "neovim/nvim-lspconfig", @@ -49,10 +38,12 @@ return { }) end, }, - html = {}, lua_ls = {}, + html = {}, + psalm = {}, taplo = {}, - tsserver = {}, + ts_ls = {}, + twiggy_language_server = {}, yamlls = {}, }, }, diff --git a/lua/plugins/neotree.lua b/lua/plugins/neotree.lua index 604b0d5..ce1d3a0 100644 --- a/lua/plugins/neotree.lua +++ b/lua/plugins/neotree.lua @@ -1,13 +1,11 @@ return { { "nvim-neo-tree/neo-tree.nvim", - event = "VeryLazy", - branch = "v3.x", dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", - }, + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, keys = { { "ee", "Neotree toggle", desc = "Toggle Neotree" }, { "er", "Neotree reveal", desc = "Reveal file" }, diff --git a/lua/plugins/snack.lua b/lua/plugins/snack.lua new file mode 100644 index 0000000..3256280 --- /dev/null +++ b/lua/plugins/snack.lua @@ -0,0 +1,23 @@ +return { + "folke/snacks.nvim", + priority = 1000, + lazy = false, + opts = { + dashboard = { enabled = true }, + git = { enabled = true }, + lazygit = { enabled = true }, + notifier = { enabled = true }, + quickfile = { enabled = true }, + scratch = { 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" }, + } +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index f0cb64b..9398d46 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -3,8 +3,11 @@ return { "nvim-treesitter/nvim-treesitter", version = false, build = ":TSUpdate", + event = { "VeryLazy" }, + lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline opts = { ensure_installed = { + "graphql", "html", "htmldjango", "javascript", @@ -14,8 +17,10 @@ return { "lua", "markdown", "markdown_inline", + "php", "pug", "tsx", + "twig", "typescript", "vim", "vimdoc", diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 82a12fc..58ac8b6 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,6 +1,7 @@ return { { "nvim-lualine/lualine.nvim", + event = "VeryLazy", dependencies = { "nvim-tree/nvim-web-devicons", }, @@ -36,17 +37,20 @@ return { scope = { enabled = false }, exclude = { filetypes = { - "help", + "Trouble", "alpha", "dashboard", - "neo-tree", - "Trouble", - "trouble", + "help", "lazy", "mason", + "neo-tree", "notify", + "snacks_dashboard", + "snacks_notif", + "snacks_terminal", + "snacks_win", "toggleterm", - "lazyterm", + "trouble", }, }, }, @@ -61,84 +65,25 @@ return { init = function() vim.api.nvim_create_autocmd("FileType", { pattern = { - "help", + "Trouble", "alpha", "dashboard", - "neo-tree", - "Trouble", - "trouble", + "help", "lazy", "mason", + "neo-tree", "notify", + "snacks_dashboard", + "snacks_notif", + "snacks_terminal", + "snacks_win", "toggleterm", - "lazyterm", + "trouble", }, - callback = function() - vim.b.miniindentscope_disable = true + callback = function(data) + vim.b[data.buf].miniindentscope_disable = true end, }) end, }, - { - "rcarriga/nvim-notify", - opts = { - timeout = 2000, - stages = "static", - }, - }, - { - "MunifTanjim/nui.nvim", - }, - { - "folke/noice.nvim", - event = "VeryLazy", - opts = {}, - dependencies = { - "MunifTanjim/nui.nvim", - "rcarriga/nvim-notify", - }, - }, - { - "goolord/alpha-nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - local alpha = require("alpha") - local dashboard = require("alpha.themes.dashboard") - - -- https://github.com/MaximilianLloyd/ascii.nvim - dashboard.section.header.val = { - " ", - " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", - " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", - " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", - " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", - " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", - " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", - " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", - " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", - " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", - " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", - " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", - " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", - " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", - " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", - " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", - " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", - " ▄█████████▄▄ ", - " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", - " ▄▄█████▀▀▀▀ ▀■ ", - " ▄███▀▀▀▀ ", - " ■▀▀ ", - " ", - } - - dashboard.section.buttons.val = { - dashboard.button("e", " > New File", "ene"), - dashboard.button("SPC ee", " > File explorer", "Neotree"), - dashboard.button("q", " > Quit", "qa"), - } - - alpha.setup(dashboard.opts) - end, - }, } From 9c29aff941cb03d962c66b8145ea653b44d3b8ac Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Tue, 24 Dec 2024 00:21:50 -0800 Subject: [PATCH 109/240] chore: plugin update --- lazy-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 5a43fe3..a24ff70 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,7 +2,7 @@ "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, - "conform.nvim": { "branch": "master", "commit": "62055b40c4d0b001c87559c7adf96a4a464bcdd5" }, + "conform.nvim": { "branch": "master", "commit": "339b3e4519ec49312d34fcfa275aa15bfaa67025" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, @@ -15,13 +15,13 @@ "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, - "neo-tree.nvim": { "branch": "main", "commit": "694fc4b8a5a722fcc85a57515cb47eea58212b53" }, + "neo-tree.nvim": { "branch": "main", "commit": "45c75e5f31e3581fb4b4883a81c7d7c4f3578b70" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, - "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" }, - "nvim-treesitter": { "branch": "master", "commit": "2405274937718d520a40e03df92030dca6b4f0fd" }, + "nvim-lspconfig": { "branch": "master", "commit": "c580f34bc5fdca8aaf737a9ab8a5d775cb940e57" }, + "nvim-treesitter": { "branch": "master", "commit": "50947387c20ec3fb8c30b8c1c1a1c39f68deb970" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, - "nvim-web-devicons": { "branch": "master", "commit": "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb" }, + "nvim-web-devicons": { "branch": "master", "commit": "15c7d0f616ebf88960ce5c4221828f62789d36d9" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "snacks.nvim": { "branch": "main", "commit": "98df370703b3c47a297988f3e55ce99628639590" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, From 567e5775131410a36edaf4b49e4e3a2eef680760 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Mon, 13 Jan 2025 11:30:53 -0800 Subject: [PATCH 110/240] chore: plugin update --- lazy-lock.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index a24ff70..7e416e6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,35 +1,35 @@ { - "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, + "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, - "conform.nvim": { "branch": "master", "commit": "339b3e4519ec49312d34fcfa275aa15bfaa67025" }, + "conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, + "gitsigns.nvim": { "branch": "main", "commit": "abcd00a7d5bc1a9470cb21b023c575acade3e4db" }, "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, - "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, + "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "markdown.nvim": { "branch": "main", "commit": "0022a579ac7355966be5ade77699b88c76b6a549" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "2daa8921b7afdcfa47419a21ea343c3df6d74fa0" }, + "markdown.nvim": { "branch": "main", "commit": "d7b646f2e6136d963e1bd3abbb9e2ac3fa90837a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, - "neo-tree.nvim": { "branch": "main", "commit": "45c75e5f31e3581fb4b4883a81c7d7c4f3578b70" }, + "neo-tree.nvim": { "branch": "main", "commit": "343886b020cb6bfbb326c4a07a7c356eb5ee05b7" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, - "nvim-lspconfig": { "branch": "master", "commit": "c580f34bc5fdca8aaf737a9ab8a5d775cb940e57" }, - "nvim-treesitter": { "branch": "master", "commit": "50947387c20ec3fb8c30b8c1c1a1c39f68deb970" }, + "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" }, + "nvim-lspconfig": { "branch": "master", "commit": "0913481440219390969ab56a3c33089679365ef7" }, + "nvim-treesitter": { "branch": "master", "commit": "c7dc251cddf2cdef1fa279fa797799728a5bfd78" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, - "nvim-web-devicons": { "branch": "master", "commit": "15c7d0f616ebf88960ce5c4221828f62789d36d9" }, - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "snacks.nvim": { "branch": "main", "commit": "98df370703b3c47a297988f3e55ce99628639590" }, + "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, + "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, + "snacks.nvim": { "branch": "main", "commit": "d2b2b7bcbf9814d61f2e8049affed750509f44e3" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" }, + "tokyonight.nvim": { "branch": "main", "commit": "775f82f08a3d1fb55a37fc6d3a4ab10cd7ed8a10" }, "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" } + "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" } } From 1a3906f84d0fc5140cee80e6c424c2409c43ff86 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Mon, 13 Jan 2025 22:43:17 -0800 Subject: [PATCH 111/240] chore: plugin update --- lazy-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 7e416e6..20319e3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -18,17 +18,17 @@ "neo-tree.nvim": { "branch": "main", "commit": "343886b020cb6bfbb326c4a07a7c356eb5ee05b7" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" }, - "nvim-lspconfig": { "branch": "master", "commit": "0913481440219390969ab56a3c33089679365ef7" }, + "nvim-lspconfig": { "branch": "master", "commit": "355c565eae59810c1af4cf132938fa0fc251c5a2" }, "nvim-treesitter": { "branch": "master", "commit": "c7dc251cddf2cdef1fa279fa797799728a5bfd78" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "snacks.nvim": { "branch": "main", "commit": "d2b2b7bcbf9814d61f2e8049affed750509f44e3" }, + "snacks.nvim": { "branch": "main", "commit": "1b7a57a0b14b37a708330a346a767865954ce448" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "tokyonight.nvim": { "branch": "main", "commit": "775f82f08a3d1fb55a37fc6d3a4ab10cd7ed8a10" }, - "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, + "trouble.nvim": { "branch": "main", "commit": "4d36b8979287f5facc03fd6d955ace67db667e1d" }, "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" } From 7eaae57abd3fd02a0fead09703caac48ce715807 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 31 Jan 2025 11:26:04 -0800 Subject: [PATCH 112/240] chore: plugin update --- lazy-lock.json | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 20319e3..a434517 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,34 +2,34 @@ "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, - "conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" }, - "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, + "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" }, + "flash.nvim": { "branch": "main", "commit": "f899265876ecdcf7352dbc9f0adf87068cedefbb" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "abcd00a7d5bc1a9470cb21b023c575acade3e4db" }, - "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, - "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, + "gitsigns.nvim": { "branch": "main", "commit": "9b36d497495436c135659902054ee637e0ba6021" }, + "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, + "lazy.nvim": { "branch": "main", "commit": "7527af40ddd4a93a02911be570b32609b9d4ea53" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "markdown.nvim": { "branch": "main", "commit": "d7b646f2e6136d963e1bd3abbb9e2ac3fa90837a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, + "markdown.nvim": { "branch": "main", "commit": "1ba6fb7998985736ca3480366c9792be05b93ad7" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "374c78d3ebb5c53f43ea6bd906b6587b5e899b9e" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, - "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, - "neo-tree.nvim": { "branch": "main", "commit": "343886b020cb6bfbb326c4a07a7c356eb5ee05b7" }, + "mini.indentscope": { "branch": "main", "commit": "8ce41a77eed7f4121c83c67fda5e2e86af999e6d" }, + "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" }, + "neo-tree.nvim": { "branch": "main", "commit": "6a4f0a830f2322f187bce6f18a9e6b5b7ba188e3" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" }, - "nvim-lspconfig": { "branch": "master", "commit": "355c565eae59810c1af4cf132938fa0fc251c5a2" }, - "nvim-treesitter": { "branch": "master", "commit": "c7dc251cddf2cdef1fa279fa797799728a5bfd78" }, + "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, + "nvim-lspconfig": { "branch": "master", "commit": "ead2fbc4893fdd062e1dd0842679a48bfb7bac5c" }, + "nvim-treesitter": { "branch": "master", "commit": "7e3942ceca9e0c28760f77ac33bc16399146d879" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, - "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, + "nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "snacks.nvim": { "branch": "main", "commit": "1b7a57a0b14b37a708330a346a767865954ce448" }, + "snacks.nvim": { "branch": "main", "commit": "f936021dfed8107c33c38fb775dfe6a147ca7726" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, - "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "775f82f08a3d1fb55a37fc6d3a4ab10cd7ed8a10" }, - "trouble.nvim": { "branch": "main", "commit": "4d36b8979287f5facc03fd6d955ace67db667e1d" }, + "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, + "tokyonight.nvim": { "branch": "main", "commit": "dca4adba7dc5f09302a00b0e76078d54d82d2658" }, + "trouble.nvim": { "branch": "main", "commit": "6f380b8826fb819c752c8fd7daaee9ef96d4c689" }, "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" } + "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" } } From 53407e626d79f1d07a245c8f66e9f795d8d42885 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 5 Feb 2025 20:58:31 -0800 Subject: [PATCH 113/240] feat: add more php support --- lua/plugins/formatting.lua | 5 ++++- lua/plugins/lsp.lua | 6 +++--- lua/plugins/treesitter.lua | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index c44b105..aa21a36 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -3,6 +3,7 @@ return { "stevearc/conform.nvim", opts = { formatters_by_ft = { + blade = { "blade-formatter" }, css = { "prettierd" }, scss = { "prettierd" }, html = { "djlint" }, @@ -12,7 +13,7 @@ return { javascriptreact = { "prettierd" }, json = { "prettierd" }, jsonc = { "prettierd" }, - php = { "php_cs_fixer" }, + php = { "pint", "php_cs_fixer", stop_after_first = true }, toml = { "taplo" }, typescript = { "prettierd" }, typescriptreact = { "prettierd" }, @@ -52,7 +53,9 @@ return { "WhoIsSethDaniel/mason-tool-installer.nvim", opts = { ensure_installed = { + "blade-formatter", "djlint", + "phpcs", "php-cs-fixer", "prettierd", "proselint", diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 131e859..3f62b50 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -11,7 +11,7 @@ return { "eslint", "html", "lua_ls", - "psalm", -- .php + "phpactor", -- php "taplo", -- .toml "ts_ls", "twiggy_language_server", -- .twig @@ -38,9 +38,9 @@ return { }) end, }, - lua_ls = {}, html = {}, - psalm = {}, + lua_ls = {}, + phpactor = {}, taplo = {}, ts_ls = {}, twiggy_language_server = {}, diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 9398d46..99a83ae 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -4,10 +4,10 @@ return { version = false, build = ":TSUpdate", event = { "VeryLazy" }, - lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline + lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline opts = { ensure_installed = { - "graphql", + "graphql", "html", "htmldjango", "javascript", @@ -18,6 +18,7 @@ return { "markdown", "markdown_inline", "php", + "php_only", "pug", "tsx", "twig", From 007c96222aa304de4fbd3b39dc64fa97c6f45d36 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 5 Feb 2025 20:59:18 -0800 Subject: [PATCH 114/240] chore: plugin update --- lazy-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index a434517..069aa17 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -5,25 +5,25 @@ "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" }, "flash.nvim": { "branch": "main", "commit": "f899265876ecdcf7352dbc9f0adf87068cedefbb" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "9b36d497495436c135659902054ee637e0ba6021" }, + "gitsigns.nvim": { "branch": "main", "commit": "9772ce68a9a6d156f3f2166bfd0a17a09ab37eba" }, "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, "lazy.nvim": { "branch": "main", "commit": "7527af40ddd4a93a02911be570b32609b9d4ea53" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "markdown.nvim": { "branch": "main", "commit": "1ba6fb7998985736ca3480366c9792be05b93ad7" }, + "markdown.nvim": { "branch": "main", "commit": "2a9e0ab6043bfb4996ce6a6a35594ab357e5d299" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "374c78d3ebb5c53f43ea6bd906b6587b5e899b9e" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "8ce41a77eed7f4121c83c67fda5e2e86af999e6d" }, "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" }, - "neo-tree.nvim": { "branch": "main", "commit": "6a4f0a830f2322f187bce6f18a9e6b5b7ba188e3" }, + "neo-tree.nvim": { "branch": "main", "commit": "9f0c96720559461530a51d3e1c170519345941da" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, - "nvim-lspconfig": { "branch": "master", "commit": "ead2fbc4893fdd062e1dd0842679a48bfb7bac5c" }, - "nvim-treesitter": { "branch": "master", "commit": "7e3942ceca9e0c28760f77ac33bc16399146d879" }, + "nvim-lspconfig": { "branch": "master", "commit": "66bc018936c6ff76beb75f89d986af6442db4001" }, + "nvim-treesitter": { "branch": "master", "commit": "9e0b5e7f0d148963d6ec71c48cec1a3f8607d619" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, - "nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" }, + "nvim-web-devicons": { "branch": "master", "commit": "402377242b04be3f4f0f3720bd952df86e946c30" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "snacks.nvim": { "branch": "main", "commit": "f936021dfed8107c33c38fb775dfe6a147ca7726" }, + "snacks.nvim": { "branch": "main", "commit": "f821b4a846647ef8aed2d382dfd10edfa7d4fb2c" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, From 637bee69617369e786ecff3a96f2c6b1a5c6e06c Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 12 Mar 2025 14:30:48 -0700 Subject: [PATCH 115/240] fix: php_cs_fixer on php versions >8.3 --- lua/plugins/formatting.lua | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index aa21a36..f0ade9a 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -13,7 +13,7 @@ return { javascriptreact = { "prettierd" }, json = { "prettierd" }, jsonc = { "prettierd" }, - php = { "pint", "php_cs_fixer", stop_after_first = true }, + php = { "php_cs_fixer", stop_after_first = true }, toml = { "taplo" }, typescript = { "prettierd" }, typescriptreact = { "prettierd" }, @@ -36,6 +36,9 @@ return { end, }, php_cs_fixer = { + env = { + PHP_CS_FIXER_IGNORE_ENV = "1", + }, args = function() local CONFIG_PATH = os.getenv("HOME") .. "/.config/php-cs-fixer/php-cs-fixer.php" return { @@ -46,6 +49,16 @@ return { } end, }, + -- pint = { + -- args = function() + -- local CONFIG_PATH = os.getenv("HOME") .. "/.config/pint/pint.json" + -- return { + -- "--config", + -- CONFIG_PATH, + -- "$FILENAME", + -- } + -- end, + -- }, }, }, }, From 0c60a92d1fef773a50e6ad65ae325246b311fa30 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Wed, 12 Mar 2025 14:30:54 -0700 Subject: [PATCH 116/240] chore: plugin update --- lazy-lock.json | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 069aa17..1337b52 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,34 +2,34 @@ "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, - "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" }, - "flash.nvim": { "branch": "main", "commit": "f899265876ecdcf7352dbc9f0adf87068cedefbb" }, + "conform.nvim": { "branch": "master", "commit": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d" }, + "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "9772ce68a9a6d156f3f2166bfd0a17a09ab37eba" }, + "gitsigns.nvim": { "branch": "main", "commit": "011dc6718bcebdf92a5336bb0da79189c3afe621" }, "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, - "lazy.nvim": { "branch": "main", "commit": "7527af40ddd4a93a02911be570b32609b9d4ea53" }, - "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "markdown.nvim": { "branch": "main", "commit": "2a9e0ab6043bfb4996ce6a6a35594ab357e5d299" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "374c78d3ebb5c53f43ea6bd906b6587b5e899b9e" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, + "markdown.nvim": { "branch": "main", "commit": "c065031d030955e1d071a7fcdd8c59e0fd2f0343" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "5639d58a3d11ff7c05c8e31e159bfedae55d7961" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.indentscope": { "branch": "main", "commit": "8ce41a77eed7f4121c83c67fda5e2e86af999e6d" }, "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" }, - "neo-tree.nvim": { "branch": "main", "commit": "9f0c96720559461530a51d3e1c170519345941da" }, - "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, - "nvim-lspconfig": { "branch": "master", "commit": "66bc018936c6ff76beb75f89d986af6442db4001" }, - "nvim-treesitter": { "branch": "master", "commit": "9e0b5e7f0d148963d6ec71c48cec1a3f8607d619" }, - "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, - "nvim-web-devicons": { "branch": "master", "commit": "402377242b04be3f4f0f3720bd952df86e946c30" }, - "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "snacks.nvim": { "branch": "main", "commit": "f821b4a846647ef8aed2d382dfd10edfa7d4fb2c" }, + "neo-tree.nvim": { "branch": "main", "commit": "8c6349bceb1d8a863964dd25dc7944d588a56aaa" }, + "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, + "nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" }, + "nvim-lspconfig": { "branch": "master", "commit": "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0" }, + "nvim-treesitter": { "branch": "master", "commit": "548ed98f8a0af738d095ef1be5961f41061ed743" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, + "nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "tokyonight.nvim": { "branch": "main", "commit": "dca4adba7dc5f09302a00b0e76078d54d82d2658" }, - "trouble.nvim": { "branch": "main", "commit": "6f380b8826fb819c752c8fd7daaee9ef96d4c689" }, - "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, + "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, + "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, + "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" } + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } From 93fc256be967ea9299098debb7cb9a60c8478b92 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Fri, 9 May 2025 15:25:19 -0700 Subject: [PATCH 117/240] chore: plugin update Also locks mason and mason-lspconfig to v1 to prevent breaking changes --- lazy-lock.json | 36 ++++++++++++++++++------------------ lua/plugins/lsp.lua | 10 ++++++---- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 1337b52..89f2746 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,27 +1,27 @@ { - "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, - "conform.nvim": { "branch": "master", "commit": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d" }, + "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, + "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "conform.nvim": { "branch": "master", "commit": "374aaf384e2e841607b8e2fe63fa3ad01d111c91" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, - "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "011dc6718bcebdf92a5336bb0da79189c3afe621" }, - "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, + "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "gitsigns.nvim": { "branch": "main", "commit": "43b0c856ae5f32a195d83f4a27fe21d63e6c966c" }, + "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, - "markdown.nvim": { "branch": "main", "commit": "c065031d030955e1d071a7fcdd8c59e0fd2f0343" }, + "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, + "markdown.nvim": { "branch": "main", "commit": "935c2c70c296d87ed1bcce9ce667c239c9c982b5" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "5639d58a3d11ff7c05c8e31e159bfedae55d7961" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "aafae207d5a2a28c59c9d478d8581c2739135d09" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mini.indentscope": { "branch": "main", "commit": "8ce41a77eed7f4121c83c67fda5e2e86af999e6d" }, - "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" }, - "neo-tree.nvim": { "branch": "main", "commit": "8c6349bceb1d8a863964dd25dc7944d588a56aaa" }, - "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, - "nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" }, - "nvim-lspconfig": { "branch": "master", "commit": "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0" }, - "nvim-treesitter": { "branch": "master", "commit": "548ed98f8a0af738d095ef1be5961f41061ed743" }, + "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" }, + "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, + "neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, + "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-lspconfig": { "branch": "master", "commit": "f817582301b2c188c1cff7c956971ce3f85631ff" }, + "nvim-treesitter": { "branch": "master", "commit": "28d480e0624b259095e56f353ec911f9f2a0f404" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, - "nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" }, + "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 3f62b50..2d570c1 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -1,11 +1,17 @@ return { + -- Locking mason.nvim and mason-lspconfig.nvim to v1 + -- See -- see https://github.com/LazyVim/LazyVim/issues/6039 { "williamboman/mason.nvim", + version = "^1.0.0", opts = {}, }, { "williamboman/mason-lspconfig.nvim", + version = "^1.0.0", + dependencies = { "neovim/nvim-lspconfig" }, opts = { + automatic_enable = false, ensure_installed = { "cssls", "eslint", @@ -23,10 +29,6 @@ return { { "neovim/nvim-lspconfig", event = "VeryLazy", - dependencies = { - "mason.nvim", - "williamboman/mason-lspconfig.nvim", - }, opts = { servers = { cssls = {}, From 82749c58d620b75130d991b6aeeafaf2ae22357b Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Mon, 12 May 2025 00:16:14 -0700 Subject: [PATCH 118/240] chore: plugin update --- lazy-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 89f2746..7646531 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -11,14 +11,14 @@ "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, "markdown.nvim": { "branch": "main", "commit": "935c2c70c296d87ed1bcce9ce667c239c9c982b5" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "aafae207d5a2a28c59c9d478d8581c2739135d09" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "62f821a14e20f3f2ee358cd44d0b3d299a508e72" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" }, "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, - "neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, + "neo-tree.nvim": { "branch": "main", "commit": "56f383aa157f1ff20a59154907cc5f9fe26e4db9" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "f817582301b2c188c1cff7c956971ce3f85631ff" }, + "nvim-lspconfig": { "branch": "master", "commit": "61e5109c8cf24807e4ae29813a3a82b31821dd45" }, "nvim-treesitter": { "branch": "master", "commit": "28d480e0624b259095e56f353ec911f9f2a0f404" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" }, From 6cf81b7232c13cdf7219a7838fed33bfa1f47751 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Tue, 27 May 2025 11:45:09 -0700 Subject: [PATCH 119/240] chore: plugin update --- lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 7646531..c2dfb8c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,27 +1,27 @@ { - "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, + "LuaSnip": { "branch": "master", "commit": "faf3c94a44508cec1b961406d36cc65113ff3b98" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, - "conform.nvim": { "branch": "master", "commit": "374aaf384e2e841607b8e2fe63fa3ad01d111c91" }, + "conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "43b0c856ae5f32a195d83f4a27fe21d63e6c966c" }, + "gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, - "markdown.nvim": { "branch": "main", "commit": "935c2c70c296d87ed1bcce9ce667c239c9c982b5" }, + "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, + "markdown.nvim": { "branch": "main", "commit": "df64d5d5432e13026a79384ec4e2bab185fd4eb5" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "62f821a14e20f3f2ee358cd44d0b3d299a508e72" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" }, "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, - "neo-tree.nvim": { "branch": "main", "commit": "56f383aa157f1ff20a59154907cc5f9fe26e4db9" }, - "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, + "neo-tree.nvim": { "branch": "main", "commit": "3f1dd2de5045659e00bfbe27c8aca3b52c1fdbde" }, + "nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "61e5109c8cf24807e4ae29813a3a82b31821dd45" }, - "nvim-treesitter": { "branch": "master", "commit": "28d480e0624b259095e56f353ec911f9f2a0f404" }, + "nvim-lspconfig": { "branch": "master", "commit": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, - "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" }, + "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, From fca3c2d043963382c11f17c8eb0a3b4f8e303db4 Mon Sep 17 00:00:00 2001 From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com> Date: Tue, 27 May 2025 11:45:22 -0700 Subject: [PATCH 120/240] feat: add eslint to formatting language servers --- lua/plugins/formatting.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index f0ade9a..362d402 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -68,6 +68,7 @@ return { ensure_installed = { "blade-formatter", "djlint", + "eslint", "phpcs", "php-cs-fixer", "prettierd", From b3915208ad8ad593c2bb41cb2f2015418ddc44e0 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:46 -0700 Subject: [PATCH 121/240] Initial commit --- init.lua | 63 ++++++++++++++++++++++++++++++++++++++ lazy-lock.json | 23 ++++++++++++++ lua/keybinds.lua | 21 +++++++++++++ lua/plugins/commentary.lua | 3 ++ lua/plugins/completion.lua | 56 +++++++++++++++++++++++++++++++++ lua/plugins/fugitive.lua | 9 ++++++ lua/plugins/lsp-config.lua | 47 ++++++++++++++++++++++++++++ lua/plugins/lualine.lua | 12 ++++++++ lua/plugins/neo-tree.lua | 12 ++++++++ lua/plugins/surround.lua | 3 ++ lua/plugins/telescope.lua | 31 +++++++++++++++++++ lua/plugins/tokyonight.lua | 9 ++++++ lua/plugins/treesitter.lua | 18 +++++++++++ lua/plugins/trouble.lua | 7 +++++ 14 files changed, 314 insertions(+) create mode 100644 init.lua create mode 100644 lazy-lock.json create mode 100644 lua/keybinds.lua create mode 100644 lua/plugins/commentary.lua create mode 100644 lua/plugins/completion.lua create mode 100644 lua/plugins/fugitive.lua create mode 100644 lua/plugins/lsp-config.lua create mode 100644 lua/plugins/lualine.lua create mode 100644 lua/plugins/neo-tree.lua create mode 100644 lua/plugins/surround.lua create mode 100644 lua/plugins/telescope.lua create mode 100644 lua/plugins/tokyonight.lua create mode 100644 lua/plugins/treesitter.lua create mode 100644 lua/plugins/trouble.lua diff --git a/init.lua b/init.lua new file mode 100644 index 0000000..708b323 --- /dev/null +++ b/init.lua @@ -0,0 +1,63 @@ +vim.g.mapleader = " " +vim.g.maplocalleader = " " + +vim.opt.belloff = "all" +vim.opt.backspace = "2" +vim.opt.showcmd = true +vim.opt.laststatus = 2 +vim.opt.swapfile = false + +vim.opt.number = true +vim.opt.relativenumber = true +vim.opt.signcolumn = "yes" + +vim.opt.autoindent = true +vim.opt.smartindent = true +vim.opt.smarttab = true +vim.opt.expandtab = true +vim.opt.shiftwidth = 4 +vim.opt.tabstop = 2 +vim.opt.softtabstop = 2 +vim.opt.copyindent = true + +vim.opt.scrolloff = 2 +vim.opt.splitright = true +vim.opt.splitbelow = true +vim.opt.wrap = false +vim.opt.cursorline = true + +vim.opt.hlsearch = false +vim.opt.incsearch = true + +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + +-- Fix for yanking to system clipboard on Windows +if vim.fn.has('wsl') == 1 then + vim.g.clipboard = { + name = 'WslClipboard', + copy = { + ['+'] = 'clip.exe', + ['*'] = 'clip.exe', + }, + paste = { + ['+'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', + ['*'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', + }, + cache_enabled = 0, + } +end + +require("lazy").setup("plugins") +require("keybinds") + diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 0000000..5e5948c --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,23 @@ +{ + "LuaSnip": { "branch": "master", "commit": "2463d687fe704b76eb0aa3bb34e95f69a5bb0362" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, + "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, + "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, + "nvim-lspconfig": { "branch": "master", "commit": "0d9e870d01894c592d7ea93cfe0fa451916d9a7f" }, + "nvim-treesitter": { "branch": "master", "commit": "e49f1e8ef3e8450a8446cb1f2bbb53c919f60b6d" }, + "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" }, + "nvim-web-devicons": { "branch": "master", "commit": "808627b8d412b2a6b6fc6eed816fec3557198b01" }, + "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, + "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" }, + "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, + "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" }, + "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, + "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" } +} \ No newline at end of file diff --git a/lua/keybinds.lua b/lua/keybinds.lua new file mode 100644 index 0000000..7c9a52f --- /dev/null +++ b/lua/keybinds.lua @@ -0,0 +1,21 @@ +vim.keymap.set("n", "", "", {}) +vim.keymap.set("n", "", "", {}) +vim.keymap.set("n", "", "", {}) +vim.keymap.set("n", "", "", {}) + +-- Move visual blocks around using J/K (up/down) +vim.keymap.set("v", "J", ":m '>+1gv=gv", {}) +vim.keymap.set("v", "K", ":m '<-2gv=gv", {}) + +-- Keep search terms in the middle of the screen +vim.keymap.set("n", "n", "nzzzv", {}) +vim.keymap.set("n", "N", "Nzzzv", {}) + +-- Paste without replacing clipboard contents +vim.keymap.set("x", "p", "\"_dP", {}) + +-- Yank into system clipboard +vim.keymap.set("n", "y", "\"+y", {}) + +-- Like ciw on the text under the cursor +vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) diff --git a/lua/plugins/commentary.lua b/lua/plugins/commentary.lua new file mode 100644 index 0000000..4e85c75 --- /dev/null +++ b/lua/plugins/commentary.lua @@ -0,0 +1,3 @@ +return { + "tpope/vim-commentary" +} diff --git a/lua/plugins/completion.lua b/lua/plugins/completion.lua new file mode 100644 index 0000000..e3f01ac --- /dev/null +++ b/lua/plugins/completion.lua @@ -0,0 +1,56 @@ +return { + { + "hrsh7th/nvim-cmp", + config = function() + local cmp = require("cmp") + + cmp.setup({ + -- Highlights the first result always + completion = { + completeopt = "menu,menuone,noinsert" + }, + + 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 = "luasnip" } + }, { + { name = "buffer" } + }) + }) + end + }, + { + "hrsh7th/cmp-nvim-lsp" + }, + { + "L3MON4D3/LuaSnip" + } +} diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua new file mode 100644 index 0000000..a2e0c75 --- /dev/null +++ b/lua/plugins/fugitive.lua @@ -0,0 +1,9 @@ +return { + "tpope/vim-fugitive", + config = function () + vim.keymap.set("n", "gs", vim.cmd.Git) + vim.keymap.set("n", "gh", "diffget //2") + vim.keymap.set("n", "gl", "diffget //3") + end +} + diff --git a/lua/plugins/lsp-config.lua b/lua/plugins/lsp-config.lua new file mode 100644 index 0000000..bda5a51 --- /dev/null +++ b/lua/plugins/lsp-config.lua @@ -0,0 +1,47 @@ +return { + { + "williamboman/mason.nvim", + config = function() + require("mason").setup() + end + }, + { + "williamboman/mason-lspconfig.nvim", + config = function() + require("mason-lspconfig").setup({ + ensure_installed = { "lua_ls", "tsserver", "eslint" } + }) + end + }, + { + "neovim/nvim-lspconfig", + config = function() + local lspconfig = require("lspconfig") + local capabilities = require("cmp_nvim_lsp").default_capabilities() + + lspconfig.lua_ls.setup({ + capabilities = capabilities + }) + + lspconfig.tsserver.setup({ + capabilities = capabilities + }) + + -- Runs :EslintFixAll when saving + lspconfig.eslint.setup({ + on_attach = function(_, bufnr) + vim.api.nvim_create_autocmd("BufWritePre", { + buffer = bufnr, + command = "EslintFixAll", + }) + end + }) + + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, {}) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, {}) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, {}) + vim.keymap.set('n', 'f', vim.lsp.buf.format, {}) + vim.keymap.set('n', 'vca', vim.lsp.buf.code_action, {}) + end + } +} diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua new file mode 100644 index 0000000..b368357 --- /dev/null +++ b/lua/plugins/lualine.lua @@ -0,0 +1,12 @@ +return { + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + require('lualine').setup({ + options = { + icons_enabled = true, + theme = 'tokyonight' + } + }) + end +} diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua new file mode 100644 index 0000000..b0bbc1f --- /dev/null +++ b/lua/plugins/neo-tree.lua @@ -0,0 +1,12 @@ +return { + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + config = function() + vim.keymap.set("n", "nn", ":Neotree", {}) + end +} diff --git a/lua/plugins/surround.lua b/lua/plugins/surround.lua new file mode 100644 index 0000000..b5dd6ff --- /dev/null +++ b/lua/plugins/surround.lua @@ -0,0 +1,3 @@ +return { + "tpope/vim-surround" +} diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua new file mode 100644 index 0000000..29b009e --- /dev/null +++ b/lua/plugins/telescope.lua @@ -0,0 +1,31 @@ +return { + { + 'nvim-telescope/telescope.nvim', + tag = '0.1.5', + dependencies = { 'nvim-lua/plenary.nvim' }, + config = function() + local builtin = require('telescope.builtin') + + vim.keymap.set('n', 'pp', builtin.git_files, {}) + vim.keymap.set('n', 'pf', builtin.find_files, {}) + vim.keymap.set('n', 'fh', builtin.help_tags, {}) + vim.keymap.set('n', 'ps', function() + builtin.grep_string({ search = vim.fn.input("Grep > ") }) + end) + end + }, + { + "nvim-telescope/telescope-ui-select.nvim", + config = function() + require("telescope").setup { + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown {} + } + } + } + + require("telescope").load_extension("ui-select") + end + } +} diff --git a/lua/plugins/tokyonight.lua b/lua/plugins/tokyonight.lua new file mode 100644 index 0000000..6c6b53e --- /dev/null +++ b/lua/plugins/tokyonight.lua @@ -0,0 +1,9 @@ +return { + "folke/tokyonight.nvim", + lazy = false, + priority = 1000, + opts = {}, + config = function() + vim.cmd.colorscheme "tokyonight" + end +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua new file mode 100644 index 0000000..5bcb754 --- /dev/null +++ b/lua/plugins/treesitter.lua @@ -0,0 +1,18 @@ +return { + { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + config = function() + local config = require("nvim-treesitter.configs") + config.setup({ + ensure_installed = { "lua", "javascript", "typescript", "tsx" }, + sync_install = false, + highlight = { enable = true }, + indent = { enable = true } + }) + end + }, + { + "nvim-treesitter/nvim-treesitter-context" + } +} diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua new file mode 100644 index 0000000..b1ad96d --- /dev/null +++ b/lua/plugins/trouble.lua @@ -0,0 +1,7 @@ +return { + "folke/trouble.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + vim.keymap.set("n", "tt", ":TroubleToggle", {}) + end + } From dc15fb8aa54418f0835cf9655343555f4bef267c Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:46 -0700 Subject: [PATCH 122/240] fix: update neo-tree to show dotfiles --- lua/plugins/neo-tree.lua | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index b0bbc1f..d8cb3b7 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -2,11 +2,22 @@ return { "nvim-neo-tree/neo-tree.nvim", branch = "v3.x", dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", }, config = function() vim.keymap.set("n", "nn", ":Neotree", {}) + + local nt = require("neo-tree") + + nt.setup({ + filesystem = { + filtered_items = { + hide_dotfiles = false, + hide_gitignored = true, + } + } + }) end } From c60d305c4da62dcec18f93a4ab8eb9702c261a29 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:46 -0700 Subject: [PATCH 123/240] feat: add autopairs plugin --- lazy-lock.json | 1 + lua/plugins/treesitter.lua | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/lazy-lock.json b/lazy-lock.json index 5e5948c..3bd79ea 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -7,6 +7,7 @@ "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, + "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-lspconfig": { "branch": "master", "commit": "0d9e870d01894c592d7ea93cfe0fa451916d9a7f" }, "nvim-treesitter": { "branch": "master", "commit": "e49f1e8ef3e8450a8446cb1f2bbb53c919f60b6d" }, diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 5bcb754..b21d1ff 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -14,5 +14,10 @@ return { }, { "nvim-treesitter/nvim-treesitter-context" + }, + { + 'windwp/nvim-autopairs', + event = "InsertEnter", + opts = {} } } From 90b7487a41ac0f2b5dd1705ce3c306b349fe7469 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 124/240] fix: yank into system clipboard for n and v modes --- lua/keybinds.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index 7c9a52f..e8a7ec9 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -15,7 +15,8 @@ vim.keymap.set("n", "N", "Nzzzv", {}) vim.keymap.set("x", "p", "\"_dP", {}) -- Yank into system clipboard -vim.keymap.set("n", "y", "\"+y", {}) +vim.keymap.set("n", "y", "\"*y", {}) +vim.keymap.set("v", "y", "\"*y", {}) -- Like ciw on the text under the cursor vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) From b2242755009c9b3f2307702f5ba808e78a4140db Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 125/240] feat: update neo-tree config to show env files --- lazy-lock.json | 8 ++++---- lua/plugins/neo-tree.lua | 11 ++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 3bd79ea..ea6a6cb 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "2463d687fe704b76eb0aa3bb34e95f69a5bb0362" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, @@ -9,10 +9,10 @@ "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, - "nvim-lspconfig": { "branch": "master", "commit": "0d9e870d01894c592d7ea93cfe0fa451916d9a7f" }, - "nvim-treesitter": { "branch": "master", "commit": "e49f1e8ef3e8450a8446cb1f2bbb53c919f60b6d" }, + "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, + "nvim-treesitter": { "branch": "master", "commit": "65ef62092ef997d2ecf68ede01a0afbda17808c3" }, "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" }, - "nvim-web-devicons": { "branch": "master", "commit": "808627b8d412b2a6b6fc6eed816fec3557198b01" }, + "nvim-web-devicons": { "branch": "master", "commit": "cff25ce621e6d15fae0b0bfe38c00be50ce38468" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index d8cb3b7..f67dfbc 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -14,9 +14,18 @@ return { nt.setup({ filesystem = { filtered_items = { + show_hidden_count = false, hide_dotfiles = false, hide_gitignored = true, - } + always_show = { + ".env" + }, + never_show = { + ".git", + "thumbs.db", + ".DS_Store" + } + }, } }) end From 9a4bcf52b40d6401c98fe9a405a07429578138ee Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 126/240] feat: add todo-comments.nvim --- lazy-lock.json | 1 + lua/plugins/todo-comments.lua | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 lua/plugins/todo-comments.lua diff --git a/lazy-lock.json b/lazy-lock.json index ea6a6cb..d414243 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -16,6 +16,7 @@ "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" }, diff --git a/lua/plugins/todo-comments.lua b/lua/plugins/todo-comments.lua new file mode 100644 index 0000000..2ca05d6 --- /dev/null +++ b/lua/plugins/todo-comments.lua @@ -0,0 +1,5 @@ +return { + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = {}, +} From 270b9013fbff2ab3a6897190054bfcfd97f2731f Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 127/240] feat: add which-key.nvim --- lazy-lock.json | 3 ++- lua/plugins/which-key.lua | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 lua/plugins/which-key.lua diff --git a/lazy-lock.json b/lazy-lock.json index d414243..7f63a2b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -21,5 +21,6 @@ "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" }, "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, - "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" } + "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua new file mode 100644 index 0000000..410f8db --- /dev/null +++ b/lua/plugins/which-key.lua @@ -0,0 +1,9 @@ +return { + "folke/which-key.nvim", + event = "VeryLazy", + init = function() + vim.o.timeout = true + vim.o.timeoutlen = 300 + end, + opts = {} +} From 23c8e0ed95b3971c77ac8d781e3c0d3d51f7fdb9 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 128/240] feat: add hardtime.nvim --- init.lua | 1 + lazy-lock.json | 1 + lua/plugins/hardtime.lua | 14 ++++++++++++++ 3 files changed, 16 insertions(+) create mode 100644 lua/plugins/hardtime.lua diff --git a/init.lua b/init.lua index 708b323..818e495 100644 --- a/init.lua +++ b/init.lua @@ -25,6 +25,7 @@ vim.opt.splitright = true vim.opt.splitbelow = true vim.opt.wrap = false vim.opt.cursorline = true +vim.opt.cmdheight = 2 vim.opt.hlsearch = false vim.opt.incsearch = true diff --git a/lazy-lock.json b/lazy-lock.json index 7f63a2b..02aceab 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,7 @@ { "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "hardtime.nvim": { "branch": "main", "commit": "4ba3be553fa0b713c7b817f6d201b07d282accf3" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, diff --git a/lua/plugins/hardtime.lua b/lua/plugins/hardtime.lua new file mode 100644 index 0000000..4fd94bb --- /dev/null +++ b/lua/plugins/hardtime.lua @@ -0,0 +1,14 @@ +return { + "m4xshen/hardtime.nvim", + dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, + opts = { + disable_mouse = true, + disabled_keys = { + -- Drill Sergeant Demchuk! + [""] = {"", "i"}, + [""] = {"", "i"}, + [""] = {"", "i"}, + [""] = {"", "i"} + } + } +} From 32dd03a493d16194d09c96dad5977c024ef4265f Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 129/240] fix: update completion behaviour --- lua/plugins/completion.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lua/plugins/completion.lua b/lua/plugins/completion.lua index e3f01ac..18d888f 100644 --- a/lua/plugins/completion.lua +++ b/lua/plugins/completion.lua @@ -29,7 +29,10 @@ return { fallback() end end, { "i" }), - [""] = cmp.mapping.confirm({ select = true }) + [""] = cmp.mapping.confirm({ + behaviour = cmp.ConfirmBehavior.Insert, + select = true + }) }), snippet = { From 4c0bce0ca7a03163c1da09499dcedae56d39a7be Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 130/240] fix: context to max 2 lines --- lua/plugins/treesitter.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index b21d1ff..81c7fae 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -13,7 +13,10 @@ return { end }, { - "nvim-treesitter/nvim-treesitter-context" + "nvim-treesitter/nvim-treesitter-context", + opts = { + max_lines = 2, + } }, { 'windwp/nvim-autopairs', From 2b4aeefdfc546c7ee074e4658f7ca613c106d47c Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 131/240] feat: add descriptions for keybinds --- lua/keybinds.lua | 29 ++++++++++++----------------- lua/plugins/fugitive.lua | 7 ++++--- lua/plugins/hardtime.lua | 12 ++++++++++++ lua/plugins/lsp-config.lua | 10 +++++----- lua/plugins/neo-tree.lua | 2 +- lua/plugins/telescope.lua | 8 ++++---- lua/plugins/trouble.lua | 2 +- 7 files changed, 39 insertions(+), 31 deletions(-) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index e8a7ec9..9258c85 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -1,22 +1,17 @@ -vim.keymap.set("n", "", "", {}) -vim.keymap.set("n", "", "", {}) -vim.keymap.set("n", "", "", {}) -vim.keymap.set("n", "", "", {}) +vim.keymap.set("n", "", "", { desc = "Go to split on left" }) +vim.keymap.set("n", "", "", { desc = "Go to split above"}) +vim.keymap.set("n", "", "", { desc = "Go to split below"}) +vim.keymap.set("n", "", "", { desc = "Go to split on right" }) --- Move visual blocks around using J/K (up/down) -vim.keymap.set("v", "J", ":m '>+1gv=gv", {}) -vim.keymap.set("v", "K", ":m '<-2gv=gv", {}) +vim.keymap.set("v", "J", ":m '>+1gv=gv", { desc = "Move lines under cursor up" }) +vim.keymap.set("v", "K", ":m '<-2gv=gv", { desc = "Move lines under cursor down" }) --- Keep search terms in the middle of the screen -vim.keymap.set("n", "n", "nzzzv", {}) -vim.keymap.set("n", "N", "Nzzzv", {}) +vim.keymap.set("n", "n", "nzzzv", { desc = "Go to next search result and keep cursor centered on screen" }) +vim.keymap.set("n", "N", "Nzzzv", { desc = "Go to previous search result and keep cursor centered on screen" }) --- Paste without replacing clipboard contents -vim.keymap.set("x", "p", "\"_dP", {}) +vim.keymap.set("x", "p", "\"_dP", { desc = "Paste without replacing clipboard contents" }) --- Yank into system clipboard -vim.keymap.set("n", "y", "\"*y", {}) -vim.keymap.set("v", "y", "\"*y", {}) +vim.keymap.set("n", "y", "\"*y", { desc = "Yank into system clipboard" }) +vim.keymap.set("v", "y", "\"*y", { desc = "Yank into system clipboard" }) --- Like ciw on the text under the cursor -vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) +vim.keymap.set("n", "s", [[:%s/\<\>//gI]], { desc = "Like `ciw` for any highlighted text (doesn't have to be word)"}) diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua index a2e0c75..9636763 100644 --- a/lua/plugins/fugitive.lua +++ b/lua/plugins/fugitive.lua @@ -1,9 +1,10 @@ return { "tpope/vim-fugitive", config = function () - vim.keymap.set("n", "gs", vim.cmd.Git) - vim.keymap.set("n", "gh", "diffget //2") - vim.keymap.set("n", "gl", "diffget //3") + vim.keymap.set("n", "gs", vim.cmd.Git, { desc = "View `git status`" }) + vim.keymap.set("n", "gh", "diffget //2", { desc = "Pick gitdiff on left" }) + vim.keymap.set("n", "gl", "diffget //3", { desc = "Pick gitdiff on right" }) + vim.keymap.set("n", "gp", ":Git push", { desc = "Run `git push`" }) end } diff --git a/lua/plugins/hardtime.lua b/lua/plugins/hardtime.lua index 4fd94bb..8b090fd 100644 --- a/lua/plugins/hardtime.lua +++ b/lua/plugins/hardtime.lua @@ -9,6 +9,18 @@ return { [""] = {"", "i"}, [""] = {"", "i"}, [""] = {"", "i"} + }, + disabled_filetypes = { + "checkhealth", + "fugitive", + "help", + "lazy", + "mason", + "neo-tree", + "neo-tree-popup", + "netrw", + "noice", + "notify", } } } diff --git a/lua/plugins/lsp-config.lua b/lua/plugins/lsp-config.lua index bda5a51..f418bac 100644 --- a/lua/plugins/lsp-config.lua +++ b/lua/plugins/lsp-config.lua @@ -37,11 +37,11 @@ return { end }) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, {}) - vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, {}) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, {}) - vim.keymap.set('n', 'f', vim.lsp.buf.format, {}) - vim.keymap.set('n', 'vca', vim.lsp.buf.code_action, {}) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = "Go to definition" }) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { desc = "Go to implementation" }) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, { desc = "Show signature" }) + vim.keymap.set('n', 'f', vim.lsp.buf.format, { desc = "Format buffer" }) + vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, { desc = "View code actions" }) end } } diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index f67dfbc..3855db3 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -7,7 +7,7 @@ return { "MunifTanjim/nui.nvim", }, config = function() - vim.keymap.set("n", "nn", ":Neotree", {}) + vim.keymap.set("n", "nn", ":Neotree", { desc = "Open Neotree" }) local nt = require("neo-tree") diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 29b009e..ff69daa 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -6,12 +6,12 @@ return { config = function() local builtin = require('telescope.builtin') - vim.keymap.set('n', 'pp', builtin.git_files, {}) - vim.keymap.set('n', 'pf', builtin.find_files, {}) - vim.keymap.set('n', 'fh', builtin.help_tags, {}) + vim.keymap.set('n', 'pp', builtin.git_files, { desc = "Search git_files" }) + vim.keymap.set('n', 'pf', builtin.find_files, { desc = "Search all files "}) + vim.keymap.set('n', 'fh', builtin.help_tags, { desc = "View help tags" }) vim.keymap.set('n', 'ps', function() builtin.grep_string({ search = vim.fn.input("Grep > ") }) - end) + end, { desc = "Grep entire project for string" }) end }, { diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua index b1ad96d..e7a9de2 100644 --- a/lua/plugins/trouble.lua +++ b/lua/plugins/trouble.lua @@ -2,6 +2,6 @@ return { "folke/trouble.nvim", dependencies = { "nvim-tree/nvim-web-devicons" }, config = function() - vim.keymap.set("n", "tt", ":TroubleToggle", {}) + vim.keymap.set("n", "tt", ":TroubleToggle", { desc = "Toggle Trouble" }) end } From ad57cbb57dba790ecf8d825ac1a1451731038e7b Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 132/240] feat: moved linting and formatting to plugins --- lazy-lock.json | 3 +++ lua/plugins/lint.lua | 26 +++++++++++++++++++ lua/plugins/lsp-config.lua | 53 +++++++++++++++++++++++++++++--------- 3 files changed, 70 insertions(+), 12 deletions(-) create mode 100644 lua/plugins/lint.lua diff --git a/lazy-lock.json b/lazy-lock.json index 02aceab..abaf2df 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,15 +1,18 @@ { "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "conform.nvim": { "branch": "master", "commit": "75e7c5c7eb5fbd53f8b12dc420b31ec70770b231" }, "hardtime.nvim": { "branch": "main", "commit": "4ba3be553fa0b713c7b817f6d201b07d282accf3" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, + "nvim-lint": { "branch": "master", "commit": "8df53b5dde8ea80f0a039775777eae6648a10229" }, "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, "nvim-treesitter": { "branch": "master", "commit": "65ef62092ef997d2ecf68ede01a0afbda17808c3" }, "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" }, diff --git a/lua/plugins/lint.lua b/lua/plugins/lint.lua new file mode 100644 index 0000000..2d279dd --- /dev/null +++ b/lua/plugins/lint.lua @@ -0,0 +1,26 @@ +return { + "mfussenegger/nvim-lint", + event = { + "BufReadPre", + "BufNewFile", + }, + config = function () + local lint = require("lint") + + lint.linters_by_ft = { + javascript = { "eslint_d" }, + typescript = { "eslint_d" }, + javascriptreact = { "eslint_d" }, + typescriptreact = { "eslint_d" }, + } + + local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) + + vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { + group = lint_augroup, + callback = function () + lint.try_lint() + end + }) + end +} diff --git a/lua/plugins/lsp-config.lua b/lua/plugins/lsp-config.lua index f418bac..a0b1eed 100644 --- a/lua/plugins/lsp-config.lua +++ b/lua/plugins/lsp-config.lua @@ -2,14 +2,14 @@ return { { "williamboman/mason.nvim", config = function() - require("mason").setup() + require("mason").setup() end }, { "williamboman/mason-lspconfig.nvim", config = function() require("mason-lspconfig").setup({ - ensure_installed = { "lua_ls", "tsserver", "eslint" } + ensure_installed = { "lua_ls", "tsserver" } }) end }, @@ -27,21 +27,50 @@ return { capabilities = capabilities }) - -- Runs :EslintFixAll when saving - lspconfig.eslint.setup({ - on_attach = function(_, bufnr) - vim.api.nvim_create_autocmd("BufWritePre", { - buffer = bufnr, - command = "EslintFixAll", - }) - end - }) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = "Go to definition" }) vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { desc = "Go to implementation" }) vim.keymap.set('n', 'K', vim.lsp.buf.hover, { desc = "Show signature" }) vim.keymap.set('n', 'f', vim.lsp.buf.format, { desc = "Format buffer" }) vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, { desc = "View code actions" }) end + }, + { + "WhoIsSethDaniel/mason-tool-installer.nvim", + config = function() + local mason_tool_installer = require("mason-tool-installer") + + mason_tool_installer.setup({ + ensure_installed = { + "prettierd", + "eslint_d", + }, + automatic_installation = true + }) + end + }, + { + "stevearc/conform.nvim", + opts = { + formatters_by_ft = { + lua = { "stylua" }, + javascript = { "eslint_d" }, + javascriptreact = { "eslint_d" }, + json = { "prettierd" }, + jsonc = { "prettierd" }, + yaml = { "prettierd" }, + typescript = { "eslint_d" }, + typescriptreact = { "eslint_d" }, + html = { "prettierd" }, + ejs = { "prettierd" }, + css = { "prettierd" }, + scss = { "prettierd" }, + graphql = { "prettierd" }, + markdown = { "prettierd" }, + ["_"] = { "trim_whitespace" }, + }, + format_on_save = { + lsp_fallback = true, + }, + }, } } From 2ad0fb18a1bfd8d62ce4ec866cb2a224b49817cb Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 133/240] fix: format config files --- init.lua | 17 ++++++++--------- lua/keybinds.lua | 7 ++++--- lua/plugins/completion.lua | 8 ++++---- lua/plugins/fugitive.lua | 3 +-- lua/plugins/hardtime.lua | 14 +++++++------- lua/plugins/lint.lua | 4 ++-- lua/plugins/telescope.lua | 10 +++++----- lua/plugins/trouble.lua | 2 +- 8 files changed, 32 insertions(+), 33 deletions(-) diff --git a/init.lua b/init.lua index 818e495..93f817c 100644 --- a/init.lua +++ b/init.lua @@ -32,14 +32,14 @@ vim.opt.incsearch = true local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) end vim.opt.rtp:prepend(lazypath) @@ -61,4 +61,3 @@ end require("lazy").setup("plugins") require("keybinds") - diff --git a/lua/keybinds.lua b/lua/keybinds.lua index 9258c85..ca9d9ea 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -1,6 +1,6 @@ vim.keymap.set("n", "", "", { desc = "Go to split on left" }) -vim.keymap.set("n", "", "", { desc = "Go to split above"}) -vim.keymap.set("n", "", "", { desc = "Go to split below"}) +vim.keymap.set("n", "", "", { desc = "Go to split above" }) +vim.keymap.set("n", "", "", { desc = "Go to split below" }) vim.keymap.set("n", "", "", { desc = "Go to split on right" }) vim.keymap.set("v", "J", ":m '>+1gv=gv", { desc = "Move lines under cursor up" }) @@ -14,4 +14,5 @@ vim.keymap.set("x", "p", "\"_dP", { desc = "Paste without replacing clip vim.keymap.set("n", "y", "\"*y", { desc = "Yank into system clipboard" }) vim.keymap.set("v", "y", "\"*y", { desc = "Yank into system clipboard" }) -vim.keymap.set("n", "s", [[:%s/\<\>//gI]], { desc = "Like `ciw` for any highlighted text (doesn't have to be word)"}) +vim.keymap.set("n", "s", [[:%s/\<\>//gI]], + { desc = "Like `ciw` for any highlighted text (doesn't have to be word)" }) diff --git a/lua/plugins/completion.lua b/lua/plugins/completion.lua index 18d888f..6696501 100644 --- a/lua/plugins/completion.lua +++ b/lua/plugins/completion.lua @@ -15,14 +15,14 @@ return { [""] = cmp.mapping.scroll_docs(4), [""] = cmp.mapping.complete(), [""] = cmp.mapping.abort(), - [""] = cmp.mapping(function (fallback) + [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() else fallback() end end, { "i" }), - [""] = cmp.mapping(function (fallback) + [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() else @@ -45,8 +45,8 @@ return { { name = "nvim_lsp" }, { name = "luasnip" } }, { - { name = "buffer" } - }) + { name = "buffer" } + }) }) end }, diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua index 9636763..b9a587d 100644 --- a/lua/plugins/fugitive.lua +++ b/lua/plugins/fugitive.lua @@ -1,10 +1,9 @@ return { "tpope/vim-fugitive", - config = function () + config = function() vim.keymap.set("n", "gs", vim.cmd.Git, { desc = "View `git status`" }) vim.keymap.set("n", "gh", "diffget //2", { desc = "Pick gitdiff on left" }) vim.keymap.set("n", "gl", "diffget //3", { desc = "Pick gitdiff on right" }) vim.keymap.set("n", "gp", ":Git push", { desc = "Run `git push`" }) end } - diff --git a/lua/plugins/hardtime.lua b/lua/plugins/hardtime.lua index 8b090fd..2848a46 100644 --- a/lua/plugins/hardtime.lua +++ b/lua/plugins/hardtime.lua @@ -1,14 +1,14 @@ return { - "m4xshen/hardtime.nvim", - dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, - opts = { + "m4xshen/hardtime.nvim", + dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, + opts = { disable_mouse = true, disabled_keys = { -- Drill Sergeant Demchuk! - [""] = {"", "i"}, - [""] = {"", "i"}, - [""] = {"", "i"}, - [""] = {"", "i"} + [""] = { "", "i" }, + [""] = { "", "i" }, + [""] = { "", "i" }, + [""] = { "", "i" } }, disabled_filetypes = { "checkhealth", diff --git a/lua/plugins/lint.lua b/lua/plugins/lint.lua index 2d279dd..03b7cbb 100644 --- a/lua/plugins/lint.lua +++ b/lua/plugins/lint.lua @@ -4,7 +4,7 @@ return { "BufReadPre", "BufNewFile", }, - config = function () + config = function() local lint = require("lint") lint.linters_by_ft = { @@ -18,7 +18,7 @@ return { vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { group = lint_augroup, - callback = function () + callback = function() lint.try_lint() end }) diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index ff69daa..d0c21e6 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -7,7 +7,7 @@ return { local builtin = require('telescope.builtin') vim.keymap.set('n', 'pp', builtin.git_files, { desc = "Search git_files" }) - vim.keymap.set('n', 'pf', builtin.find_files, { desc = "Search all files "}) + vim.keymap.set('n', 'pf', builtin.find_files, { desc = "Search all files " }) vim.keymap.set('n', 'fh', builtin.help_tags, { desc = "View help tags" }) vim.keymap.set('n', 'ps', function() builtin.grep_string({ search = vim.fn.input("Grep > ") }) @@ -18,11 +18,11 @@ return { "nvim-telescope/telescope-ui-select.nvim", config = function() require("telescope").setup { - extensions = { - ["ui-select"] = { - require("telescope.themes").get_dropdown {} + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown {} + } } - } } require("telescope").load_extension("ui-select") diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua index e7a9de2..4745503 100644 --- a/lua/plugins/trouble.lua +++ b/lua/plugins/trouble.lua @@ -4,4 +4,4 @@ return { config = function() vim.keymap.set("n", "tt", ":TroubleToggle", { desc = "Toggle Trouble" }) end - } +} From 7675e0f39824bafa21ad4d6ae5698a2b40b55828 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 134/240] feat: update plugins --- lazy-lock.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index abaf2df..0fd8ca5 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,22 +1,22 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "conform.nvim": { "branch": "master", "commit": "75e7c5c7eb5fbd53f8b12dc420b31ec70770b231" }, "hardtime.nvim": { "branch": "main", "commit": "4ba3be553fa0b713c7b817f6d201b07d282accf3" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, - "mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" }, + "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, - "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, + "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-lint": { "branch": "master", "commit": "8df53b5dde8ea80f0a039775777eae6648a10229" }, - "nvim-lspconfig": { "branch": "master", "commit": "ce0e625df61be77abe1340fbc9afe9ad39b31dd8" }, - "nvim-treesitter": { "branch": "master", "commit": "65ef62092ef997d2ecf68ede01a0afbda17808c3" }, - "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" }, - "nvim-web-devicons": { "branch": "master", "commit": "cff25ce621e6d15fae0b0bfe38c00be50ce38468" }, + "nvim-lspconfig": { "branch": "master", "commit": "796394fd19fb878e8dbc4fd1e9c9c186ed07a5f4" }, + "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" }, + "nvim-treesitter-context": { "branch": "master", "commit": "400a99ad43ac78af1148061da3491cba2637ad29" }, + "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, From 01d12e0ef4c3960e91f0d07ed9b559338feafe8f Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 135/240] feat: add autocmds config --- README.md | 13 +++++++++++++ init.lua | 1 + lua/autocmds.lua | 7 +++++++ 3 files changed, 21 insertions(+) create mode 100644 README.md create mode 100644 lua/autocmds.lua diff --git a/README.md b/README.md new file mode 100644 index 0000000..285cf32 --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +# wonderfulfrog's Neovim configuration + +Uses [lazy.nvim][lazynvim] to manage plugins. + +It's pretty opinionated. You might not like it. + +## Installation + +1. Clone this repo into Neovim's config folder. +2. Run Neovim. +3. Wait for everything to install. + +[lazynvim]: https://github.com/folke/lazy.nvim diff --git a/init.lua b/init.lua index 93f817c..9666a73 100644 --- a/init.lua +++ b/init.lua @@ -61,3 +61,4 @@ end require("lazy").setup("plugins") require("keybinds") +require("autocmds") diff --git a/lua/autocmds.lua b/lua/autocmds.lua new file mode 100644 index 0000000..7657ff3 --- /dev/null +++ b/lua/autocmds.lua @@ -0,0 +1,7 @@ +vim.api.nvim_create_autocmd({ "FileType" }, { + pattern = { "gitcommit", "markdown", "md", "mdx" }, + callback = function() + vim.opt_local.spell = true + vim.opt.wrap = true + end +}) From 9eae37fa85b89a70e18ceb40f7edec090a10b96b Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 136/240] feat: add alpha-nvim plugin --- lazy-lock.json | 1 + lua/plugins/alpha-nvim.lua | 43 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 lua/plugins/alpha-nvim.lua diff --git a/lazy-lock.json b/lazy-lock.json index 0fd8ca5..8dbcce7 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" }, + "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "conform.nvim": { "branch": "master", "commit": "75e7c5c7eb5fbd53f8b12dc420b31ec70770b231" }, "hardtime.nvim": { "branch": "main", "commit": "4ba3be553fa0b713c7b817f6d201b07d282accf3" }, diff --git a/lua/plugins/alpha-nvim.lua b/lua/plugins/alpha-nvim.lua new file mode 100644 index 0000000..b4ee958 --- /dev/null +++ b/lua/plugins/alpha-nvim.lua @@ -0,0 +1,43 @@ +return { + 'goolord/alpha-nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + local alpha = require("alpha") + local dashboard = require("alpha.themes.dashboard") + + -- https://github.com/MaximilianLloyd/ascii.nvim + dashboard.section.header.val = { + " ", + " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", + " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", + " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", + " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", + " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", + " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", + " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", + " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", + " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", + " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", + " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", + " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", + " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", + " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", + " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", + " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", + " ▄█████████▄▄ ", + " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", + " ▄▄█████▀▀▀▀ ▀■ ", + " ▄███▀▀▀▀ ", + " ■▀▀ ", + " ", + } + + dashboard.section.buttons.val = { + dashboard.button("e", " > New File", "ene"), + dashboard.button("SPC ee", " > File explorer", "Neotree"), + dashboard.button("q", " > Quit", "qa"), + } + + alpha.setup(dashboard.opts) + end +}; From f5576afd01a62205632e4f82656c32d78a0a19b5 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 137/240] feat: update neotree binding to toggle --- lua/plugins/neo-tree.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index 3855db3..34193f2 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -7,7 +7,7 @@ return { "MunifTanjim/nui.nvim", }, config = function() - vim.keymap.set("n", "nn", ":Neotree", { desc = "Open Neotree" }) + vim.keymap.set("n", "nn", ":Neotree toggle", { desc = "Toggle Neotree" }) local nt = require("neo-tree") From 2bdcd710b74c363c00c7e5818707caa93057fab1 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 138/240] feat: restructure config --- init.lua | 34 +++------------------------------- lua/autocmds.lua | 2 +- lua/options.lua | 31 +++++++++++++++++++++++++++++++ lua/plugins/colorscheme.lua | 8 ++++++++ lua/plugins/tokyonight.lua | 9 --------- 5 files changed, 43 insertions(+), 41 deletions(-) create mode 100644 lua/options.lua create mode 100644 lua/plugins/colorscheme.lua delete mode 100644 lua/plugins/tokyonight.lua diff --git a/init.lua b/init.lua index 9666a73..b6c32bd 100644 --- a/init.lua +++ b/init.lua @@ -1,34 +1,4 @@ -vim.g.mapleader = " " -vim.g.maplocalleader = " " - -vim.opt.belloff = "all" -vim.opt.backspace = "2" -vim.opt.showcmd = true -vim.opt.laststatus = 2 -vim.opt.swapfile = false - -vim.opt.number = true -vim.opt.relativenumber = true -vim.opt.signcolumn = "yes" - -vim.opt.autoindent = true -vim.opt.smartindent = true -vim.opt.smarttab = true -vim.opt.expandtab = true -vim.opt.shiftwidth = 4 -vim.opt.tabstop = 2 -vim.opt.softtabstop = 2 -vim.opt.copyindent = true - -vim.opt.scrolloff = 2 -vim.opt.splitright = true -vim.opt.splitbelow = true -vim.opt.wrap = false -vim.opt.cursorline = true -vim.opt.cmdheight = 2 - -vim.opt.hlsearch = false -vim.opt.incsearch = true +require("options") local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then @@ -62,3 +32,5 @@ end require("lazy").setup("plugins") require("keybinds") require("autocmds") + +vim.cmd.colorscheme("tokyonight") diff --git a/lua/autocmds.lua b/lua/autocmds.lua index 7657ff3..2aee9f5 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -2,6 +2,6 @@ vim.api.nvim_create_autocmd({ "FileType" }, { pattern = { "gitcommit", "markdown", "md", "mdx" }, callback = function() vim.opt_local.spell = true - vim.opt.wrap = true + vim.opt_local.wrap = true end }) diff --git a/lua/options.lua b/lua/options.lua new file mode 100644 index 0000000..6fbe25e --- /dev/null +++ b/lua/options.lua @@ -0,0 +1,31 @@ +vim.g.mapleader = " " +vim.g.maplocalleader = " " + +vim.opt.belloff = "all" +vim.opt.backspace = "2" +vim.opt.showcmd = true +vim.opt.laststatus = 2 +vim.opt.swapfile = false + +vim.opt.number = true +vim.opt.relativenumber = true +vim.opt.signcolumn = "yes" + +vim.opt.autoindent = true +vim.opt.smartindent = true +vim.opt.smarttab = true +vim.opt.expandtab = true +vim.opt.shiftwidth = 4 +vim.opt.tabstop = 2 +vim.opt.softtabstop = 2 +vim.opt.copyindent = true + +vim.opt.scrolloff = 2 +vim.opt.splitright = true +vim.opt.splitbelow = true +vim.opt.wrap = false +vim.opt.cursorline = true +vim.opt.cmdheight = 2 + +vim.opt.hlsearch = false +vim.opt.incsearch = true diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua new file mode 100644 index 0000000..890c312 --- /dev/null +++ b/lua/plugins/colorscheme.lua @@ -0,0 +1,8 @@ +return { + "folke/tokyonight.nvim", + lazy = true, + opts = { + transparent = true, + dim_inactive = true, + } +} diff --git a/lua/plugins/tokyonight.lua b/lua/plugins/tokyonight.lua deleted file mode 100644 index 6c6b53e..0000000 --- a/lua/plugins/tokyonight.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "folke/tokyonight.nvim", - lazy = false, - priority = 1000, - opts = {}, - config = function() - vim.cmd.colorscheme "tokyonight" - end -} From 257de33886944b2f5562c76da56428111d58dc14 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 139/240] feat: update neotree for moving files --- lua/plugins/neo-tree.lua | 11 +++++++++++ lua/plugins/telescope.lua | 1 + 2 files changed, 12 insertions(+) diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index 34193f2..2286417 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -12,6 +12,7 @@ return { local nt = require("neo-tree") nt.setup({ + enable_normal_mode_for_inputs = true, filesystem = { filtered_items = { show_hidden_count = false, @@ -26,6 +27,16 @@ return { ".DS_Store" } }, + }, + window = { + mappings = { + ["m"] = { + "move", + config = { + show_path = "relative" + } + }, + } } }) end diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index d0c21e6..18ff6dd 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -9,6 +9,7 @@ return { vim.keymap.set('n', 'pp', builtin.git_files, { desc = "Search git_files" }) vim.keymap.set('n', 'pf', builtin.find_files, { desc = "Search all files " }) vim.keymap.set('n', 'fh', builtin.help_tags, { desc = "View help tags" }) + vim.keymap.set('n', 'gc', builtin.git_branches, { desc = "Checkout git branches" }) vim.keymap.set('n', 'ps', function() builtin.grep_string({ search = vim.fn.input("Grep > ") }) end, { desc = "Grep entire project for string" }) From 7982ef54559abce5ca6ae2109a1b6866832599dd Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 140/240] feat: start in normal mode when using telescope --- lua/plugins/telescope.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 18ff6dd..d9c7326 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -19,6 +19,9 @@ return { "nvim-telescope/telescope-ui-select.nvim", config = function() require("telescope").setup { + defaults = { + initial_mode = "normal" + }, extensions = { ["ui-select"] = { require("telescope.themes").get_dropdown {} From 59cbae81fcc953f02abe559c24fc1ca6a92c7231 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 141/240] feat: add Telescope buffers keybind --- lua/plugins/telescope.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index d9c7326..51e53fb 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -13,6 +13,7 @@ return { vim.keymap.set('n', 'ps', function() builtin.grep_string({ search = vim.fn.input("Grep > ") }) end, { desc = "Grep entire project for string" }) + vim.keymap.set('n', 'b', builtin.buffers, { desc = "Search buffers" }) end }, { From bd2440c50b2fbf0060b2ec476e29c2328b936152 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 142/240] feat: add binding for git checkout --- lua/plugins/fugitive.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua index b9a587d..1a989fb 100644 --- a/lua/plugins/fugitive.lua +++ b/lua/plugins/fugitive.lua @@ -5,5 +5,6 @@ return { vim.keymap.set("n", "gh", "diffget //2", { desc = "Pick gitdiff on left" }) vim.keymap.set("n", "gl", "diffget //3", { desc = "Pick gitdiff on right" }) vim.keymap.set("n", "gp", ":Git push", { desc = "Run `git push`" }) + vim.keymap.set("n", "gc", ":Git checkout ", { desc = "Git checkout" }) end } From 215f3faf299e067680d42b839365ad1e6e87255d Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 143/240] feat: add scope-related plugins --- lazy-lock.json | 2 ++ lua/plugins/ui.lua | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 lua/plugins/ui.lua diff --git a/lazy-lock.json b/lazy-lock.json index 8dbcce7..897034e 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -4,11 +4,13 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "conform.nvim": { "branch": "master", "commit": "75e7c5c7eb5fbd53f8b12dc420b31ec70770b231" }, "hardtime.nvim": { "branch": "main", "commit": "4ba3be553fa0b713c7b817f6d201b07d282accf3" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, + "mini.indentscope": { "branch": "main", "commit": "ca129b71edb672d30b8d7ec3138106db1b1f6a8b" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua new file mode 100644 index 0000000..9aa07d6 --- /dev/null +++ b/lua/plugins/ui.lua @@ -0,0 +1,55 @@ +return { + { + "lukas-reineke/indent-blankline.nvim", + opts = { + indent = { + char = "│", + tab_char = "│", + }, + scope = { enabled = false }, + exclude = { + filetypes = { + "help", + "alpha", + "dashboard", + "neo-tree", + "Trouble", + "trouble", + "lazy", + "mason", + "notify", + "toggleterm", + "lazyterm", + }, + }, + }, + main = "ibl", + }, + { + "echasnovski/mini.indentscope", + opts = { + symbol = "│", + options = { try_as_border = true }, + }, + init = function() + vim.api.nvim_create_autocmd("FileType", { + pattern = { + "help", + "alpha", + "dashboard", + "neo-tree", + "Trouble", + "trouble", + "lazy", + "mason", + "notify", + "toggleterm", + "lazyterm", + }, + callback = function() + vim.b.miniindentscope_disable = true + end, + }) + end, + }, +} From e68ebd19a2392d9412a525a69d660aab25943433 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 144/240] fix: neo-tree tweak --- lua/plugins/neo-tree.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index 2286417..06390e6 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -12,6 +12,7 @@ return { local nt = require("neo-tree") nt.setup({ + open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, enable_normal_mode_for_inputs = true, filesystem = { filtered_items = { From 85d97efcf5b88864dc39481859576265781d7a37 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 145/240] feat: add folding options --- lua/options.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lua/options.lua b/lua/options.lua index 6fbe25e..68e05f4 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -29,3 +29,16 @@ vim.opt.cmdheight = 2 vim.opt.hlsearch = false vim.opt.incsearch = true + +vim.opt.fillchars = { + foldopen = "", + foldclose = "", + -- fold = "⸱", + fold = " ", + foldsep = " ", + diff = "╱", + eob = " ", +} + +vim.opt.foldlevel = 99 +vim.opt.foldmethod = "indent" From 199f4c7d57ce3598159d7991b8dc9bf6ffa6edc6 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 146/240] feat: add `jk` binding to exit insert mode --- lua/keybinds.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index ca9d9ea..c875b40 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -16,3 +16,5 @@ vim.keymap.set("v", "y", "\"*y", { desc = "Yank into system clipboard" } vim.keymap.set("n", "s", [[:%s/\<\>//gI]], { desc = "Like `ciw` for any highlighted text (doesn't have to be word)" }) + +vim.keymap.set("i", "jk", "", { desc = "Exit insert mode" }) From b826f57ef14227ffe2c1c05d0ec5099130d08cc1 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 147/240] feat: add some new language servers --- lua/plugins/lsp-config.lua | 8 ++++---- lua/plugins/treesitter.lua | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lua/plugins/lsp-config.lua b/lua/plugins/lsp-config.lua index a0b1eed..6a45483 100644 --- a/lua/plugins/lsp-config.lua +++ b/lua/plugins/lsp-config.lua @@ -9,7 +9,7 @@ return { "williamboman/mason-lspconfig.nvim", config = function() require("mason-lspconfig").setup({ - ensure_installed = { "lua_ls", "tsserver" } + ensure_installed = { "lua_ls", "tsserver", "html" } }) end }, @@ -24,7 +24,7 @@ return { }) lspconfig.tsserver.setup({ - capabilities = capabilities + capabilities = capabilities, }) vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = "Go to definition" }) @@ -41,6 +41,7 @@ return { mason_tool_installer.setup({ ensure_installed = { + "djlint", "prettierd", "eslint_d", }, @@ -60,12 +61,11 @@ return { yaml = { "prettierd" }, typescript = { "eslint_d" }, typescriptreact = { "eslint_d" }, - html = { "prettierd" }, + html = { "djlint" }, ejs = { "prettierd" }, css = { "prettierd" }, scss = { "prettierd" }, graphql = { "prettierd" }, - markdown = { "prettierd" }, ["_"] = { "trim_whitespace" }, }, format_on_save = { diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 81c7fae..b632f9d 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -5,7 +5,7 @@ return { config = function() local config = require("nvim-treesitter.configs") config.setup({ - ensure_installed = { "lua", "javascript", "typescript", "tsx" }, + ensure_installed = { "lua", "javascript", "typescript", "tsx", "htmldjango", "html", "jsonc", "json", "jsdoc", "markdown", "markdown_inline", "vim", "vimdoc" }, sync_install = false, highlight = { enable = true }, indent = { enable = true } From 05d0a51db3e51dbd8a357a693c0a208055b91559 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 148/240] feat: add some nice autocmds --- lua/autocmds.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lua/autocmds.lua b/lua/autocmds.lua index 2aee9f5..c22d83d 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -1,7 +1,21 @@ +local function augroup(name) + return vim.api.nvim_create_augroup("wf_" .. name, { clear = true }) +end + vim.api.nvim_create_autocmd({ "FileType" }, { + group = augroup("spellcheck"), pattern = { "gitcommit", "markdown", "md", "mdx" }, callback = function() vim.opt_local.spell = true vim.opt_local.wrap = true end }) + +vim.api.nvim_create_autocmd({ "FileType" }, { + group = augroup("close_with_q"), + pattern = { "fugitive", "git", "gitcommit" }, + callback = function(event) + vim.bo[event.buf].buflisted = false + vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) + end +}) From cf5ca5ae36735c0800ab8bc51e2874d65dbcfdc1 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 149/240] feat: update plugins --- lazy-lock.json | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 897034e..89256fb 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,33 +1,33 @@ { - "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" }, - "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "conform.nvim": { "branch": "master", "commit": "75e7c5c7eb5fbd53f8b12dc420b31ec70770b231" }, + "conform.nvim": { "branch": "master", "commit": "4588008a7c5b57fbff97fdfb529c059235cdc7ee" }, "hardtime.nvim": { "branch": "main", "commit": "4ba3be553fa0b713c7b817f6d201b07d282accf3" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74" }, - "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "2b3d247fce06f53934174f5dfe0362c42d65c00c" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mini.indentscope": { "branch": "main", "commit": "ca129b71edb672d30b8d7ec3138106db1b1f6a8b" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "e578fe7a5832421b0d2c5b3c0a7a1e40e0f6a47a" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, - "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, - "nvim-lint": { "branch": "master", "commit": "8df53b5dde8ea80f0a039775777eae6648a10229" }, - "nvim-lspconfig": { "branch": "master", "commit": "796394fd19fb878e8dbc4fd1e9c9c186ed07a5f4" }, - "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" }, - "nvim-treesitter-context": { "branch": "master", "commit": "400a99ad43ac78af1148061da3491cba2637ad29" }, - "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" }, - "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, + "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "nvim-lint": { "branch": "master", "commit": "76af3422e3c82ea40adf9ade1ccf1dc1eb361789" }, + "nvim-lspconfig": { "branch": "master", "commit": "9a6279953c82d01b58825a46ede032ab246a5983" }, + "nvim-treesitter": { "branch": "master", "commit": "a536ecad5744d03e6a56f63d635c35ceea3207c0" }, + "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, + "nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" }, + "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, - "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" }, + "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, + "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" }, - "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, + "vim-commentary": { "branch": "master", "commit": "f67e3e67ea516755005e6cccb178bc8439c6d402" }, + "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file From e81ecb04ce0b5c681b60bffd1f82fd07c3d61a52 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 150/240] chore: update plugins --- lazy-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 89256fb..6294870 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,12 +2,12 @@ "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "conform.nvim": { "branch": "master", "commit": "4588008a7c5b57fbff97fdfb529c059235cdc7ee" }, - "hardtime.nvim": { "branch": "main", "commit": "4ba3be553fa0b713c7b817f6d201b07d282accf3" }, + "conform.nvim": { "branch": "master", "commit": "c0e0e80f0c233cb3a249f719a44324c660163a3f" }, + "hardtime.nvim": { "branch": "main", "commit": "860e912895176112868c97b46277f547e149f5e6" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "2b3d247fce06f53934174f5dfe0362c42d65c00c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mini.indentscope": { "branch": "main", "commit": "ca129b71edb672d30b8d7ec3138106db1b1f6a8b" }, @@ -15,11 +15,11 @@ "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, - "nvim-lint": { "branch": "master", "commit": "76af3422e3c82ea40adf9ade1ccf1dc1eb361789" }, - "nvim-lspconfig": { "branch": "master", "commit": "9a6279953c82d01b58825a46ede032ab246a5983" }, - "nvim-treesitter": { "branch": "master", "commit": "a536ecad5744d03e6a56f63d635c35ceea3207c0" }, + "nvim-lint": { "branch": "master", "commit": "966ab3dc37eee3e413692264b44a3011b05a6060" }, + "nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" }, + "nvim-treesitter": { "branch": "master", "commit": "b444afa1dacd3d031c0ffe4763671d89afda5ddb" }, "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, - "nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" }, + "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, From 65317fb676c5d1faaaf7054698e405cb910c3005 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 151/240] fix: remove autocmd for quit on q This was causing issues with fugitive and committing changes via git. --- lua/autocmds.lua | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lua/autocmds.lua b/lua/autocmds.lua index c22d83d..df5c406 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -1,21 +1,21 @@ local function augroup(name) - return vim.api.nvim_create_augroup("wf_" .. name, { clear = true }) + return vim.api.nvim_create_augroup("wf_" .. name, { clear = true }) end vim.api.nvim_create_autocmd({ "FileType" }, { - group = augroup("spellcheck"), - pattern = { "gitcommit", "markdown", "md", "mdx" }, - callback = function() - vim.opt_local.spell = true - vim.opt_local.wrap = true - end + group = augroup("spellcheck"), + pattern = { "gitcommit", "markdown", "md", "mdx" }, + callback = function() + vim.opt_local.spell = true + vim.opt_local.wrap = true + end, }) -vim.api.nvim_create_autocmd({ "FileType" }, { - group = augroup("close_with_q"), - pattern = { "fugitive", "git", "gitcommit" }, - callback = function(event) - vim.bo[event.buf].buflisted = false - vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) - end -}) +-- vim.api.nvim_create_autocmd({ "FileType" }, { +-- group = augroup("close_with_q"), +-- pattern = { "fugitive", "git", "gitcommit" }, +-- callback = function(event) +-- vim.bo[event.buf].buflisted = false +-- vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) +-- end +-- }) From 7e90269bc185862e06768a77d97eabdf29c62797 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 152/240] feat: update neo-tree config --- lazy-lock.json | 50 +++++++++++------------ lua/plugins/neo-tree.lua | 88 ++++++++++++++++++++++------------------ 2 files changed, 73 insertions(+), 65 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 6294870..06761ad 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,33 +1,33 @@ { - "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, - "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, + "LuaSnip": { "branch": "master", "commit": "79cc25c39878401d4e8b6ec42fcf14639426bafc" }, + "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "conform.nvim": { "branch": "master", "commit": "c0e0e80f0c233cb3a249f719a44324c660163a3f" }, - "hardtime.nvim": { "branch": "main", "commit": "860e912895176112868c97b46277f547e149f5e6" }, - "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, - "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, - "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4" }, - "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mini.indentscope": { "branch": "main", "commit": "ca129b71edb672d30b8d7ec3138106db1b1f6a8b" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "e578fe7a5832421b0d2c5b3c0a7a1e40e0f6a47a" }, - "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, - "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, - "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, - "nvim-lint": { "branch": "master", "commit": "966ab3dc37eee3e413692264b44a3011b05a6060" }, - "nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" }, - "nvim-treesitter": { "branch": "master", "commit": "b444afa1dacd3d031c0ffe4763671d89afda5ddb" }, - "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, - "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" }, - "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, + "conform.nvim": { "branch": "master", "commit": "9d5ba06d6ee7418c674f498634617416d15b6239" }, + "hardtime.nvim": { "branch": "main", "commit": "21b0f9146198bb43fbc9f5ec66c8af3234f278ed" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, + "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, + "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" }, + "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, + "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "16d1b194376bf1fc2acd89ccb3c29ba8315bfcea" }, + "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, + "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, + "nvim-cmp": { "branch": "main", "commit": "2fb2a3cf78bbc1b0bea030e8c8728985af1cf302" }, + "nvim-lint": { "branch": "master", "commit": "6670b3ac73fa4caf720f017b91c619e9424d955e" }, + "nvim-lspconfig": { "branch": "master", "commit": "f4619ab31fc4676001ea05ae8200846e6e7700c7" }, + "nvim-treesitter": { "branch": "master", "commit": "30492e7e1c9e5af3642e8a74c2f88dc1f50ec305" }, + "nvim-treesitter-context": { "branch": "master", "commit": "f19766163c18515fb4d3c12d572bf9cba6cdb990" }, + "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" }, + "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, - "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" }, - "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, + "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, + "tokyonight.nvim": { "branch": "main", "commit": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5" }, + "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, "vim-commentary": { "branch": "master", "commit": "f67e3e67ea516755005e6cccb178bc8439c6d402" }, - "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" }, + "vim-fugitive": { "branch": "master", "commit": "c0b03f1cac242d96837326d300f42a660306fc1a" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index 06390e6..08755e1 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -1,44 +1,52 @@ return { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", - }, - config = function() - vim.keymap.set("n", "nn", ":Neotree toggle", { desc = "Toggle Neotree" }) + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + config = function() + vim.keymap.set("n", "nn", ":Neotree toggle", { desc = "Toggle Neotree" }) - local nt = require("neo-tree") + local nt = require("neo-tree") - nt.setup({ - open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, - enable_normal_mode_for_inputs = true, - filesystem = { - filtered_items = { - show_hidden_count = false, - hide_dotfiles = false, - hide_gitignored = true, - always_show = { - ".env" - }, - never_show = { - ".git", - "thumbs.db", - ".DS_Store" - } - }, - }, - window = { - mappings = { - ["m"] = { - "move", - config = { - show_path = "relative" - } - }, - } - } - }) - end + nt.setup({ + open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, + filesystem = { + filtered_items = { + show_hidden_count = false, + hide_dotfiles = false, + hide_gitignored = true, + always_show = { + ".env", + }, + never_show = { + ".git", + "thumbs.db", + ".DS_Store", + }, + }, + }, + window = { + mappings = { + ["m"] = { + "move", + config = { + show_path = "relative", + }, + }, + }, + }, + event_handlers = { + { + event = "neo_tree_popup_input_ready", + handler = function() + -- Switch to normal inside popups by default. + vim.cmd.stopinsert() + end, + }, + }, + }) + end, } From f6c40eee0d7c109189e40d9923a486e4ad1baf4d Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 153/240] feat: ignore hardtime inside markdown --- lua/plugins/hardtime.lua | 49 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/lua/plugins/hardtime.lua b/lua/plugins/hardtime.lua index 2848a46..895467b 100644 --- a/lua/plugins/hardtime.lua +++ b/lua/plugins/hardtime.lua @@ -1,26 +1,27 @@ return { - "m4xshen/hardtime.nvim", - dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, - opts = { - disable_mouse = true, - disabled_keys = { - -- Drill Sergeant Demchuk! - [""] = { "", "i" }, - [""] = { "", "i" }, - [""] = { "", "i" }, - [""] = { "", "i" } - }, - disabled_filetypes = { - "checkhealth", - "fugitive", - "help", - "lazy", - "mason", - "neo-tree", - "neo-tree-popup", - "netrw", - "noice", - "notify", - } - } + "m4xshen/hardtime.nvim", + dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, + opts = { + disable_mouse = true, + disabled_keys = { + -- Drill Sergeant Demchuk! + [""] = { "", "i" }, + [""] = { "", "i" }, + [""] = { "", "i" }, + [""] = { "", "i" }, + }, + disabled_filetypes = { + "checkhealth", + "fugitive", + "help", + "lazy", + "mason", + "markdown", + "neo-tree", + "neo-tree-popup", + "netrw", + "noice", + "notify", + }, + }, } From 7cd496befd089b02a3492f0bdcace5a91c74b66f Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 154/240] feat: add djlint to html files --- lua/plugins/lint.lua | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/lua/plugins/lint.lua b/lua/plugins/lint.lua index 03b7cbb..23774e8 100644 --- a/lua/plugins/lint.lua +++ b/lua/plugins/lint.lua @@ -1,26 +1,27 @@ return { - "mfussenegger/nvim-lint", - event = { - "BufReadPre", - "BufNewFile", - }, - config = function() - local lint = require("lint") + "mfussenegger/nvim-lint", + event = { + "BufReadPre", + "BufNewFile", + }, + config = function() + local lint = require("lint") - lint.linters_by_ft = { - javascript = { "eslint_d" }, - typescript = { "eslint_d" }, - javascriptreact = { "eslint_d" }, - typescriptreact = { "eslint_d" }, - } + lint.linters_by_ft = { + html = { "djlint" }, + javascript = { "eslint_d" }, + typescript = { "eslint_d" }, + javascriptreact = { "eslint_d" }, + typescriptreact = { "eslint_d" }, + } - local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) + local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) - vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { - group = lint_augroup, - callback = function() - lint.try_lint() - end - }) - end + vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { + group = lint_augroup, + callback = function() + lint.try_lint() + end, + }) + end, } From fa60a3678ea606b7af0e4a36d7f7204e494edbf8 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 155/240] feat: re-enable quit by q for certain filetypes --- lua/autocmds.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lua/autocmds.lua b/lua/autocmds.lua index df5c406..a60cb91 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -11,11 +11,11 @@ vim.api.nvim_create_autocmd({ "FileType" }, { end, }) --- vim.api.nvim_create_autocmd({ "FileType" }, { --- group = augroup("close_with_q"), --- pattern = { "fugitive", "git", "gitcommit" }, --- callback = function(event) --- vim.bo[event.buf].buflisted = false --- vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) --- end --- }) +vim.api.nvim_create_autocmd({ "FileType" }, { + group = augroup("close_with_q"), + pattern = { "fugitive", "git", "gitcommit" }, + callback = function(event) + vim.bo[event.buf].buflisted = false + vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) + end, +}) From 5d1d86ac237a7e7aed9f9a38cdb8b6cf27f242d8 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 156/240] fix: add missing arg to djlint --- lua/plugins/lint.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lua/plugins/lint.lua b/lua/plugins/lint.lua index 23774e8..42fae39 100644 --- a/lua/plugins/lint.lua +++ b/lua/plugins/lint.lua @@ -7,6 +7,11 @@ return { config = function() local lint = require("lint") + local djlint = lint.linters.djlint + djlint.args = { + "--reformat", + } + lint.linters_by_ft = { html = { "djlint" }, javascript = { "eslint_d" }, From fb09b815f278ad57d69c47babb7b3c5306e82049 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 157/240] fix: disable q to quit certain filetypes --- lua/autocmds.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lua/autocmds.lua b/lua/autocmds.lua index a60cb91..39927ae 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -11,11 +11,11 @@ vim.api.nvim_create_autocmd({ "FileType" }, { end, }) -vim.api.nvim_create_autocmd({ "FileType" }, { - group = augroup("close_with_q"), - pattern = { "fugitive", "git", "gitcommit" }, - callback = function(event) - vim.bo[event.buf].buflisted = false - vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) - end, -}) +-- vim.api.nvim_create_autocmd({ "FileType" }, { +-- group = augroup("close_with_q"), +-- pattern = { "fugitive", "git", "gitcommit" }, +-- callback = function(event) +-- vim.bo[event.buf].buflisted = false +-- vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) +-- end, +-- }) From bf73ba6099886881d9aaaf78410569f7f1c266dd Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 158/240] fix: include qf in hardtime ignore --- lua/plugins/hardtime.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/hardtime.lua b/lua/plugins/hardtime.lua index 895467b..47b18eb 100644 --- a/lua/plugins/hardtime.lua +++ b/lua/plugins/hardtime.lua @@ -22,6 +22,7 @@ return { "netrw", "noice", "notify", + "qf", }, }, } From 20c15285e5e696f883673a76472654b931323897 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 159/240] V2 (#1) Co-authored-by: Devin Haska --- lazy-lock.json | 53 ++++++----- lua/autocmds.lua | 23 ++--- lua/keybinds.lua | 7 +- lua/options.lua | 2 + lua/plugins/alpha-nvim.lua | 43 --------- lua/plugins/coding.lua | 100 ++++++++++++++++++++ lua/plugins/colorscheme.lua | 3 +- lua/plugins/commentary.lua | 3 - lua/plugins/completion.lua | 59 ------------ lua/plugins/editor.lua | 171 ++++++++++++++++++++++++++++++++++ lua/plugins/formatting.lua | 20 ++++ lua/plugins/fugitive.lua | 10 -- lua/plugins/hardtime.lua | 28 ------ lua/plugins/lint.lua | 32 ------- lua/plugins/linting.lua | 26 ++++++ lua/plugins/lsp-config.lua | 76 --------------- lua/plugins/lsp.lua | 60 ++++++++++++ lua/plugins/lualine.lua | 12 --- lua/plugins/neo-tree.lua | 52 ----------- lua/plugins/surround.lua | 3 - lua/plugins/telescope.lua | 36 ------- lua/plugins/todo-comments.lua | 5 - lua/plugins/treesitter.lua | 43 ++++++--- lua/plugins/trouble.lua | 7 -- lua/plugins/ui.lua | 111 ++++++++++++++++++++++ lua/plugins/which-key.lua | 9 -- 26 files changed, 564 insertions(+), 430 deletions(-) delete mode 100644 lua/plugins/alpha-nvim.lua create mode 100644 lua/plugins/coding.lua delete mode 100644 lua/plugins/commentary.lua delete mode 100644 lua/plugins/completion.lua create mode 100644 lua/plugins/editor.lua create mode 100644 lua/plugins/formatting.lua delete mode 100644 lua/plugins/fugitive.lua delete mode 100644 lua/plugins/hardtime.lua delete mode 100644 lua/plugins/lint.lua create mode 100644 lua/plugins/linting.lua delete mode 100644 lua/plugins/lsp-config.lua create mode 100644 lua/plugins/lsp.lua delete mode 100644 lua/plugins/lualine.lua delete mode 100644 lua/plugins/neo-tree.lua delete mode 100644 lua/plugins/surround.lua delete mode 100644 lua/plugins/telescope.lua delete mode 100644 lua/plugins/todo-comments.lua delete mode 100644 lua/plugins/trouble.lua delete mode 100644 lua/plugins/which-key.lua diff --git a/lazy-lock.json b/lazy-lock.json index 06761ad..83c8054 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,33 +1,44 @@ { - "LuaSnip": { "branch": "master", "commit": "79cc25c39878401d4e8b6ec42fcf14639426bafc" }, + "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, + "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, + "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "conform.nvim": { "branch": "master", "commit": "9d5ba06d6ee7418c674f498634617416d15b6239" }, - "hardtime.nvim": { "branch": "main", "commit": "21b0f9146198bb43fbc9f5ec66c8af3234f278ed" }, + "conform.nvim": { "branch": "master", "commit": "12b3995537f52ba2810a9857e8ca256881febbda" }, + "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" }, + "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, + "friendly-snippets": { "branch": "main", "commit": "d5f74ce4dfdd82848f3f4eac65fe6e29ac5df4c2" }, + "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, - "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" }, + "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" }, + "lazygit.nvim": { "branch": "main", "commit": "0ada6c6e7e138df92f5009b6952f4ac41248305a" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "b129892f783740e6cf741f2ea09fa5dd512aa584" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "16d1b194376bf1fc2acd89ccb3c29ba8315bfcea" }, + "mini.comment": { "branch": "main", "commit": "f9f1a646fd3d9df7397aa1b9550a875fe8189eb0" }, + "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" }, + "mini.pairs": { "branch": "main", "commit": "5c975d8f68dc1e11bf4b20ced71e7987ed782513" }, + "mini.surround": { "branch": "main", "commit": "0f528eb2e1bab420c0569d9e52615144c51db920" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, + "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, - "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, - "nvim-cmp": { "branch": "main", "commit": "2fb2a3cf78bbc1b0bea030e8c8728985af1cf302" }, - "nvim-lint": { "branch": "master", "commit": "6670b3ac73fa4caf720f017b91c619e9424d955e" }, - "nvim-lspconfig": { "branch": "master", "commit": "f4619ab31fc4676001ea05ae8200846e6e7700c7" }, - "nvim-treesitter": { "branch": "master", "commit": "30492e7e1c9e5af3642e8a74c2f88dc1f50ec305" }, - "nvim-treesitter-context": { "branch": "master", "commit": "f19766163c18515fb4d3c12d572bf9cba6cdb990" }, - "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" }, - "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, + "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, + "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, + "nvim-lint": { "branch": "master", "commit": "861a04313501563bb1b11f125ae9b7237a517b9b" }, + "nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" }, + "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, + "nvim-spectre": { "branch": "master", "commit": "4651801ba37a9407b7257287aec45b6653ffc5e9" }, + "nvim-treesitter": { "branch": "master", "commit": "b1f3f02027f1fd21956c1e219878764014498a59" }, + "nvim-treesitter-context": { "branch": "master", "commit": "2650e6431f7daba5d9c2c64134fa5eb2312eb3d7" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" }, + "nvim-web-devicons": { "branch": "master", "commit": "794bba734ec95eaff9bb82fbd112473be2087283" }, + "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, - "tokyonight.nvim": { "branch": "main", "commit": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5" }, + "tokyonight.nvim": { "branch": "main", "commit": "67afeaf7fd6ebba000633e89f63c31694057edde" }, "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, - "vim-commentary": { "branch": "master", "commit": "f67e3e67ea516755005e6cccb178bc8439c6d402" }, - "vim-fugitive": { "branch": "master", "commit": "c0b03f1cac242d96837326d300f42a660306fc1a" }, - "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/autocmds.lua b/lua/autocmds.lua index 39927ae..1f6502d 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -1,21 +1,12 @@ local function augroup(name) - return vim.api.nvim_create_augroup("wf_" .. name, { clear = true }) + return vim.api.nvim_create_augroup("wf_" .. name, { clear = true }) end vim.api.nvim_create_autocmd({ "FileType" }, { - group = augroup("spellcheck"), - pattern = { "gitcommit", "markdown", "md", "mdx" }, - callback = function() - vim.opt_local.spell = true - vim.opt_local.wrap = true - end, + group = augroup("spellcheck"), + pattern = { "gitcommit", "markdown", "md", "mdx" }, + callback = function() + vim.opt_local.spell = true + vim.opt_local.wrap = true + end, }) - --- vim.api.nvim_create_autocmd({ "FileType" }, { --- group = augroup("close_with_q"), --- pattern = { "fugitive", "git", "gitcommit" }, --- callback = function(event) --- vim.bo[event.buf].buflisted = false --- vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) --- end, --- }) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index c875b40..5f4a455 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -3,6 +3,10 @@ vim.keymap.set("n", "", "", { desc = "Go to split above" }) vim.keymap.set("n", "", "", { desc = "Go to split below" }) vim.keymap.set("n", "", "", { desc = "Go to split on right" }) +vim.keymap.set("n", "|", "v", { desc = "Split window right" }) +vim.keymap.set("n", "-", "s", { desc = "Split window below" }) +vim.keymap.set("n", "wd", "c", { desc = "Delete window" }) + vim.keymap.set("v", "J", ":m '>+1gv=gv", { desc = "Move lines under cursor up" }) vim.keymap.set("v", "K", ":m '<-2gv=gv", { desc = "Move lines under cursor down" }) @@ -14,7 +18,4 @@ vim.keymap.set("x", "p", "\"_dP", { desc = "Paste without replacing clip vim.keymap.set("n", "y", "\"*y", { desc = "Yank into system clipboard" }) vim.keymap.set("v", "y", "\"*y", { desc = "Yank into system clipboard" }) -vim.keymap.set("n", "s", [[:%s/\<\>//gI]], - { desc = "Like `ciw` for any highlighted text (doesn't have to be word)" }) - vim.keymap.set("i", "jk", "", { desc = "Exit insert mode" }) diff --git a/lua/options.lua b/lua/options.lua index 68e05f4..e08d218 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -42,3 +42,5 @@ vim.opt.fillchars = { vim.opt.foldlevel = 99 vim.opt.foldmethod = "indent" + +vim.opt.termguicolors = true diff --git a/lua/plugins/alpha-nvim.lua b/lua/plugins/alpha-nvim.lua deleted file mode 100644 index b4ee958..0000000 --- a/lua/plugins/alpha-nvim.lua +++ /dev/null @@ -1,43 +0,0 @@ -return { - 'goolord/alpha-nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, - config = function() - local alpha = require("alpha") - local dashboard = require("alpha.themes.dashboard") - - -- https://github.com/MaximilianLloyd/ascii.nvim - dashboard.section.header.val = { - " ", - " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", - " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", - " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", - " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", - " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", - " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", - " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", - " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", - " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", - " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", - " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", - " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", - " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", - " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", - " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", - " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", - " ▄█████████▄▄ ", - " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", - " ▄▄█████▀▀▀▀ ▀■ ", - " ▄███▀▀▀▀ ", - " ■▀▀ ", - " ", - } - - dashboard.section.buttons.val = { - dashboard.button("e", " > New File", "ene"), - dashboard.button("SPC ee", " > File explorer", "Neotree"), - dashboard.button("q", " > Quit", "qa"), - } - - alpha.setup(dashboard.opts) - end -}; diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua new file mode 100644 index 0000000..5ec6181 --- /dev/null +++ b/lua/plugins/coding.lua @@ -0,0 +1,100 @@ +return { + { + "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", + }, + + 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 = "luasnip" }, + }, { + { name = "buffer" }, + }), + }) + end, + }, + { + "L3MON4D3/LuaSnip", + dependencies = { "rafamadriz/friendly-snippets" }, + }, + { + "echasnovski/mini.pairs", + version = false, + opts = { + mappings = { + ["`"] = { action = "closeopen", pair = "``", neigh_pattern = "[^\\`].", register = { cr = false } }, + }, + }, + }, + { + "echasnovski/mini.surround", + version = false, + opts = { + mappings = { + add = "gsa", -- Add surrounding in Normal and Visual modes + delete = "gsd", -- Delete surrounding + find = "gsf", -- Find surrounding (to the right) + find_left = "gsF", -- Find surrounding (to the left) + highlight = "gsh", -- Highlight surrounding + replace = "gsr", -- Replace surrounding + update_n_lines = "gsn", -- Update `n_lines` + }, + }, + }, + { + "JoosepAlviste/nvim-ts-context-commentstring", + opts = { + enable_autocmd = false, + }, + }, + { + "echasnovski/mini.comment", + version = false, + opts = { + options = { + custom_commentstring = function() + return require("ts_context_commentstring.internal").calculate_commentstring() + or vim.bo.commentstring + end, + }, + }, + }, +} diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 890c312..cde1558 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -2,7 +2,8 @@ return { "folke/tokyonight.nvim", lazy = true, opts = { + style = "storm", transparent = true, dim_inactive = true, - } + }, } diff --git a/lua/plugins/commentary.lua b/lua/plugins/commentary.lua deleted file mode 100644 index 4e85c75..0000000 --- a/lua/plugins/commentary.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "tpope/vim-commentary" -} diff --git a/lua/plugins/completion.lua b/lua/plugins/completion.lua deleted file mode 100644 index 6696501..0000000 --- a/lua/plugins/completion.lua +++ /dev/null @@ -1,59 +0,0 @@ -return { - { - "hrsh7th/nvim-cmp", - config = function() - local cmp = require("cmp") - - cmp.setup({ - -- Highlights the first result always - completion = { - completeopt = "menu,menuone,noinsert" - }, - - 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({ - behaviour = cmp.ConfirmBehavior.Insert, - select = true - }) - }), - - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end - }, - - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "luasnip" } - }, { - { name = "buffer" } - }) - }) - end - }, - { - "hrsh7th/cmp-nvim-lsp" - }, - { - "L3MON4D3/LuaSnip" - } -} diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua new file mode 100644 index 0000000..cb91684 --- /dev/null +++ b/lua/plugins/editor.lua @@ -0,0 +1,171 @@ +return { + { + "nvim-neo-tree/neo-tree.nvim", + event = "VeryLazy", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + config = function() + vim.keymap.set("n", "ee", ":Neotree toggle", { desc = "Toggle Neotree" }) + vim.keymap.set("n", "er", ":Neotree reveal", { desc = "Reveal file" }) + + local nt = require("neo-tree") + + nt.setup({ + open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, + filesystem = { + filtered_items = { + show_hidden_count = false, + hide_dotfiles = false, + hide_gitignored = true, + always_show = { + ".env", + ".env.local", + }, + never_show = { + ".git", + "thumbs.db", + ".DS_Store", + }, + }, + }, + window = { + mappings = { + ["m"] = { + "move", + config = { + show_path = "relative", + }, + }, + }, + }, + event_handlers = { + { + event = "neo_tree_popup_input_ready", + handler = function() + -- Switch to normal inside popups by default. + vim.cmd.stopinsert() + end, + }, + }, + }) + end, + }, + { + "folke/which-key.nvim", + event = "VeryLazy", + init = function() + vim.o.timeout = true + vim.o.timeoutlen = 300 + end, + opts = {}, + }, + { + "folke/trouble.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + vim.keymap.set("n", "tt", ":TroubleToggle", { desc = "Toggle Trouble" }) + end, + }, + { + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = {}, + }, + { + "nvim-pack/nvim-spectre", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = { open_cmd = "noswapfile vnew" }, + keys = { + { + "sr", + function() + require("spectre").open() + end, + desc = "Replace in Files (Spectre)", + }, + }, + }, + { + "nvim-telescope/telescope.nvim", + tag = "0.1.5", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + local builtin = require("telescope.builtin") + + vim.keymap.set("n", "ff", builtin.git_files, { desc = "Search git_files" }) + vim.keymap.set("n", "fg", builtin.live_grep, { desc = "Grep git_files" }) + vim.keymap.set("n", "fh", builtin.help_tags, { desc = "View help tags" }) + vim.keymap.set("n", "fb", builtin.buffers, { desc = "Search buffers" }) + vim.keymap.set("n", "sk", builtin.keymaps, { desc = "View keymaps" }) + vim.keymap.set("n", "sR", builtin.resume, { desc = "Resume" }) + vim.keymap.set("n", "st", "TodoTelescope", { desc = "Search TODOs" }) + end, + }, + { + "nvim-telescope/telescope-ui-select.nvim", + config = function() + require("telescope").setup({ + defaults = { + initial_mode = "normal", + }, + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown({}), + }, + }, + }) + + require("telescope").load_extension("ui-select") + end, + }, + { + "folke/flash.nvim", + event = "VeryLazy", + ---@type Flash.Config + 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" }, + }, + }, + { + "kdheepak/lazygit.nvim", + event = "VeryLazy", + cmd = { + "LazyGit", + "LazyGitConfig", + "LazyGitCurrentFile", + "LazyGitFilter", + "LazyGitFilterCurrentFile", + }, + -- optional for floating window border decoration + dependencies = { + "nvim-lua/plenary.nvim", + }, + keys = { + { "gg", "LazyGit", desc = "LazyGit" } + } + }, + { + "lewis6991/gitsigns.nvim", + event = "VeryLazy", + opts = { + signs = { + add = { text = "▎" }, + change = { text = "▎" }, + delete = { text = "" }, + topdelete = { text = "" }, + changedelete = { text = "▎" }, + untracked = { text = "▎" }, + }, + } + } +} diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua new file mode 100644 index 0000000..ef27e71 --- /dev/null +++ b/lua/plugins/formatting.lua @@ -0,0 +1,20 @@ +return { + "stevearc/conform.nvim", + opts = { + formatters_by_ft = { + css = { "prettierd" }, + scss = { "prettierd" }, + html = { "djlint" }, + lua = { "stylelua" }, + javascript = { "eslint_d", "prettierd" }, + javascriptreact = { "eslint_d", "prettierd" }, + json = { "prettierd" }, + jsonc = { "prettierd" }, + typescript = { "eslint_d", "prettierd" }, + typescriptreact = { "eslint_d", "prettierd" }, + }, + format_on_save = { + lsp_fallback = true, + }, + }, +} diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua deleted file mode 100644 index 1a989fb..0000000 --- a/lua/plugins/fugitive.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - "tpope/vim-fugitive", - config = function() - vim.keymap.set("n", "gs", vim.cmd.Git, { desc = "View `git status`" }) - vim.keymap.set("n", "gh", "diffget //2", { desc = "Pick gitdiff on left" }) - vim.keymap.set("n", "gl", "diffget //3", { desc = "Pick gitdiff on right" }) - vim.keymap.set("n", "gp", ":Git push", { desc = "Run `git push`" }) - vim.keymap.set("n", "gc", ":Git checkout ", { desc = "Git checkout" }) - end -} diff --git a/lua/plugins/hardtime.lua b/lua/plugins/hardtime.lua deleted file mode 100644 index 47b18eb..0000000 --- a/lua/plugins/hardtime.lua +++ /dev/null @@ -1,28 +0,0 @@ -return { - "m4xshen/hardtime.nvim", - dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, - opts = { - disable_mouse = true, - disabled_keys = { - -- Drill Sergeant Demchuk! - [""] = { "", "i" }, - [""] = { "", "i" }, - [""] = { "", "i" }, - [""] = { "", "i" }, - }, - disabled_filetypes = { - "checkhealth", - "fugitive", - "help", - "lazy", - "mason", - "markdown", - "neo-tree", - "neo-tree-popup", - "netrw", - "noice", - "notify", - "qf", - }, - }, -} diff --git a/lua/plugins/lint.lua b/lua/plugins/lint.lua deleted file mode 100644 index 42fae39..0000000 --- a/lua/plugins/lint.lua +++ /dev/null @@ -1,32 +0,0 @@ -return { - "mfussenegger/nvim-lint", - event = { - "BufReadPre", - "BufNewFile", - }, - config = function() - local lint = require("lint") - - local djlint = lint.linters.djlint - djlint.args = { - "--reformat", - } - - lint.linters_by_ft = { - html = { "djlint" }, - javascript = { "eslint_d" }, - typescript = { "eslint_d" }, - javascriptreact = { "eslint_d" }, - typescriptreact = { "eslint_d" }, - } - - local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) - - vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { - group = lint_augroup, - callback = function() - lint.try_lint() - end, - }) - end, -} diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua new file mode 100644 index 0000000..995389c --- /dev/null +++ b/lua/plugins/linting.lua @@ -0,0 +1,26 @@ +return { + "mfussenegger/nvim-lint", + opts = { + events = { "BufWritePost", "BufReadPost", "InsertLeave" }, + linters_by_ft = { + html = { "djlint" }, + javascript = { "eslint_d" }, + typescript = { "eslint_d" }, + javascriptreact = { "eslint_d" }, + typescriptreact = { "eslint_d" }, + }, + }, + config = function(_, opts) + local lint = require("lint") + lint.linters_by_ft = opts.linters_by_ft + + local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) + + vim.api.nvim_create_autocmd(opts.events, { + group = lint_augroup, + callback = function() + lint.try_lint() + end, + }) + end, +} diff --git a/lua/plugins/lsp-config.lua b/lua/plugins/lsp-config.lua deleted file mode 100644 index 6a45483..0000000 --- a/lua/plugins/lsp-config.lua +++ /dev/null @@ -1,76 +0,0 @@ -return { - { - "williamboman/mason.nvim", - config = function() - require("mason").setup() - end - }, - { - "williamboman/mason-lspconfig.nvim", - config = function() - require("mason-lspconfig").setup({ - ensure_installed = { "lua_ls", "tsserver", "html" } - }) - end - }, - { - "neovim/nvim-lspconfig", - config = function() - local lspconfig = require("lspconfig") - local capabilities = require("cmp_nvim_lsp").default_capabilities() - - lspconfig.lua_ls.setup({ - capabilities = capabilities - }) - - lspconfig.tsserver.setup({ - capabilities = capabilities, - }) - - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = "Go to definition" }) - vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { desc = "Go to implementation" }) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, { desc = "Show signature" }) - vim.keymap.set('n', 'f', vim.lsp.buf.format, { desc = "Format buffer" }) - vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, { desc = "View code actions" }) - end - }, - { - "WhoIsSethDaniel/mason-tool-installer.nvim", - config = function() - local mason_tool_installer = require("mason-tool-installer") - - mason_tool_installer.setup({ - ensure_installed = { - "djlint", - "prettierd", - "eslint_d", - }, - automatic_installation = true - }) - end - }, - { - "stevearc/conform.nvim", - opts = { - formatters_by_ft = { - lua = { "stylua" }, - javascript = { "eslint_d" }, - javascriptreact = { "eslint_d" }, - json = { "prettierd" }, - jsonc = { "prettierd" }, - yaml = { "prettierd" }, - typescript = { "eslint_d" }, - typescriptreact = { "eslint_d" }, - html = { "djlint" }, - ejs = { "prettierd" }, - css = { "prettierd" }, - scss = { "prettierd" }, - graphql = { "prettierd" }, - ["_"] = { "trim_whitespace" }, - }, - format_on_save = { - lsp_fallback = true, - }, - }, - } -} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua new file mode 100644 index 0000000..860226c --- /dev/null +++ b/lua/plugins/lsp.lua @@ -0,0 +1,60 @@ +return { + { + "williamboman/mason.nvim", + opts = {}, + }, + { + "williamboman/mason-lspconfig.nvim", + opts = { + ensure_installed = { + "lua_ls", + "tsserver", + "html", + } + } + }, + { + "WhoIsSethDaniel/mason-tool-installer.nvim", + opts = { + ensure_installed = { + "djlint", + "eslint", + "eslint_d", + "prettierd", + "stylua", + }, + automatic_installation = true, + } + }, + -- lspconfig should be the last step. + { + "neovim/nvim-lspconfig", + event = "VeryLazy", + dependencies = { + "mason.nvim", + "williamboman/mason-lspconfig.nvim", + }, + opts = { + servers = { + tsserver = {}, + lua_ls = {}, + } + }, + config = function(_, opts) + local lspconfig = require("lspconfig") + + local servers = opts.servers + + for server, server_opts in pairs(servers) do + lspconfig[server].setup(server_opts) + end + + vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "Go to definition" }) + vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { desc = "Go to implementation" }) + vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "Show signature" }) + vim.keymap.set("n", "f", vim.lsp.buf.format, { desc = "Format buffer" }) + vim.keymap.set("n", "ca", vim.lsp.buf.code_action, { desc = "View code actions" }) + vim.keymap.set("n", "cr", vim.lsp.buf.rename, { desc = "Rename" }) + end, + }, +} diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua deleted file mode 100644 index b368357..0000000 --- a/lua/plugins/lualine.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, - config = function() - require('lualine').setup({ - options = { - icons_enabled = true, - theme = 'tokyonight' - } - }) - end -} diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua deleted file mode 100644 index 08755e1..0000000 --- a/lua/plugins/neo-tree.lua +++ /dev/null @@ -1,52 +0,0 @@ -return { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", - }, - config = function() - vim.keymap.set("n", "nn", ":Neotree toggle", { desc = "Toggle Neotree" }) - - local nt = require("neo-tree") - - nt.setup({ - open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, - filesystem = { - filtered_items = { - show_hidden_count = false, - hide_dotfiles = false, - hide_gitignored = true, - always_show = { - ".env", - }, - never_show = { - ".git", - "thumbs.db", - ".DS_Store", - }, - }, - }, - window = { - mappings = { - ["m"] = { - "move", - config = { - show_path = "relative", - }, - }, - }, - }, - event_handlers = { - { - event = "neo_tree_popup_input_ready", - handler = function() - -- Switch to normal inside popups by default. - vim.cmd.stopinsert() - end, - }, - }, - }) - end, -} diff --git a/lua/plugins/surround.lua b/lua/plugins/surround.lua deleted file mode 100644 index b5dd6ff..0000000 --- a/lua/plugins/surround.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "tpope/vim-surround" -} diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua deleted file mode 100644 index 51e53fb..0000000 --- a/lua/plugins/telescope.lua +++ /dev/null @@ -1,36 +0,0 @@ -return { - { - 'nvim-telescope/telescope.nvim', - tag = '0.1.5', - dependencies = { 'nvim-lua/plenary.nvim' }, - config = function() - local builtin = require('telescope.builtin') - - vim.keymap.set('n', 'pp', builtin.git_files, { desc = "Search git_files" }) - vim.keymap.set('n', 'pf', builtin.find_files, { desc = "Search all files " }) - vim.keymap.set('n', 'fh', builtin.help_tags, { desc = "View help tags" }) - vim.keymap.set('n', 'gc', builtin.git_branches, { desc = "Checkout git branches" }) - vim.keymap.set('n', 'ps', function() - builtin.grep_string({ search = vim.fn.input("Grep > ") }) - end, { desc = "Grep entire project for string" }) - vim.keymap.set('n', 'b', builtin.buffers, { desc = "Search buffers" }) - end - }, - { - "nvim-telescope/telescope-ui-select.nvim", - config = function() - require("telescope").setup { - defaults = { - initial_mode = "normal" - }, - extensions = { - ["ui-select"] = { - require("telescope.themes").get_dropdown {} - } - } - } - - require("telescope").load_extension("ui-select") - end - } -} diff --git a/lua/plugins/todo-comments.lua b/lua/plugins/todo-comments.lua deleted file mode 100644 index 2ca05d6..0000000 --- a/lua/plugins/todo-comments.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "folke/todo-comments.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, - opts = {}, -} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index b632f9d..85cf8f5 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -1,26 +1,41 @@ return { { "nvim-treesitter/nvim-treesitter", + version = false, build = ":TSUpdate", - config = function() - local config = require("nvim-treesitter.configs") - config.setup({ - ensure_installed = { "lua", "javascript", "typescript", "tsx", "htmldjango", "html", "jsonc", "json", "jsdoc", "markdown", "markdown_inline", "vim", "vimdoc" }, - sync_install = false, - highlight = { enable = true }, - indent = { enable = true } - }) - end + opts = { + ensure_installed = { + "lua", + "javascript", + "typescript", + "tsx", + "htmldjango", + "html", + "jsonc", + "json", + "jsdoc", + "markdown", + "markdown_inline", + "vim", + "vimdoc", + }, + highlight = { enable = true }, + indent = { enable = true }, + }, + config = function(_, opts) + require("nvim-treesitter.configs").setup(opts) + end, }, { "nvim-treesitter/nvim-treesitter-context", opts = { max_lines = 2, - } + }, }, { - 'windwp/nvim-autopairs', - event = "InsertEnter", - opts = {} - } + -- TODO: Figure out why this plugin is not working. + "windwp/nvim-autopairs", + event = "VeryLazy", + opts = {}, + }, } diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua deleted file mode 100644 index 4745503..0000000 --- a/lua/plugins/trouble.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - "folke/trouble.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - vim.keymap.set("n", "tt", ":TroubleToggle", { desc = "Toggle Trouble" }) - end -} diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 9aa07d6..467aeb7 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,4 +1,48 @@ return { + { + "nvim-lualine/lualine.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + opts = { + options = { + icons_enabled = true, + theme = "tokyonight", + disabled_filetypes = { + statusline = { + "alpha", + "neo-tree", + } + } + } + }, + }, + { + "famiu/bufdelete.nvim", + keys = { + { "bd", "Bdelete", desc = "Close Buffer" }, + }, + }, + { + "akinsho/bufferline.nvim", + event = "VeryLazy", + keys = { + { "bp", "BufferLineTogglePin", desc = "Toggle Pin" }, + { "[b", "BufferLineCyclePrev", desc = "Prev Buffer" }, + { "]b", "BufferLineCycleNext", desc = "Next Buffer" }, + }, + opts = { + options = { + diagnostics = "nvim_lsp", + offsets = { + { + filetype = "neo-tree", + text = "Neo-tree", + highlight = "Directory", + text_align = "left", + }, + }, + } + } + }, { "lukas-reineke/indent-blankline.nvim", opts = { @@ -52,4 +96,71 @@ return { }) end, }, + { + "stevearc/dressing.nvim", + event = "VeryLazy", + opts = {} + }, + { + "rcarriga/nvim-notify", + opts = { + timeout = 2000, + stages = "static", + } + }, + { + "MunifTanjim/nui.nvim" + }, + { + "folke/noice.nvim", + event = "VeryLazy", + opts = {}, + dependencies = { + "MunifTanjim/nui.nvim", + "rcarriga/nvim-notify", + } + }, + { + "goolord/alpha-nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + local alpha = require("alpha") + local dashboard = require("alpha.themes.dashboard") + + -- https://github.com/MaximilianLloyd/ascii.nvim + dashboard.section.header.val = { + " ", + " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", + " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", + " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", + " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", + " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", + " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", + " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", + " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", + " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", + " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", + " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", + " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", + " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", + " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", + " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", + " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", + " ▄█████████▄▄ ", + " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", + " ▄▄█████▀▀▀▀ ▀■ ", + " ▄███▀▀▀▀ ", + " ■▀▀ ", + " ", + } + + dashboard.section.buttons.val = { + dashboard.button("e", " > New File", "ene"), + dashboard.button("SPC ee", " > File explorer", "Neotree"), + dashboard.button("q", " > Quit", "qa"), + } + + alpha.setup(dashboard.opts) + end, + } } diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua deleted file mode 100644 index 410f8db..0000000 --- a/lua/plugins/which-key.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "folke/which-key.nvim", - event = "VeryLazy", - init = function() - vim.o.timeout = true - vim.o.timeoutlen = 300 - end, - opts = {} -} From b49508f7b9f42147ed53e8d5fbfeaf1c3a8991e0 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 160/240] feat: update colorscheme to catppuccin --- init.lua | 2 +- lazy-lock.json | 71 +++++++++++++++++++------------------ lua/plugins/colorscheme.lua | 50 ++++++++++++++++++++++---- lua/plugins/ui.lua | 13 ++++--- 4 files changed, 89 insertions(+), 47 deletions(-) diff --git a/init.lua b/init.lua index b6c32bd..242952b 100644 --- a/init.lua +++ b/init.lua @@ -33,4 +33,4 @@ require("lazy").setup("plugins") require("keybinds") require("autocmds") -vim.cmd.colorscheme("tokyonight") +vim.cmd.colorscheme("catppuccin") diff --git a/lazy-lock.json b/lazy-lock.json index 83c8054..797979b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,44 +1,45 @@ { - "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" }, + "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, - "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" }, + "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, + "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "conform.nvim": { "branch": "master", "commit": "12b3995537f52ba2810a9857e8ca256881febbda" }, - "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" }, - "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, - "friendly-snippets": { "branch": "main", "commit": "d5f74ce4dfdd82848f3f4eac65fe6e29ac5df4c2" }, - "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" }, - "lazygit.nvim": { "branch": "main", "commit": "0ada6c6e7e138df92f5009b6952f4ac41248305a" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" }, + "dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" }, + "flash.nvim": { "branch": "main", "commit": "11a2e667d19d8f48c93c6ed2e2e525ac6b1b79be" }, + "friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" }, + "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, + "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, + "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, + "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "b129892f783740e6cf741f2ea09fa5dd512aa584" }, - "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "mini.comment": { "branch": "main", "commit": "f9f1a646fd3d9df7397aa1b9550a875fe8189eb0" }, - "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" }, - "mini.pairs": { "branch": "main", "commit": "5c975d8f68dc1e11bf4b20ced71e7987ed782513" }, - "mini.surround": { "branch": "main", "commit": "0f528eb2e1bab420c0569d9e52615144c51db920" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, - "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, - "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, - "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, - "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, - "nvim-lint": { "branch": "master", "commit": "861a04313501563bb1b11f125ae9b7237a517b9b" }, - "nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" }, - "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-spectre": { "branch": "master", "commit": "4651801ba37a9407b7257287aec45b6653ffc5e9" }, - "nvim-treesitter": { "branch": "master", "commit": "b1f3f02027f1fd21956c1e219878764014498a59" }, - "nvim-treesitter-context": { "branch": "master", "commit": "2650e6431f7daba5d9c2c64134fa5eb2312eb3d7" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" }, - "nvim-web-devicons": { "branch": "master", "commit": "794bba734ec95eaff9bb82fbd112473be2087283" }, - "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "c1fbdcb0d8d1295314f1612c4a247253e70299d9" }, + "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, + "mini.comment": { "branch": "main", "commit": "c8406379987c321ecdef9f53e1ca741a55002104" }, + "mini.indentscope": { "branch": "main", "commit": "f0d7faa064c892b96997810afcddfadc3f2a15b3" }, + "mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" }, + "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, + "noice.nvim": { "branch": "main", "commit": "69c6ad5c1f1c0777125d0275f9871d8609cb0521" }, + "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, + "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, + "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, + "nvim-lint": { "branch": "master", "commit": "e19842a05aae484957ad20710444757bc0a61d63" }, + "nvim-lspconfig": { "branch": "master", "commit": "38de86f82efd9ba0881203767d6a8e1815abca28" }, + "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, + "nvim-spectre": { "branch": "master", "commit": "366f46fdd4a1593cc237aea13d5ef113739a472c" }, + "nvim-treesitter": { "branch": "master", "commit": "b91ae14fc3bb801c7ea69bc283fe860b32b5163d" }, + "nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, + "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, - "tokyonight.nvim": { "branch": "main", "commit": "67afeaf7fd6ebba000633e89f63c31694057edde" }, - "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, + "todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" }, + "tokyonight.nvim": { "branch": "main", "commit": "0fae425aaab04a5f97666bd431b96f2f19c36935" }, + "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index cde1558..6441cff 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -1,9 +1,47 @@ return { - "folke/tokyonight.nvim", - lazy = true, - opts = { - style = "storm", - transparent = true, - dim_inactive = true, + { + "folke/tokyonight.nvim", + lazy = true, + opts = { + style = "storm", + transparent = true, + dim_inactive = true, + }, }, + { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, + opts = { + default_integrations = true, + dim_inactive = { + enabled = true + }, + flavour = "macchiato", + integrations = { + alpha = true, + cmp = true, + flash = true, + gitsigns = true, + lsp_trouble = true, + native_lsp = { + enabled = true, + underlines = { + errors = { "undercurl" }, + hints = { "undercurl" }, + warnings = { "undercurl" }, + information = { "undercurl" }, + }, + }, + neotree = true, + noice = true, + telescope = { + enabled = true, + }, + treesitter = true, + treesitter_context = true, + which_key = true, + } + } + } } diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 467aeb7..93c616b 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -4,14 +4,15 @@ return { dependencies = { "nvim-tree/nvim-web-devicons" }, opts = { options = { - icons_enabled = true, - theme = "tokyonight", disabled_filetypes = { statusline = { "alpha", - "neo-tree", } - } + }, + }, + extensions = { + "lazy", + "neo-tree", } }, }, @@ -24,18 +25,20 @@ return { { "akinsho/bufferline.nvim", event = "VeryLazy", + after = "catppuccin", keys = { { "bp", "BufferLineTogglePin", desc = "Toggle Pin" }, { "[b", "BufferLineCyclePrev", desc = "Prev Buffer" }, { "]b", "BufferLineCycleNext", desc = "Next Buffer" }, }, opts = { + highlights = require("catppuccin.groups.integrations.bufferline").get(), options = { diagnostics = "nvim_lsp", offsets = { { filetype = "neo-tree", - text = "Neo-tree", + text = "", highlight = "Directory", text_align = "left", }, From bc3b1f05f2ace186ab9777e0bf824d9d8466c443 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 161/240] feat: add feline --- lazy-lock.json | 2 +- lua/options.lua | 2 +- lua/plugins/ui.lua | 25 ++++++++++--------------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 797979b..2a1415e 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -8,13 +8,13 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" }, "dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" }, + "feline.nvim": { "branch": "main", "commit": "8bc28b94a16304aad2f53b8c3653b14803748c28" }, "flash.nvim": { "branch": "main", "commit": "11a2e667d19d8f48c93c6ed2e2e525ac6b1b79be" }, "friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" }, "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c1fbdcb0d8d1295314f1612c4a247253e70299d9" }, "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, diff --git a/lua/options.lua b/lua/options.lua index e08d218..c8870dc 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -4,7 +4,7 @@ vim.g.maplocalleader = " " vim.opt.belloff = "all" vim.opt.backspace = "2" vim.opt.showcmd = true -vim.opt.laststatus = 2 +vim.opt.laststatus = 3 -- global status bar vim.opt.swapfile = false vim.opt.number = true diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 93c616b..d3fa655 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,20 +1,15 @@ return { { - "nvim-lualine/lualine.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - opts = { - options = { - disabled_filetypes = { - statusline = { - "alpha", - } - }, - }, - extensions = { - "lazy", - "neo-tree", - } - }, + 'freddiehaddad/feline.nvim', + init = function() + local ctp_feline = require('catppuccin.groups.integrations.feline') + + ctp_feline.setup() + + require("feline").setup({ + components = ctp_feline.get(), + }) + end }, { "famiu/bufdelete.nvim", From 577d622e12b413fe9d3e7e5fb5a9299e8edc8c50 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 162/240] feat: move linting to nvim-lint This also removes linting from conform.nvim, as it should be focused only on formatting --- lua/plugins/formatting.lua | 8 ++++---- lua/plugins/linting.lua | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index ef27e71..d3ca74e 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -6,12 +6,12 @@ return { scss = { "prettierd" }, html = { "djlint" }, lua = { "stylelua" }, - javascript = { "eslint_d", "prettierd" }, - javascriptreact = { "eslint_d", "prettierd" }, + javascript = { "prettierd" }, + javascriptreact = { "prettierd" }, json = { "prettierd" }, jsonc = { "prettierd" }, - typescript = { "eslint_d", "prettierd" }, - typescriptreact = { "eslint_d", "prettierd" }, + typescript = { "prettierd" }, + typescriptreact = { "prettierd" }, }, format_on_save = { lsp_fallback = true, diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua index 995389c..660ea46 100644 --- a/lua/plugins/linting.lua +++ b/lua/plugins/linting.lua @@ -4,10 +4,10 @@ return { events = { "BufWritePost", "BufReadPost", "InsertLeave" }, linters_by_ft = { html = { "djlint" }, - javascript = { "eslint_d" }, - typescript = { "eslint_d" }, - javascriptreact = { "eslint_d" }, - typescriptreact = { "eslint_d" }, + javascript = { "eslint" }, + typescript = { "eslint" }, + javascriptreact = { "eslint" }, + typescriptreact = { "eslint" }, }, }, config = function(_, opts) From bdac71b19c56ac3b8e73e61782a6799ac044f54a Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 163/240] feat: add markdown linting/formatting --- lua/plugins/formatting.lua | 1 + lua/plugins/linting.lua | 16 ++++++++++++++-- lua/plugins/lsp.lua | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index d3ca74e..ee276c1 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -6,6 +6,7 @@ return { scss = { "prettierd" }, html = { "djlint" }, lua = { "stylelua" }, + markdown = { "prettierd" }, javascript = { "prettierd" }, javascriptreact = { "prettierd" }, json = { "prettierd" }, diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua index 660ea46..66ce712 100644 --- a/lua/plugins/linting.lua +++ b/lua/plugins/linting.lua @@ -1,4 +1,4 @@ -return { +return { { "mfussenegger/nvim-lint", opts = { events = { "BufWritePost", "BufReadPost", "InsertLeave" }, @@ -23,4 +23,16 @@ return { end, }) end, -} +}, { + "jose-elias-alvarez/null-ls.nvim", + event = { "BufWritePost", "BufReadPost", "InsertLeave" }, + opts = function() + local null_ls = require("null-ls") + local diagnostics = null_ls.builtins.diagnostics + return { + sources = { + diagnostics.vale, + } + } + end +} } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 860226c..c8a3210 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -22,6 +22,7 @@ return { "eslint_d", "prettierd", "stylua", + "vale", }, automatic_installation = true, } From edd4034d32828da5d20d1a57e28c43ef076f3bc8 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 164/240] fix: invalid opt --- lazy-lock.json | 1 + lua/plugins/ui.lua | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lazy-lock.json b/lazy-lock.json index 2a1415e..33c422a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -25,6 +25,7 @@ "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "noice.nvim": { "branch": "main", "commit": "69c6ad5c1f1c0777125d0275f9871d8609cb0521" }, "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, + "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-lint": { "branch": "master", "commit": "e19842a05aae484957ad20710444757bc0a61d63" }, diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index d3fa655..60ca8c4 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -20,7 +20,6 @@ return { { "akinsho/bufferline.nvim", event = "VeryLazy", - after = "catppuccin", keys = { { "bp", "BufferLineTogglePin", desc = "Toggle Pin" }, { "[b", "BufferLineCyclePrev", desc = "Prev Buffer" }, From d194720a097ade9ba03e11ce40d317043a28c57b Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 165/240] feat: add post-install note --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 285cf32..3c54a5d 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,9 @@ It's pretty opinionated. You might not like it. 2. Run Neovim. 3. Wait for everything to install. +# Post Installation + +- `vale` requires a configuration file to work. [Make sure one is present][valeconfig]. You may also need to run `vale sync` after adding it (if installed using Mason, make sure to run the binary installed by Mason and not the global one, if present). + [lazynvim]: https://github.com/folke/lazy.nvim +[valeconfig]: https://vale.sh/docs/topics/config/#global-configuration From 6f3ee9244c55f3b20960f535cae9f5d79b4f2330 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 166/240] fix: use correct formatter for lua --- lua/plugins/formatting.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index ee276c1..dd49a97 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -5,7 +5,7 @@ return { css = { "prettierd" }, scss = { "prettierd" }, html = { "djlint" }, - lua = { "stylelua" }, + lua = { "stylua" }, markdown = { "prettierd" }, javascript = { "prettierd" }, javascriptreact = { "prettierd" }, From bfe81aca3ca05b674189a13fcd1ad25d5ed39a16 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 167/240] fix: formatting --- init.lua | 42 ++--- lua/autocmds.lua | 14 +- lua/keybinds.lua | 6 +- lua/options.lua | 14 +- lua/plugins/coding.lua | 187 +++++++++++---------- lua/plugins/colorscheme.lua | 90 +++++------ lua/plugins/editor.lua | 314 ++++++++++++++++++------------------ lua/plugins/formatting.lua | 38 ++--- lua/plugins/linting.lua | 75 ++++----- lua/plugins/lsp.lua | 112 ++++++------- lua/plugins/treesitter.lua | 78 ++++----- lua/plugins/ui.lua | 312 +++++++++++++++++------------------ 12 files changed, 642 insertions(+), 640 deletions(-) diff --git a/init.lua b/init.lua index 242952b..856ff0d 100644 --- a/init.lua +++ b/init.lua @@ -2,31 +2,31 @@ require("options") local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) end vim.opt.rtp:prepend(lazypath) -- Fix for yanking to system clipboard on Windows -if vim.fn.has('wsl') == 1 then - vim.g.clipboard = { - name = 'WslClipboard', - copy = { - ['+'] = 'clip.exe', - ['*'] = 'clip.exe', - }, - paste = { - ['+'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', - ['*'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', - }, - cache_enabled = 0, - } +if vim.fn.has("wsl") == 1 then + vim.g.clipboard = { + name = "WslClipboard", + copy = { + ["+"] = "clip.exe", + ["*"] = "clip.exe", + }, + paste = { + ["+"] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', + ["*"] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', + }, + cache_enabled = 0, + } end require("lazy").setup("plugins") diff --git a/lua/autocmds.lua b/lua/autocmds.lua index 1f6502d..260e358 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -1,12 +1,12 @@ local function augroup(name) - return vim.api.nvim_create_augroup("wf_" .. name, { clear = true }) + return vim.api.nvim_create_augroup("wf_" .. name, { clear = true }) end vim.api.nvim_create_autocmd({ "FileType" }, { - group = augroup("spellcheck"), - pattern = { "gitcommit", "markdown", "md", "mdx" }, - callback = function() - vim.opt_local.spell = true - vim.opt_local.wrap = true - end, + group = augroup("spellcheck"), + pattern = { "gitcommit", "markdown", "md", "mdx" }, + callback = function() + vim.opt_local.spell = true + vim.opt_local.wrap = true + end, }) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index 5f4a455..c7baf36 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -13,9 +13,9 @@ vim.keymap.set("v", "K", ":m '<-2gv=gv", { desc = "Move lines under cursor d vim.keymap.set("n", "n", "nzzzv", { desc = "Go to next search result and keep cursor centered on screen" }) vim.keymap.set("n", "N", "Nzzzv", { desc = "Go to previous search result and keep cursor centered on screen" }) -vim.keymap.set("x", "p", "\"_dP", { desc = "Paste without replacing clipboard contents" }) +vim.keymap.set("x", "p", '"_dP', { desc = "Paste without replacing clipboard contents" }) -vim.keymap.set("n", "y", "\"*y", { desc = "Yank into system clipboard" }) -vim.keymap.set("v", "y", "\"*y", { desc = "Yank into system clipboard" }) +vim.keymap.set("n", "y", '"*y', { desc = "Yank into system clipboard" }) +vim.keymap.set("v", "y", '"*y', { desc = "Yank into system clipboard" }) vim.keymap.set("i", "jk", "", { desc = "Exit insert mode" }) diff --git a/lua/options.lua b/lua/options.lua index c8870dc..ca0f843 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -31,13 +31,13 @@ vim.opt.hlsearch = false vim.opt.incsearch = true vim.opt.fillchars = { - foldopen = "", - foldclose = "", - -- fold = "⸱", - fold = " ", - foldsep = " ", - diff = "╱", - eob = " ", + foldopen = "", + foldclose = "", + -- fold = "⸱", + fold = " ", + foldsep = " ", + diff = "╱", + eob = " ", } vim.opt.foldlevel = 99 diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 5ec6181..4fe3313 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -1,100 +1,99 @@ return { - { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - }, - config = function() - local cmp = require("cmp") + { + "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", - }, + cmp.setup({ + -- Highlights the first result always + completion = { + completeopt = "menu,menuone,noinsert", + }, - 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 }), - }), + 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 - }, + snippet = { + expand = function(args) + require("luasnip").lsp_expand(args.body) + end, + }, - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "luasnip" }, - }, { - { name = "buffer" }, - }), - }) - end, - }, - { - "L3MON4D3/LuaSnip", - dependencies = { "rafamadriz/friendly-snippets" }, - }, - { - "echasnovski/mini.pairs", - version = false, - opts = { - mappings = { - ["`"] = { action = "closeopen", pair = "``", neigh_pattern = "[^\\`].", register = { cr = false } }, - }, - }, - }, - { - "echasnovski/mini.surround", - version = false, - opts = { - mappings = { - add = "gsa", -- Add surrounding in Normal and Visual modes - delete = "gsd", -- Delete surrounding - find = "gsf", -- Find surrounding (to the right) - find_left = "gsF", -- Find surrounding (to the left) - highlight = "gsh", -- Highlight surrounding - replace = "gsr", -- Replace surrounding - update_n_lines = "gsn", -- Update `n_lines` - }, - }, - }, - { - "JoosepAlviste/nvim-ts-context-commentstring", - opts = { - enable_autocmd = false, - }, - }, - { - "echasnovski/mini.comment", - version = false, - opts = { - options = { - custom_commentstring = function() - return require("ts_context_commentstring.internal").calculate_commentstring() - or vim.bo.commentstring - end, - }, - }, - }, + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + { name = "luasnip" }, + }, { + { name = "buffer" }, + }), + }) + end, + }, + { + "L3MON4D3/LuaSnip", + dependencies = { "rafamadriz/friendly-snippets" }, + }, + { + "echasnovski/mini.pairs", + version = false, + opts = { + mappings = { + ["`"] = { action = "closeopen", pair = "``", neigh_pattern = "[^\\`].", register = { cr = false } }, + }, + }, + }, + { + "echasnovski/mini.surround", + version = false, + opts = { + mappings = { + add = "gsa", -- Add surrounding in Normal and Visual modes + delete = "gsd", -- Delete surrounding + find = "gsf", -- Find surrounding (to the right) + find_left = "gsF", -- Find surrounding (to the left) + highlight = "gsh", -- Highlight surrounding + replace = "gsr", -- Replace surrounding + update_n_lines = "gsn", -- Update `n_lines` + }, + }, + }, + { + "JoosepAlviste/nvim-ts-context-commentstring", + opts = { + enable_autocmd = false, + }, + }, + { + "echasnovski/mini.comment", + version = false, + opts = { + options = { + custom_commentstring = function() + return require("ts_context_commentstring.internal").calculate_commentstring() or vim.bo.commentstring + end, + }, + }, + }, } diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 6441cff..e15d03b 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -1,47 +1,47 @@ return { - { - "folke/tokyonight.nvim", - lazy = true, - opts = { - style = "storm", - transparent = true, - dim_inactive = true, - }, - }, - { - "catppuccin/nvim", - name = "catppuccin", - priority = 1000, - opts = { - default_integrations = true, - dim_inactive = { - enabled = true - }, - flavour = "macchiato", - integrations = { - alpha = true, - cmp = true, - flash = true, - gitsigns = true, - lsp_trouble = true, - native_lsp = { - enabled = true, - underlines = { - errors = { "undercurl" }, - hints = { "undercurl" }, - warnings = { "undercurl" }, - information = { "undercurl" }, - }, - }, - neotree = true, - noice = true, - telescope = { - enabled = true, - }, - treesitter = true, - treesitter_context = true, - which_key = true, - } - } - } + { + "folke/tokyonight.nvim", + lazy = true, + opts = { + style = "storm", + transparent = true, + dim_inactive = true, + }, + }, + { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, + opts = { + default_integrations = true, + dim_inactive = { + enabled = true, + }, + flavour = "macchiato", + integrations = { + alpha = true, + cmp = true, + flash = true, + gitsigns = true, + lsp_trouble = true, + native_lsp = { + enabled = true, + underlines = { + errors = { "undercurl" }, + hints = { "undercurl" }, + warnings = { "undercurl" }, + information = { "undercurl" }, + }, + }, + neotree = true, + noice = true, + telescope = { + enabled = true, + }, + treesitter = true, + treesitter_context = true, + which_key = true, + }, + }, + }, } diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index cb91684..3e8f243 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -1,132 +1,132 @@ return { - { - "nvim-neo-tree/neo-tree.nvim", - event = "VeryLazy", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", - }, - config = function() - vim.keymap.set("n", "ee", ":Neotree toggle", { desc = "Toggle Neotree" }) - vim.keymap.set("n", "er", ":Neotree reveal", { desc = "Reveal file" }) + { + "nvim-neo-tree/neo-tree.nvim", + event = "VeryLazy", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + config = function() + vim.keymap.set("n", "ee", ":Neotree toggle", { desc = "Toggle Neotree" }) + vim.keymap.set("n", "er", ":Neotree reveal", { desc = "Reveal file" }) - local nt = require("neo-tree") + local nt = require("neo-tree") - nt.setup({ - open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, - filesystem = { - filtered_items = { - show_hidden_count = false, - hide_dotfiles = false, - hide_gitignored = true, - always_show = { - ".env", - ".env.local", - }, - never_show = { - ".git", - "thumbs.db", - ".DS_Store", - }, - }, - }, - window = { - mappings = { - ["m"] = { - "move", - config = { - show_path = "relative", - }, - }, - }, - }, - event_handlers = { - { - event = "neo_tree_popup_input_ready", - handler = function() - -- Switch to normal inside popups by default. - vim.cmd.stopinsert() - end, - }, - }, - }) - end, - }, - { - "folke/which-key.nvim", - event = "VeryLazy", - init = function() - vim.o.timeout = true - vim.o.timeoutlen = 300 - end, - opts = {}, - }, - { - "folke/trouble.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - vim.keymap.set("n", "tt", ":TroubleToggle", { desc = "Toggle Trouble" }) - end, - }, - { - "folke/todo-comments.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, - opts = {}, - }, - { - "nvim-pack/nvim-spectre", - dependencies = { "nvim-lua/plenary.nvim" }, - opts = { open_cmd = "noswapfile vnew" }, - keys = { - { - "sr", - function() - require("spectre").open() - end, - desc = "Replace in Files (Spectre)", - }, - }, - }, - { - "nvim-telescope/telescope.nvim", - tag = "0.1.5", - dependencies = { "nvim-lua/plenary.nvim" }, - config = function() - local builtin = require("telescope.builtin") + nt.setup({ + open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, + filesystem = { + filtered_items = { + show_hidden_count = false, + hide_dotfiles = false, + hide_gitignored = true, + always_show = { + ".env", + ".env.local", + }, + never_show = { + ".git", + "thumbs.db", + ".DS_Store", + }, + }, + }, + window = { + mappings = { + ["m"] = { + "move", + config = { + show_path = "relative", + }, + }, + }, + }, + event_handlers = { + { + event = "neo_tree_popup_input_ready", + handler = function() + -- Switch to normal inside popups by default. + vim.cmd.stopinsert() + end, + }, + }, + }) + end, + }, + { + "folke/which-key.nvim", + event = "VeryLazy", + init = function() + vim.o.timeout = true + vim.o.timeoutlen = 300 + end, + opts = {}, + }, + { + "folke/trouble.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + vim.keymap.set("n", "tt", ":TroubleToggle", { desc = "Toggle Trouble" }) + end, + }, + { + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = {}, + }, + { + "nvim-pack/nvim-spectre", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = { open_cmd = "noswapfile vnew" }, + keys = { + { + "sr", + function() + require("spectre").open() + end, + desc = "Replace in Files (Spectre)", + }, + }, + }, + { + "nvim-telescope/telescope.nvim", + tag = "0.1.5", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + local builtin = require("telescope.builtin") - vim.keymap.set("n", "ff", builtin.git_files, { desc = "Search git_files" }) - vim.keymap.set("n", "fg", builtin.live_grep, { desc = "Grep git_files" }) - vim.keymap.set("n", "fh", builtin.help_tags, { desc = "View help tags" }) - vim.keymap.set("n", "fb", builtin.buffers, { desc = "Search buffers" }) - vim.keymap.set("n", "sk", builtin.keymaps, { desc = "View keymaps" }) - vim.keymap.set("n", "sR", builtin.resume, { desc = "Resume" }) - vim.keymap.set("n", "st", "TodoTelescope", { desc = "Search TODOs" }) - end, - }, - { - "nvim-telescope/telescope-ui-select.nvim", - config = function() - require("telescope").setup({ - defaults = { - initial_mode = "normal", - }, - extensions = { - ["ui-select"] = { - require("telescope.themes").get_dropdown({}), - }, - }, - }) + vim.keymap.set("n", "ff", builtin.git_files, { desc = "Search git_files" }) + vim.keymap.set("n", "fg", builtin.live_grep, { desc = "Grep git_files" }) + vim.keymap.set("n", "fh", builtin.help_tags, { desc = "View help tags" }) + vim.keymap.set("n", "fb", builtin.buffers, { desc = "Search buffers" }) + vim.keymap.set("n", "sk", builtin.keymaps, { desc = "View keymaps" }) + vim.keymap.set("n", "sR", builtin.resume, { desc = "Resume" }) + vim.keymap.set("n", "st", "TodoTelescope", { desc = "Search TODOs" }) + end, + }, + { + "nvim-telescope/telescope-ui-select.nvim", + config = function() + require("telescope").setup({ + defaults = { + initial_mode = "normal", + }, + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown({}), + }, + }, + }) - require("telescope").load_extension("ui-select") - end, - }, - { - "folke/flash.nvim", - event = "VeryLazy", - ---@type Flash.Config - opts = {}, + require("telescope").load_extension("ui-select") + end, + }, + { + "folke/flash.nvim", + event = "VeryLazy", + ---@type Flash.Config + opts = {}, -- stylua: ignore keys = { { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, @@ -135,37 +135,37 @@ return { { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, }, - }, - { - "kdheepak/lazygit.nvim", - event = "VeryLazy", - cmd = { - "LazyGit", - "LazyGitConfig", - "LazyGitCurrentFile", - "LazyGitFilter", - "LazyGitFilterCurrentFile", - }, - -- optional for floating window border decoration - dependencies = { - "nvim-lua/plenary.nvim", - }, - keys = { - { "gg", "LazyGit", desc = "LazyGit" } - } - }, - { - "lewis6991/gitsigns.nvim", - event = "VeryLazy", - opts = { - signs = { - add = { text = "▎" }, - change = { text = "▎" }, - delete = { text = "" }, - topdelete = { text = "" }, - changedelete = { text = "▎" }, - untracked = { text = "▎" }, - }, - } - } + }, + { + "kdheepak/lazygit.nvim", + event = "VeryLazy", + cmd = { + "LazyGit", + "LazyGitConfig", + "LazyGitCurrentFile", + "LazyGitFilter", + "LazyGitFilterCurrentFile", + }, + -- optional for floating window border decoration + dependencies = { + "nvim-lua/plenary.nvim", + }, + keys = { + { "gg", "LazyGit", desc = "LazyGit" }, + }, + }, + { + "lewis6991/gitsigns.nvim", + event = "VeryLazy", + opts = { + signs = { + add = { text = "▎" }, + change = { text = "▎" }, + delete = { text = "" }, + topdelete = { text = "" }, + changedelete = { text = "▎" }, + untracked = { text = "▎" }, + }, + }, + }, } diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index dd49a97..c5b7efc 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -1,21 +1,21 @@ return { - "stevearc/conform.nvim", - opts = { - formatters_by_ft = { - css = { "prettierd" }, - scss = { "prettierd" }, - html = { "djlint" }, - lua = { "stylua" }, - markdown = { "prettierd" }, - javascript = { "prettierd" }, - javascriptreact = { "prettierd" }, - json = { "prettierd" }, - jsonc = { "prettierd" }, - typescript = { "prettierd" }, - typescriptreact = { "prettierd" }, - }, - format_on_save = { - lsp_fallback = true, - }, - }, + "stevearc/conform.nvim", + opts = { + formatters_by_ft = { + css = { "prettierd" }, + scss = { "prettierd" }, + html = { "djlint" }, + lua = { "stylua" }, + markdown = { "prettierd" }, + javascript = { "prettierd" }, + javascriptreact = { "prettierd" }, + json = { "prettierd" }, + jsonc = { "prettierd" }, + typescript = { "prettierd" }, + typescriptreact = { "prettierd" }, + }, + format_on_save = { + lsp_fallback = true, + }, + }, } diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua index 66ce712..99d4ad2 100644 --- a/lua/plugins/linting.lua +++ b/lua/plugins/linting.lua @@ -1,38 +1,41 @@ -return { { - "mfussenegger/nvim-lint", - opts = { - events = { "BufWritePost", "BufReadPost", "InsertLeave" }, - linters_by_ft = { - html = { "djlint" }, - javascript = { "eslint" }, - typescript = { "eslint" }, - javascriptreact = { "eslint" }, - typescriptreact = { "eslint" }, - }, - }, - config = function(_, opts) - local lint = require("lint") - lint.linters_by_ft = opts.linters_by_ft +return { + { + "mfussenegger/nvim-lint", + opts = { + events = { "BufWritePost", "BufReadPost", "InsertLeave" }, + linters_by_ft = { + html = { "djlint" }, + javascript = { "eslint" }, + typescript = { "eslint" }, + javascriptreact = { "eslint" }, + typescriptreact = { "eslint" }, + }, + }, + config = function(_, opts) + local lint = require("lint") + lint.linters_by_ft = opts.linters_by_ft - local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) + local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) - vim.api.nvim_create_autocmd(opts.events, { - group = lint_augroup, - callback = function() - lint.try_lint() - end, - }) - end, -}, { - "jose-elias-alvarez/null-ls.nvim", - event = { "BufWritePost", "BufReadPost", "InsertLeave" }, - opts = function() - local null_ls = require("null-ls") - local diagnostics = null_ls.builtins.diagnostics - return { - sources = { - diagnostics.vale, - } - } - end -} } + vim.api.nvim_create_autocmd(opts.events, { + group = lint_augroup, + callback = function() + lint.try_lint() + end, + }) + end, + }, + { + "jose-elias-alvarez/null-ls.nvim", + event = { "BufWritePost", "BufReadPost", "InsertLeave" }, + opts = function() + local null_ls = require("null-ls") + local diagnostics = null_ls.builtins.diagnostics + return { + sources = { + diagnostics.vale, + }, + } + end, + }, +} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index c8a3210..037ace4 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -1,61 +1,61 @@ return { - { - "williamboman/mason.nvim", - opts = {}, - }, - { - "williamboman/mason-lspconfig.nvim", - opts = { - ensure_installed = { - "lua_ls", - "tsserver", - "html", - } - } - }, - { - "WhoIsSethDaniel/mason-tool-installer.nvim", - opts = { - ensure_installed = { - "djlint", - "eslint", - "eslint_d", - "prettierd", - "stylua", - "vale", - }, - automatic_installation = true, - } - }, - -- lspconfig should be the last step. - { - "neovim/nvim-lspconfig", - event = "VeryLazy", - dependencies = { - "mason.nvim", - "williamboman/mason-lspconfig.nvim", - }, - opts = { - servers = { - tsserver = {}, - lua_ls = {}, - } - }, - config = function(_, opts) - local lspconfig = require("lspconfig") + { + "williamboman/mason.nvim", + opts = {}, + }, + { + "williamboman/mason-lspconfig.nvim", + opts = { + ensure_installed = { + "lua_ls", + "tsserver", + "html", + }, + }, + }, + { + "WhoIsSethDaniel/mason-tool-installer.nvim", + opts = { + ensure_installed = { + "djlint", + "eslint", + "eslint_d", + "prettierd", + "stylua", + "vale", + }, + automatic_installation = true, + }, + }, + -- lspconfig should be the last step. + { + "neovim/nvim-lspconfig", + event = "VeryLazy", + dependencies = { + "mason.nvim", + "williamboman/mason-lspconfig.nvim", + }, + opts = { + servers = { + tsserver = {}, + lua_ls = {}, + }, + }, + config = function(_, opts) + local lspconfig = require("lspconfig") - local servers = opts.servers + local servers = opts.servers - for server, server_opts in pairs(servers) do - lspconfig[server].setup(server_opts) - end + for server, server_opts in pairs(servers) do + lspconfig[server].setup(server_opts) + end - vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "Go to definition" }) - vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { desc = "Go to implementation" }) - vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "Show signature" }) - vim.keymap.set("n", "f", vim.lsp.buf.format, { desc = "Format buffer" }) - vim.keymap.set("n", "ca", vim.lsp.buf.code_action, { desc = "View code actions" }) - vim.keymap.set("n", "cr", vim.lsp.buf.rename, { desc = "Rename" }) - end, - }, + vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "Go to definition" }) + vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { desc = "Go to implementation" }) + vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "Show signature" }) + vim.keymap.set("n", "f", vim.lsp.buf.format, { desc = "Format buffer" }) + vim.keymap.set("n", "ca", vim.lsp.buf.code_action, { desc = "View code actions" }) + vim.keymap.set("n", "cr", vim.lsp.buf.rename, { desc = "Rename" }) + end, + }, } diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 85cf8f5..f1fbb6f 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -1,41 +1,41 @@ return { - { - "nvim-treesitter/nvim-treesitter", - version = false, - build = ":TSUpdate", - opts = { - ensure_installed = { - "lua", - "javascript", - "typescript", - "tsx", - "htmldjango", - "html", - "jsonc", - "json", - "jsdoc", - "markdown", - "markdown_inline", - "vim", - "vimdoc", - }, - highlight = { enable = true }, - indent = { enable = true }, - }, - config = function(_, opts) - require("nvim-treesitter.configs").setup(opts) - end, - }, - { - "nvim-treesitter/nvim-treesitter-context", - opts = { - max_lines = 2, - }, - }, - { - -- TODO: Figure out why this plugin is not working. - "windwp/nvim-autopairs", - event = "VeryLazy", - opts = {}, - }, + { + "nvim-treesitter/nvim-treesitter", + version = false, + build = ":TSUpdate", + opts = { + ensure_installed = { + "lua", + "javascript", + "typescript", + "tsx", + "htmldjango", + "html", + "jsonc", + "json", + "jsdoc", + "markdown", + "markdown_inline", + "vim", + "vimdoc", + }, + highlight = { enable = true }, + indent = { enable = true }, + }, + config = function(_, opts) + require("nvim-treesitter.configs").setup(opts) + end, + }, + { + "nvim-treesitter/nvim-treesitter-context", + opts = { + max_lines = 2, + }, + }, + { + -- TODO: Figure out why this plugin is not working. + "windwp/nvim-autopairs", + event = "VeryLazy", + opts = {}, + }, } diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 60ca8c4..77f87c7 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,163 +1,163 @@ return { - { - 'freddiehaddad/feline.nvim', - init = function() - local ctp_feline = require('catppuccin.groups.integrations.feline') + { + "freddiehaddad/feline.nvim", + init = function() + local ctp_feline = require("catppuccin.groups.integrations.feline") - ctp_feline.setup() + ctp_feline.setup() - require("feline").setup({ - components = ctp_feline.get(), - }) - end - }, - { - "famiu/bufdelete.nvim", - keys = { - { "bd", "Bdelete", desc = "Close Buffer" }, - }, - }, - { - "akinsho/bufferline.nvim", - event = "VeryLazy", - keys = { - { "bp", "BufferLineTogglePin", desc = "Toggle Pin" }, - { "[b", "BufferLineCyclePrev", desc = "Prev Buffer" }, - { "]b", "BufferLineCycleNext", desc = "Next Buffer" }, - }, - opts = { - highlights = require("catppuccin.groups.integrations.bufferline").get(), - options = { - diagnostics = "nvim_lsp", - offsets = { - { - filetype = "neo-tree", - text = "", - highlight = "Directory", - text_align = "left", - }, - }, - } - } - }, - { - "lukas-reineke/indent-blankline.nvim", - opts = { - indent = { - char = "│", - tab_char = "│", - }, - scope = { enabled = false }, - exclude = { - filetypes = { - "help", - "alpha", - "dashboard", - "neo-tree", - "Trouble", - "trouble", - "lazy", - "mason", - "notify", - "toggleterm", - "lazyterm", - }, - }, - }, - main = "ibl", - }, - { - "echasnovski/mini.indentscope", - opts = { - symbol = "│", - options = { try_as_border = true }, - }, - init = function() - vim.api.nvim_create_autocmd("FileType", { - pattern = { - "help", - "alpha", - "dashboard", - "neo-tree", - "Trouble", - "trouble", - "lazy", - "mason", - "notify", - "toggleterm", - "lazyterm", - }, - callback = function() - vim.b.miniindentscope_disable = true - end, - }) - end, - }, - { - "stevearc/dressing.nvim", - event = "VeryLazy", - opts = {} - }, - { - "rcarriga/nvim-notify", - opts = { - timeout = 2000, - stages = "static", - } - }, - { - "MunifTanjim/nui.nvim" - }, - { - "folke/noice.nvim", - event = "VeryLazy", - opts = {}, - dependencies = { - "MunifTanjim/nui.nvim", - "rcarriga/nvim-notify", - } - }, - { - "goolord/alpha-nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - local alpha = require("alpha") - local dashboard = require("alpha.themes.dashboard") + require("feline").setup({ + components = ctp_feline.get(), + }) + end, + }, + { + "famiu/bufdelete.nvim", + keys = { + { "bd", "Bdelete", desc = "Close Buffer" }, + }, + }, + { + "akinsho/bufferline.nvim", + event = "VeryLazy", + keys = { + { "bp", "BufferLineTogglePin", desc = "Toggle Pin" }, + { "[b", "BufferLineCyclePrev", desc = "Prev Buffer" }, + { "]b", "BufferLineCycleNext", desc = "Next Buffer" }, + }, + opts = { + highlights = require("catppuccin.groups.integrations.bufferline").get(), + options = { + diagnostics = "nvim_lsp", + offsets = { + { + filetype = "neo-tree", + text = "", + highlight = "Directory", + text_align = "left", + }, + }, + }, + }, + }, + { + "lukas-reineke/indent-blankline.nvim", + opts = { + indent = { + char = "│", + tab_char = "│", + }, + scope = { enabled = false }, + exclude = { + filetypes = { + "help", + "alpha", + "dashboard", + "neo-tree", + "Trouble", + "trouble", + "lazy", + "mason", + "notify", + "toggleterm", + "lazyterm", + }, + }, + }, + main = "ibl", + }, + { + "echasnovski/mini.indentscope", + opts = { + symbol = "│", + options = { try_as_border = true }, + }, + init = function() + vim.api.nvim_create_autocmd("FileType", { + pattern = { + "help", + "alpha", + "dashboard", + "neo-tree", + "Trouble", + "trouble", + "lazy", + "mason", + "notify", + "toggleterm", + "lazyterm", + }, + callback = function() + vim.b.miniindentscope_disable = true + end, + }) + end, + }, + { + "stevearc/dressing.nvim", + event = "VeryLazy", + opts = {}, + }, + { + "rcarriga/nvim-notify", + opts = { + timeout = 2000, + stages = "static", + }, + }, + { + "MunifTanjim/nui.nvim", + }, + { + "folke/noice.nvim", + event = "VeryLazy", + opts = {}, + dependencies = { + "MunifTanjim/nui.nvim", + "rcarriga/nvim-notify", + }, + }, + { + "goolord/alpha-nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + local alpha = require("alpha") + local dashboard = require("alpha.themes.dashboard") - -- https://github.com/MaximilianLloyd/ascii.nvim - dashboard.section.header.val = { - " ", - " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", - " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", - " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", - " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", - " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", - " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", - " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", - " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", - " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", - " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", - " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", - " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", - " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", - " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", - " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", - " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", - " ▄█████████▄▄ ", - " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", - " ▄▄█████▀▀▀▀ ▀■ ", - " ▄███▀▀▀▀ ", - " ■▀▀ ", - " ", - } + -- https://github.com/MaximilianLloyd/ascii.nvim + dashboard.section.header.val = { + " ", + " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", + " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", + " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", + " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", + " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", + " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", + " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", + " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", + " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", + " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", + " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", + " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", + " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", + " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", + " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", + " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", + " ▄█████████▄▄ ", + " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", + " ▄▄█████▀▀▀▀ ▀■ ", + " ▄███▀▀▀▀ ", + " ■▀▀ ", + " ", + } - dashboard.section.buttons.val = { - dashboard.button("e", " > New File", "ene"), - dashboard.button("SPC ee", " > File explorer", "Neotree"), - dashboard.button("q", " > Quit", "qa"), - } + dashboard.section.buttons.val = { + dashboard.button("e", " > New File", "ene"), + dashboard.button("SPC ee", " > File explorer", "Neotree"), + dashboard.button("q", " > Quit", "qa"), + } - alpha.setup(dashboard.opts) - end, - } + alpha.setup(dashboard.opts) + end, + }, } From c40b69fb2f98fd49f6e930dbef36de4988de5b53 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 168/240] feat: switch to tokyonight theme --- init.lua | 2 +- lua/plugins/colorscheme.lua | 1 - lua/plugins/ui.lua | 11 +---------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/init.lua b/init.lua index 856ff0d..c602a71 100644 --- a/init.lua +++ b/init.lua @@ -33,4 +33,4 @@ require("lazy").setup("plugins") require("keybinds") require("autocmds") -vim.cmd.colorscheme("catppuccin") +vim.cmd.colorscheme("tokyonight") diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index e15d03b..fd432b5 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -4,7 +4,6 @@ return { lazy = true, opts = { style = "storm", - transparent = true, dim_inactive = true, }, }, diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 77f87c7..e06e51b 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,15 +1,7 @@ return { { "freddiehaddad/feline.nvim", - init = function() - local ctp_feline = require("catppuccin.groups.integrations.feline") - - ctp_feline.setup() - - require("feline").setup({ - components = ctp_feline.get(), - }) - end, + opts = {}, }, { "famiu/bufdelete.nvim", @@ -26,7 +18,6 @@ return { { "]b", "BufferLineCycleNext", desc = "Next Buffer" }, }, opts = { - highlights = require("catppuccin.groups.integrations.bufferline").get(), options = { diagnostics = "nvim_lsp", offsets = { From 4e13cfddf9059a3862d44324d61b80eb0de7fe94 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 169/240] feat: plugin update --- lazy-lock.json | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 33c422a..057ee4b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,46 +1,46 @@ { - "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" }, + "LuaSnip": { "branch": "master", "commit": "2b6860d15aaab01d3fb90859c0ba97f20ad7bc5f" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" }, - "dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" }, + "conform.nvim": { "branch": "master", "commit": "069e971295a34a810484b7b2ef54b3c735214181" }, + "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" }, "feline.nvim": { "branch": "main", "commit": "8bc28b94a16304aad2f53b8c3653b14803748c28" }, - "flash.nvim": { "branch": "main", "commit": "11a2e667d19d8f48c93c6ed2e2e525ac6b1b79be" }, - "friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" }, - "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, + "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, + "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, + "gitsigns.nvim": { "branch": "main", "commit": "379a5a915aea3e9ba0d4a778e8478584ac0f9011" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, + "lazy.nvim": { "branch": "main", "commit": "70f2c090d3ffb14f8702d468e05beb240b768881" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "c1fbdcb0d8d1295314f1612c4a247253e70299d9" }, - "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, + "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, "mini.comment": { "branch": "main", "commit": "c8406379987c321ecdef9f53e1ca741a55002104" }, "mini.indentscope": { "branch": "main", "commit": "f0d7faa064c892b96997810afcddfadc3f2a15b3" }, "mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" }, "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "noice.nvim": { "branch": "main", "commit": "69c6ad5c1f1c0777125d0275f9871d8609cb0521" }, - "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, + "noice.nvim": { "branch": "main", "commit": "29c7f030b0920e2f17263a9ab8742cde144b9140" }, + "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, - "nvim-lint": { "branch": "master", "commit": "e19842a05aae484957ad20710444757bc0a61d63" }, - "nvim-lspconfig": { "branch": "master", "commit": "38de86f82efd9ba0881203767d6a8e1815abca28" }, + "nvim-lint": { "branch": "master", "commit": "1a3a8d047bc01f1760ae4a0f5e80f111ea222e67" }, + "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-spectre": { "branch": "master", "commit": "366f46fdd4a1593cc237aea13d5ef113739a472c" }, - "nvim-treesitter": { "branch": "master", "commit": "b91ae14fc3bb801c7ea69bc283fe860b32b5163d" }, - "nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" }, + "nvim-spectre": { "branch": "master", "commit": "4d22fe03554056de4325762add3e546c77e3a275" }, + "nvim-treesitter": { "branch": "master", "commit": "3a74b5831058d0daf8952a5b8c556c61b30a3f46" }, + "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" }, - "tokyonight.nvim": { "branch": "main", "commit": "0fae425aaab04a5f97666bd431b96f2f19c36935" }, - "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } + "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, + "tokyonight.nvim": { "branch": "main", "commit": "9d88650502bc331f43eb0bef6286e58144ac5a96" }, + "trouble.nvim": { "branch": "main", "commit": "39595e883e2f91456413ca4df287575d31665940" }, + "which-key.nvim": { "branch": "main", "commit": "0539da005b98b02cf730c1d9da82b8e8edb1c2d2" } } \ No newline at end of file From 90195c1cc3233e4ff7aef7851e0839748d07ead0 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 170/240] feat: revert to lualine --- lazy-lock.json | 2 +- lua/plugins/ui.lua | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 057ee4b..6f020aa 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -8,13 +8,13 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "conform.nvim": { "branch": "master", "commit": "069e971295a34a810484b7b2ef54b3c735214181" }, "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" }, - "feline.nvim": { "branch": "main", "commit": "8bc28b94a16304aad2f53b8c3653b14803748c28" }, "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, "gitsigns.nvim": { "branch": "main", "commit": "379a5a915aea3e9ba0d4a778e8478584ac0f9011" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, "lazy.nvim": { "branch": "main", "commit": "70f2c090d3ffb14f8702d468e05beb240b768881" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index e06e51b..ea17230 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,7 +1,15 @@ return { { - "freddiehaddad/feline.nvim", - opts = {}, + "nvim-lualine/lualine.nvim", + dependencies = { + "nvim-tree/nvim-web-devicons", + }, + opts = { + options = { + icons_enabled = true, + theme = "tokyonight", + }, + }, }, { "famiu/bufdelete.nvim", From 5793177a2a55a52c3097ea6894f4c8c71e8037bc Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:47 -0700 Subject: [PATCH 171/240] fix: trouble breaking changes v3 --- lua/plugins/editor.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 3e8f243..9fc1285 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -66,9 +66,15 @@ return { { "folke/trouble.nvim", dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - vim.keymap.set("n", "tt", ":TroubleToggle", { desc = "Toggle Trouble" }) - end, + opts = {}, + cmd = "Trouble", + keys = { + { + "tt", + "Trouble diagnostics toggle", + desc = "Toggle Trouble", + }, + }, }, { "folke/todo-comments.nvim", From 62d559db34bff06d6df3751a0702ce1438052fc4 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 172/240] fix: snippets not loading for nvim-cmp --- lazy-lock.json | 1 + lua/plugins/coding.lua | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 6f020aa..322a61d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -6,6 +6,7 @@ "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "conform.nvim": { "branch": "master", "commit": "069e971295a34a810484b7b2ef54b3c735214181" }, "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" }, "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 4fe3313..282ad3e 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -1,4 +1,5 @@ return { + { "saadparwaiz1/cmp_luasnip" }, { "hrsh7th/nvim-cmp", dependencies = { @@ -13,7 +14,6 @@ return { completion = { completeopt = "menu,menuone,noinsert", }, - mapping = cmp.mapping.preset.insert({ [""] = cmp.mapping.scroll_docs(-4), [""] = cmp.mapping.scroll_docs(4), @@ -44,6 +44,7 @@ return { sources = cmp.config.sources({ { name = "nvim_lsp" }, + { name = "nvim_lsp_signature_help" }, { name = "luasnip" }, }, { { name = "buffer" }, @@ -53,7 +54,19 @@ return { }, { "L3MON4D3/LuaSnip", - dependencies = { "rafamadriz/friendly-snippets" }, + dependencies = { + { + "rafamadriz/friendly-snippets", + config = function() + require("luasnip.loaders.from_vscode").lazy_load() + end, + }, + }, + build = "make install_jsregexp", + opts = { + history = true, + delete_check_events = "TextChanged", + }, }, { "echasnovski/mini.pairs", From 9f275c4f399a66c677e6114112b2ba4b72083bb4 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 173/240] feat: small tweak to nvim-cmp menu --- lua/plugins/coding.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 282ad3e..03fecd5 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -14,6 +14,12 @@ return { 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), From 1c3486a1eb4788485415e1f74b9570a94b09f93c Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 174/240] feat: update neo-tree config --- lazy-lock.json | 8 +++--- lua/plugins/editor.lua | 64 ++++++++++++++---------------------------- 2 files changed, 25 insertions(+), 47 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 322a61d..40d226a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,7 +13,7 @@ "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, "gitsigns.nvim": { "branch": "main", "commit": "379a5a915aea3e9ba0d4a778e8478584ac0f9011" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "70f2c090d3ffb14f8702d468e05beb240b768881" }, + "lazy.nvim": { "branch": "main", "commit": "89ddc59d19513c5c19c8f8d2ad8573890bd00eef" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, @@ -36,12 +36,12 @@ "nvim-treesitter": { "branch": "master", "commit": "3a74b5831058d0daf8952a5b8c556c61b30a3f46" }, "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, - "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, + "nvim-web-devicons": { "branch": "master", "commit": "b4b302d6ae229f67df7a87ef69fa79473fe788a9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, "tokyonight.nvim": { "branch": "main", "commit": "9d88650502bc331f43eb0bef6286e58144ac5a96" }, - "trouble.nvim": { "branch": "main", "commit": "39595e883e2f91456413ca4df287575d31665940" }, - "which-key.nvim": { "branch": "main", "commit": "0539da005b98b02cf730c1d9da82b8e8edb1c2d2" } + "trouble.nvim": { "branch": "main", "commit": "791278e498e1147520e4214982767f77ca4a99df" }, + "which-key.nvim": { "branch": "main", "commit": "ccf027625df6c4e22febfdd786c5e1f7521c2ccb" } } \ No newline at end of file diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 9fc1285..7dfa40e 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -8,51 +8,29 @@ return { "nvim-tree/nvim-web-devicons", "MunifTanjim/nui.nvim", }, - config = function() - vim.keymap.set("n", "ee", ":Neotree toggle", { desc = "Toggle Neotree" }) - vim.keymap.set("n", "er", ":Neotree reveal", { desc = "Reveal file" }) - - local nt = require("neo-tree") - - nt.setup({ - open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, - filesystem = { - filtered_items = { - show_hidden_count = false, - hide_dotfiles = false, - hide_gitignored = true, - always_show = { - ".env", - ".env.local", - }, - never_show = { - ".git", - "thumbs.db", - ".DS_Store", - }, + keys = { + { "ee", "Neotree toggle", desc = "Toggle Neotree" }, + { "er", "Neotree reveal", desc = "Reveal file" }, + }, + opts = { + open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, + filesystem = { + filtered_items = { + show_hidden_count = false, + hide_dotfiles = false, + hide_gitignored = true, + always_show = { + ".env", + ".env.local", + }, + never_show = { + ".git", + "thumbs.db", + ".DS_Store", }, }, - window = { - mappings = { - ["m"] = { - "move", - config = { - show_path = "relative", - }, - }, - }, - }, - event_handlers = { - { - event = "neo_tree_popup_input_ready", - handler = function() - -- Switch to normal inside popups by default. - vim.cmd.stopinsert() - end, - }, - }, - }) - end, + }, + }, }, { "folke/which-key.nvim", From 4edd4ea0542298e28475f1b64bbb9955a035739a Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 175/240] feat: update telescope config --- lazy-lock.json | 2 +- lua/plugins/editor.lua | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 40d226a..f7dcf10 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -39,7 +39,7 @@ "nvim-web-devicons": { "branch": "master", "commit": "b4b302d6ae229f67df7a87ef69fa79473fe788a9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, "tokyonight.nvim": { "branch": "main", "commit": "9d88650502bc331f43eb0bef6286e58144ac5a96" }, "trouble.nvim": { "branch": "main", "commit": "791278e498e1147520e4214982767f77ca4a99df" }, diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 7dfa40e..9905e90 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -75,7 +75,7 @@ return { }, { "nvim-telescope/telescope.nvim", - tag = "0.1.5", + tag = "0.1.6", dependencies = { "nvim-lua/plenary.nvim" }, config = function() local builtin = require("telescope.builtin") @@ -93,9 +93,6 @@ return { "nvim-telescope/telescope-ui-select.nvim", config = function() require("telescope").setup({ - defaults = { - initial_mode = "normal", - }, extensions = { ["ui-select"] = { require("telescope.themes").get_dropdown({}), From 1b55bf3fdde9a62377acc2baee00a3244417f902 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 176/240] feat: redo telescope keybinds --- lua/plugins/editor.lua | 48 ++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 9905e90..f7c84ff 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -77,17 +77,43 @@ return { "nvim-telescope/telescope.nvim", tag = "0.1.6", dependencies = { "nvim-lua/plenary.nvim" }, - config = function() - local builtin = require("telescope.builtin") - - vim.keymap.set("n", "ff", builtin.git_files, { desc = "Search git_files" }) - vim.keymap.set("n", "fg", builtin.live_grep, { desc = "Grep git_files" }) - vim.keymap.set("n", "fh", builtin.help_tags, { desc = "View help tags" }) - vim.keymap.set("n", "fb", builtin.buffers, { desc = "Search buffers" }) - vim.keymap.set("n", "sk", builtin.keymaps, { desc = "View keymaps" }) - vim.keymap.set("n", "sR", builtin.resume, { desc = "Resume" }) - vim.keymap.set("n", "st", "TodoTelescope", { desc = "Search TODOs" }) - end, + keys = { + { + "ff", + "lua require'telescope.builtin'.git_files{}", + desc = "Search git_files", + }, + { + "fg", + "lua require'telescope.builtin'.live_grep{}", + desc = "Grep git_files", + }, + { + "fh", + "lua require'telescope.builtin'.help_tags{}", + desc = "View help tags", + }, + { + "fb", + "lua require'telescope.builtin'.buffers{}", + desc = "Search buffers", + }, + { + "sk", + "lua require'telescope.builtin'.keymaps{}", + desc = "View keymaps", + }, + { + "sR", + "lua require'telescope.builtin'.resume{}", + desc = "Resume", + }, + { + "st", + "TodoTelescope", + desc = "Search TODOs", + }, + }, }, { "nvim-telescope/telescope-ui-select.nvim", From da5f2dec55f52ce8b0ffc632a61fef344f49fe19 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 177/240] feat: autopairs is working --- lua/plugins/treesitter.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index f1fbb6f..a79cfc6 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -33,9 +33,10 @@ return { }, }, { - -- TODO: Figure out why this plugin is not working. "windwp/nvim-autopairs", - event = "VeryLazy", - opts = {}, + event = "InsertEnter", + opts = { + disable_filetype = { "TelescopePrompt" }, + }, }, } From 281522365819faa08a26789e5d22fbe96c2661c4 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 178/240] feat: colorscheme tweak --- lua/plugins/colorscheme.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index fd432b5..3aa8984 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -5,6 +5,7 @@ return { opts = { style = "storm", dim_inactive = true, + terminal_colors = true, }, }, { From 6c1d945cab9405b9cec6f341225a4aaa61b3a984 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 179/240] feat: switch to none-ls --- lazy-lock.json | 2 +- lua/plugins/linting.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index f7dcf10..fcb9d88 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -25,8 +25,8 @@ "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "noice.nvim": { "branch": "main", "commit": "29c7f030b0920e2f17263a9ab8742cde144b9140" }, + "none-ls.nvim": { "branch": "main", "commit": "8691504118b252d64fc5023a104aedd100ab754a" }, "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, - "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-lint": { "branch": "master", "commit": "1a3a8d047bc01f1760ae4a0f5e80f111ea222e67" }, diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua index 99d4ad2..087ba3e 100644 --- a/lua/plugins/linting.lua +++ b/lua/plugins/linting.lua @@ -26,7 +26,7 @@ return { end, }, { - "jose-elias-alvarez/null-ls.nvim", + "nvimtools/none-ls.nvim", event = { "BufWritePost", "BufReadPost", "InsertLeave" }, opts = function() local null_ls = require("null-ls") From 87c3b7698359e7177068360f206d789c55a70ac1 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 180/240] feat: ensure eslint is added to lsp servers --- lua/plugins/lsp.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 037ace4..3cf85e7 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -37,6 +37,7 @@ return { }, opts = { servers = { + eslint = {}, tsserver = {}, lua_ls = {}, }, From 7a1351277e38e2ab5f5a27ab4123be490815a3f0 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 181/240] feat: add autotags plugin --- lazy-lock.json | 1 + lua/plugins/treesitter.lua | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/lazy-lock.json b/lazy-lock.json index fcb9d88..e801ed9 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -35,6 +35,7 @@ "nvim-spectre": { "branch": "master", "commit": "4d22fe03554056de4325762add3e546c77e3a275" }, "nvim-treesitter": { "branch": "master", "commit": "3a74b5831058d0daf8952a5b8c556c61b30a3f46" }, "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, + "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, "nvim-web-devicons": { "branch": "master", "commit": "b4b302d6ae229f67df7a87ef69fa79473fe788a9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index a79cfc6..7fa7c7e 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -39,4 +39,16 @@ return { disable_filetype = { "TelescopePrompt" }, }, }, + { + "windwp/nvim-ts-autotag", + event = "VeryLazy", + ft = { + "javascript", + "javascriptreact", + "typescript", + "typescriptreact", + "html", + }, + opts = {}, + }, } From cb71c887d7232021ff0859d9e813acc458a72462 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 182/240] feat: add filetypes configuration --- init.lua | 1 + lua/filetypes.lua | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 lua/filetypes.lua diff --git a/init.lua b/init.lua index c602a71..19f8a58 100644 --- a/init.lua +++ b/init.lua @@ -32,5 +32,6 @@ end require("lazy").setup("plugins") require("keybinds") require("autocmds") +require("filetypes") vim.cmd.colorscheme("tokyonight") diff --git a/lua/filetypes.lua b/lua/filetypes.lua new file mode 100644 index 0000000..587b138 --- /dev/null +++ b/lua/filetypes.lua @@ -0,0 +1,5 @@ +vim.filetype.add({ + extension = { + njk = "html", + }, +}) From a932a143f9d3fecebc99d0aadfb41c4ddb021e59 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 183/240] feat: add cssls --- lua/plugins/lsp.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 3cf85e7..7fa9f0b 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -7,6 +7,7 @@ return { "williamboman/mason-lspconfig.nvim", opts = { ensure_installed = { + "cssls", "lua_ls", "tsserver", "html", @@ -37,6 +38,7 @@ return { }, opts = { servers = { + cssls = {}, eslint = {}, tsserver = {}, lua_ls = {}, From 9476c683989c5adbca9f784db3381b99c03887de Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 184/240] chore: plugin update --- lazy-lock.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index e801ed9..69e1ceb 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "2b6860d15aaab01d3fb90859c0ba97f20ad7bc5f" }, + "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, @@ -11,12 +11,12 @@ "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" }, "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, - "gitsigns.nvim": { "branch": "main", "commit": "379a5a915aea3e9ba0d4a778e8478584ac0f9011" }, + "gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "89ddc59d19513c5c19c8f8d2ad8573890bd00eef" }, + "lazy.nvim": { "branch": "main", "commit": "eb4957442e3182f051b0ae11da32e06d22c190e3" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "8db12610bcb7ce67013cfdfaba4dd47a23c6e851" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, "mini.comment": { "branch": "main", "commit": "c8406379987c321ecdef9f53e1ca741a55002104" }, @@ -24,16 +24,16 @@ "mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" }, "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "noice.nvim": { "branch": "main", "commit": "29c7f030b0920e2f17263a9ab8742cde144b9140" }, + "noice.nvim": { "branch": "main", "commit": "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64" }, "none-ls.nvim": { "branch": "main", "commit": "8691504118b252d64fc5023a104aedd100ab754a" }, "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, - "nvim-lint": { "branch": "master", "commit": "1a3a8d047bc01f1760ae4a0f5e80f111ea222e67" }, + "nvim-lint": { "branch": "master", "commit": "cf6ffafe158441b8c5e2051ab0fe5b1983527ba7" }, "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "4d22fe03554056de4325762add3e546c77e3a275" }, - "nvim-treesitter": { "branch": "master", "commit": "3a74b5831058d0daf8952a5b8c556c61b30a3f46" }, + "nvim-treesitter": { "branch": "master", "commit": "c5cbd3ec74f6f5ddbac939e6f24b99fe78262b4c" }, "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, @@ -42,7 +42,7 @@ "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, - "tokyonight.nvim": { "branch": "main", "commit": "9d88650502bc331f43eb0bef6286e58144ac5a96" }, - "trouble.nvim": { "branch": "main", "commit": "791278e498e1147520e4214982767f77ca4a99df" }, - "which-key.nvim": { "branch": "main", "commit": "ccf027625df6c4e22febfdd786c5e1f7521c2ccb" } + "tokyonight.nvim": { "branch": "main", "commit": "02e9028fe3560f38363c2d38f1c87e45eb04fdb3" }, + "trouble.nvim": { "branch": "main", "commit": "c11dc2777d52da2c8da25836817e43608ec951a5" }, + "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } } \ No newline at end of file From b10d82478f36ca3106722b3e1b741e6f61a0ebe0 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 185/240] fix: exclude html snippets The autotag plugin can handle the majority of these snippets for me, so I'm happy to omit them so they don't conflict with each other. --- lua/plugins/coding.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 03fecd5..37e415e 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -64,7 +64,9 @@ return { { "rafamadriz/friendly-snippets", config = function() - require("luasnip.loaders.from_vscode").lazy_load() + require("luasnip.loaders.from_vscode").lazy_load({ + exclude = { "html" }, + }) end, }, }, From 3470b40bbe626c996075e3715c5692526f7e43a8 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 186/240] fix: adjust lsp config --- lua/plugins/lsp.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 7fa9f0b..5f1ff37 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -8,9 +8,11 @@ return { opts = { ensure_installed = { "cssls", + "eslint", "lua_ls", "tsserver", "html", + "vale_ls", }, }, }, @@ -19,12 +21,10 @@ return { opts = { ensure_installed = { "djlint", - "eslint", - "eslint_d", "prettierd", "stylua", - "vale", }, + auto_update = true, automatic_installation = true, }, }, From 23ac8f356507edf6895e01ee1508941956efb303 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 187/240] feat: remove none-ls I figured out how to make Vale work with nvim-lint which was my preference. --- lua/plugins/linting.lua | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua index 087ba3e..85a8160 100644 --- a/lua/plugins/linting.lua +++ b/lua/plugins/linting.lua @@ -5,6 +5,7 @@ return { events = { "BufWritePost", "BufReadPost", "InsertLeave" }, linters_by_ft = { html = { "djlint" }, + markdown = { "vale" }, javascript = { "eslint" }, typescript = { "eslint" }, javascriptreact = { "eslint" }, @@ -25,17 +26,4 @@ return { }) end, }, - { - "nvimtools/none-ls.nvim", - event = { "BufWritePost", "BufReadPost", "InsertLeave" }, - opts = function() - local null_ls = require("null-ls") - local diagnostics = null_ls.builtins.diagnostics - return { - sources = { - diagnostics.vale, - }, - } - end, - }, } From 81098d8126a71368be5ab3c85ee6ca7926961dae Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 188/240] feat: add yml and toml language servers --- lua/plugins/lsp.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 5f1ff37..7cc9d31 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -9,10 +9,12 @@ return { ensure_installed = { "cssls", "eslint", - "lua_ls", - "tsserver", "html", + "lua_ls", + "taplo", -- .toml + "tsserver", "vale_ls", + "yamlls", -- .yml }, }, }, @@ -40,8 +42,11 @@ return { servers = { cssls = {}, eslint = {}, - tsserver = {}, + html = {}, lua_ls = {}, + taplo = {}, + tsserver = {}, + yamlls = {}, }, }, config = function(_, opts) From 95bcd00efb4d414da615947130b9bc3f1578702e Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 189/240] feat: use vale-ls for formatting This still requires the Vale CLI which is installed. --- lua/plugins/lsp.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 7cc9d31..a8a7799 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -25,6 +25,7 @@ return { "djlint", "prettierd", "stylua", + "vale", -- Vale CLI }, auto_update = true, automatic_installation = true, @@ -46,6 +47,7 @@ return { lua_ls = {}, taplo = {}, tsserver = {}, + vale_ls = {}, yamlls = {}, }, }, From 28edccb0e07168c922dc6b29a79ff15c0a828271 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 190/240] fix: remove vale from linters The language server will take care of this now, don't need it. --- lua/plugins/linting.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua index 85a8160..41239a5 100644 --- a/lua/plugins/linting.lua +++ b/lua/plugins/linting.lua @@ -5,7 +5,6 @@ return { events = { "BufWritePost", "BufReadPost", "InsertLeave" }, linters_by_ft = { html = { "djlint" }, - markdown = { "vale" }, javascript = { "eslint" }, typescript = { "eslint" }, javascriptreact = { "eslint" }, From 72c53309da010d8191f908e98485d50d3d7f7e6c Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 191/240] chore: update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 3c54a5d..164cd2b 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,12 @@ Uses [lazy.nvim][lazynvim] to manage plugins. It's pretty opinionated. You might not like it. +## Who is this geared for? + +I'm a web developer, so this setup is configured for that environment. Anyone who works with React (and Native), JavaScript/TypeScript, CSS, HTML, etc. + +I've also added some plugins for writing in Markdown as I prefer it. + ## Installation 1. Clone this repo into Neovim's config folder. From 1bd292d4740b97d1e5e2689b41f028e2b0dac6ee Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 192/240] chore: remove @type --- lua/plugins/editor.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index f7c84ff..245f1a0 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -132,7 +132,6 @@ return { { "folke/flash.nvim", event = "VeryLazy", - ---@type Flash.Config opts = {}, -- stylua: ignore keys = { From 9d16a788683e8f45113eee22e58b40c9047ad247 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 193/240] chore: tidy up alpha --- lua/plugins/ui.lua | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index ea17230..1b8c49c 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -125,29 +125,29 @@ return { -- https://github.com/MaximilianLloyd/ascii.nvim dashboard.section.header.val = { - " ", - " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", - " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", - " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", - " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", - " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", - " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", - " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", - " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", - " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", - " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", - " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", - " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", - " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", - " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", - " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", - " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", - " ▄█████████▄▄ ", - " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", - " ▄▄█████▀▀▀▀ ▀■ ", - " ▄███▀▀▀▀ ", - " ■▀▀ ", - " ", + " ", + " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", + " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", + " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", + " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", + " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", + " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", + " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", + " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", + " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", + " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", + " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", + " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", + " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", + " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", + " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", + " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", + " ▄█████████▄▄ ", + " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", + " ▄▄█████▀▀▀▀ ▀■ ", + " ▄███▀▀▀▀ ", + " ■▀▀ ", + " ", } dashboard.section.buttons.val = { From 752e6c1cd224f95779fb6f04fa9d69ede8581447 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 194/240] chore: plugin update --- lazy-lock.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 69e1ceb..ce1021c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -25,11 +25,10 @@ "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "noice.nvim": { "branch": "main", "commit": "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64" }, - "none-ls.nvim": { "branch": "main", "commit": "8691504118b252d64fc5023a104aedd100ab754a" }, "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, - "nvim-lint": { "branch": "master", "commit": "cf6ffafe158441b8c5e2051ab0fe5b1983527ba7" }, + "nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" }, "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "4d22fe03554056de4325762add3e546c77e3a275" }, @@ -43,6 +42,6 @@ "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, "tokyonight.nvim": { "branch": "main", "commit": "02e9028fe3560f38363c2d38f1c87e45eb04fdb3" }, - "trouble.nvim": { "branch": "main", "commit": "c11dc2777d52da2c8da25836817e43608ec951a5" }, + "trouble.nvim": { "branch": "main", "commit": "38915023a777b7f2422e503dc603f6a64b465bf5" }, "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } } \ No newline at end of file From c44f02f9d7afefd385704900eb4e2458c9c8694f Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 195/240] feat: add floating terminal plugin --- lua/keybinds.lua | 15 +++++++++++---- lua/plugins/ui.lua | 11 +++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index c7baf36..c89b74d 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -1,7 +1,7 @@ -vim.keymap.set("n", "", "", { desc = "Go to split on left" }) -vim.keymap.set("n", "", "", { desc = "Go to split above" }) -vim.keymap.set("n", "", "", { desc = "Go to split below" }) -vim.keymap.set("n", "", "", { desc = "Go to split on right" }) +vim.keymap.set("n", "", "wincmd h", { desc = "Go to split on left" }) +vim.keymap.set("n", "", "wincmd j", { desc = "Go to split above" }) +vim.keymap.set("n", "", "wincmd k", { desc = "Go to split below" }) +vim.keymap.set("n", "", "wincmd l", { desc = "Go to split on right" }) vim.keymap.set("n", "|", "v", { desc = "Split window right" }) vim.keymap.set("n", "-", "s", { desc = "Split window below" }) @@ -19,3 +19,10 @@ vim.keymap.set("n", "y", '"*y', { desc = "Yank into system clipboard" }) vim.keymap.set("v", "y", '"*y', { desc = "Yank into system clipboard" }) vim.keymap.set("i", "jk", "", { desc = "Exit insert mode" }) + +vim.keymap.set("t", "", "", { desc = "Exit insert mode (Terminal)" }) +vim.keymap.set("t", "jk", "", { desc = "Exit insert mode (Terminal)" }) +vim.keymap.set("t", "", "wincmd h", { desc = "Go to split on left (Terminal)" }) +vim.keymap.set("t", "", "wincmd j", { desc = "Go to split above (Terminal)" }) +vim.keymap.set("t", "", "wincmd k", { desc = "Go to split below (Terminal)" }) +vim.keymap.set("t", "", "wincmd l", { desc = "Go to split on right (Terminal)" }) diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 1b8c49c..9203729 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -159,4 +159,15 @@ return { alpha.setup(dashboard.opts) end, }, + { + "akinsho/toggleterm.nvim", + opts = {}, + keys = { + { + "T", + "ToggleTerm direction=float", + desc = "Open floating terminal", + }, + }, + }, } From 9399750ad8c261d56fa700cc8c6fabc11a22c9cc Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 196/240] chore: add plugin to lazy-lock --- lazy-lock.json | 1 + 1 file changed, 1 insertion(+) diff --git a/lazy-lock.json b/lazy-lock.json index ce1021c..4cda85d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -41,6 +41,7 @@ "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, + "toggleterm.nvim": { "branch": "main", "commit": "fee58a0473fd92b28c34f8f724e4918b15ba30a3" }, "tokyonight.nvim": { "branch": "main", "commit": "02e9028fe3560f38363c2d38f1c87e45eb04fdb3" }, "trouble.nvim": { "branch": "main", "commit": "38915023a777b7f2422e503dc603f6a64b465bf5" }, "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } From ba69d9c025cebf4343032d7b86ac1626a0994a24 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 197/240] feat: add proselint This also removes vale from my config. I was annoyed at how much setup vale needed before it could work, and find that proselint does what I want without the extras of vale. --- README.md | 7 +------ lua/plugins/linting.lua | 1 + lua/plugins/lsp.lua | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 164cd2b..ff6f2a2 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Uses [lazy.nvim][lazynvim] to manage plugins. -It's pretty opinionated. You might not like it. +It's opinionated. You might not like it. ## Who is this geared for? @@ -16,9 +16,4 @@ I've also added some plugins for writing in Markdown as I prefer it. 2. Run Neovim. 3. Wait for everything to install. -# Post Installation - -- `vale` requires a configuration file to work. [Make sure one is present][valeconfig]. You may also need to run `vale sync` after adding it (if installed using Mason, make sure to run the binary installed by Mason and not the global one, if present). - [lazynvim]: https://github.com/folke/lazy.nvim -[valeconfig]: https://vale.sh/docs/topics/config/#global-configuration diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua index 41239a5..f441d4d 100644 --- a/lua/plugins/linting.lua +++ b/lua/plugins/linting.lua @@ -5,6 +5,7 @@ return { events = { "BufWritePost", "BufReadPost", "InsertLeave" }, linters_by_ft = { html = { "djlint" }, + markdown = { "proselint" }, javascript = { "eslint" }, typescript = { "eslint" }, javascriptreact = { "eslint" }, diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index a8a7799..c34003c 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -13,7 +13,6 @@ return { "lua_ls", "taplo", -- .toml "tsserver", - "vale_ls", "yamlls", -- .yml }, }, @@ -24,8 +23,8 @@ return { ensure_installed = { "djlint", "prettierd", + "proselint", "stylua", - "vale", -- Vale CLI }, auto_update = true, automatic_installation = true, @@ -47,7 +46,6 @@ return { lua_ls = {}, taplo = {}, tsserver = {}, - vale_ls = {}, yamlls = {}, }, }, From 9c64eaf5f4d23ed3d3cd2cd35710d8e414874078 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 198/240] feat: remove unused plugins --- lua/plugins/treesitter.lua | 7 ------- lua/plugins/ui.lua | 5 ----- 2 files changed, 12 deletions(-) diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 7fa7c7e..0f277eb 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -32,13 +32,6 @@ return { max_lines = 2, }, }, - { - "windwp/nvim-autopairs", - event = "InsertEnter", - opts = { - disable_filetype = { "TelescopePrompt" }, - }, - }, { "windwp/nvim-ts-autotag", event = "VeryLazy", diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 9203729..a8c4e1f 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -92,11 +92,6 @@ return { }) end, }, - { - "stevearc/dressing.nvim", - event = "VeryLazy", - opts = {}, - }, { "rcarriga/nvim-notify", opts = { From 207d41651a0028472e28cf051608afd80abc0ba4 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 199/240] feat: revise config for markdown etc --- lazy-lock.json | 2 -- lua/autocmds.lua | 11 ++++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 4cda85d..e327bb4 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -8,7 +8,6 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "conform.nvim": { "branch": "master", "commit": "069e971295a34a810484b7b2ef54b3c735214181" }, - "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" }, "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, "gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" }, @@ -26,7 +25,6 @@ "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "noice.nvim": { "branch": "main", "commit": "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64" }, "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, - "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" }, "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" }, diff --git a/lua/autocmds.lua b/lua/autocmds.lua index 260e358..17c3268 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -7,6 +7,15 @@ vim.api.nvim_create_autocmd({ "FileType" }, { pattern = { "gitcommit", "markdown", "md", "mdx" }, callback = function() vim.opt_local.spell = true - vim.opt_local.wrap = true + end, +}) + +vim.api.nvim_create_autocmd({ "FileType" }, { + group = augroup("prose"), + pattern = { "gitcommit", "markdown", "md", "mdx" }, + callback = function() + vim.opt_local.wrap = true + vim.opt_local.textwidth = 80 + vim.opt_local.linebreak = true end, }) From 591fbe55f43b5afa99afe5c41d7e3e8159bcb611 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 200/240] feat: update lualine config --- lua/plugins/ui.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index a8c4e1f..4a231dd 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -8,6 +8,21 @@ return { options = { icons_enabled = true, theme = "tokyonight", + component_separators = { left = "", right = "" }, + section_separators = { left = "", right = "" }, + }, + sections = { + lualine_c = { + { + "filename", + file_status = true, + path = 1, + symbols = { + modified = "●", + }, + }, + }, + lualine_x = { "filetype" }, }, }, }, From ede0f98bf8b180a761576e7c4a3e8c415e724fab Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 201/240] feat: remove bufferline --- lazy-lock.json | 2 -- lua/plugins/ui.lua | 28 ---------------------------- 2 files changed, 30 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index e327bb4..12ce6e6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,8 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, - "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 4a231dd..0d8bf45 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -26,34 +26,6 @@ return { }, }, }, - { - "famiu/bufdelete.nvim", - keys = { - { "bd", "Bdelete", desc = "Close Buffer" }, - }, - }, - { - "akinsho/bufferline.nvim", - event = "VeryLazy", - keys = { - { "bp", "BufferLineTogglePin", desc = "Toggle Pin" }, - { "[b", "BufferLineCyclePrev", desc = "Prev Buffer" }, - { "]b", "BufferLineCycleNext", desc = "Next Buffer" }, - }, - opts = { - options = { - diagnostics = "nvim_lsp", - offsets = { - { - filetype = "neo-tree", - text = "", - highlight = "Directory", - text_align = "left", - }, - }, - }, - }, - }, { "lukas-reineke/indent-blankline.nvim", opts = { From 226b432bed179b12cffd4daf4bea26b98c9f54fe Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 202/240] feat: add toml formatting --- lua/plugins/formatting.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index c5b7efc..82c9b4a 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -11,11 +11,26 @@ return { javascriptreact = { "prettierd" }, json = { "prettierd" }, jsonc = { "prettierd" }, + toml = { "taplo" }, typescript = { "prettierd" }, typescriptreact = { "prettierd" }, }, format_on_save = { lsp_fallback = true, }, + formatters = { + taplo = { + args = function() + -- conform.nvim does not parse bash envvars, so we do it ourselves + local CONFIG_PATH = os.getenv("HOME") .. "/.config/taplo/taplo.toml" + return { + "format", + "--config", + CONFIG_PATH, + "-", + } + end, + }, + }, }, } From aa083b45ff8b0eadf37c6fed84e2892d909f69e6 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 203/240] chore: plugin update --- lazy-lock.json | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 12ce6e6..9a3b5b3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,44 +1,44 @@ { "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" }, + "catppuccin": { "branch": "main", "commit": "67565cd353fa543fa30cb738570c2e4c87da3e9c" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "069e971295a34a810484b7b2ef54b3c735214181" }, + "conform.nvim": { "branch": "master", "commit": "9a06e83527407a7600a2fe4e0d10adf432b6215e" }, "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, - "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" }, - "gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" }, + "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, + "gitsigns.nvim": { "branch": "main", "commit": "8df63f2ddc615feb71fd4aee45a4cee022876df1" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "eb4957442e3182f051b0ae11da32e06d22c190e3" }, + "lazy.nvim": { "branch": "main", "commit": "bc620783663ab09d16bff9fdecc07da65b2a1528" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "8db12610bcb7ce67013cfdfaba4dd47a23c6e851" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.comment": { "branch": "main", "commit": "c8406379987c321ecdef9f53e1ca741a55002104" }, - "mini.indentscope": { "branch": "main", "commit": "f0d7faa064c892b96997810afcddfadc3f2a15b3" }, - "mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" }, - "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" }, + "mini.comment": { "branch": "main", "commit": "0b4ff4f594bc7d87a9e796e30760bf784b769f6d" }, + "mini.indentscope": { "branch": "main", "commit": "f15c61e71318b16c6616c2ace907136b76674f13" }, + "mini.pairs": { "branch": "main", "commit": "49edfefffeac6a339753339c3482dec33903b43a" }, + "mini.surround": { "branch": "main", "commit": "99eb6175801434d26496e81e47632d4e4543994a" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "noice.nvim": { "branch": "main", "commit": "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64" }, - "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, - "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, + "noice.nvim": { "branch": "main", "commit": "88ac36864b5976a64b14a8f156c616f41b32f228" }, + "nui.nvim": { "branch": "main", "commit": "a2bc1e9d0359caa5d11ad967cd1e30e8d4676226" }, + "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, "nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" }, - "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" }, + "nvim-lspconfig": { "branch": "master", "commit": "0630abde4d99740773b6f7da70937268c20854a4" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-spectre": { "branch": "master", "commit": "4d22fe03554056de4325762add3e546c77e3a275" }, - "nvim-treesitter": { "branch": "master", "commit": "c5cbd3ec74f6f5ddbac939e6f24b99fe78262b4c" }, + "nvim-spectre": { "branch": "master", "commit": "ec67d4b5370094b923dfcf6b09b39142f2964861" }, + "nvim-treesitter": { "branch": "master", "commit": "122b4d3db1616c1f1305b847c5ed2217c4c329f1" }, "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, - "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" }, + "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, - "nvim-web-devicons": { "branch": "master", "commit": "b4b302d6ae229f67df7a87ef69fa79473fe788a9" }, + "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, - "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" }, + "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, "toggleterm.nvim": { "branch": "main", "commit": "fee58a0473fd92b28c34f8f724e4918b15ba30a3" }, - "tokyonight.nvim": { "branch": "main", "commit": "02e9028fe3560f38363c2d38f1c87e45eb04fdb3" }, - "trouble.nvim": { "branch": "main", "commit": "38915023a777b7f2422e503dc603f6a64b465bf5" }, + "tokyonight.nvim": { "branch": "main", "commit": "81c867c5f638597a82c82094dcb90ed42444dabc" }, + "trouble.nvim": { "branch": "main", "commit": "82042f7bf42ebedc8f2751f0ab16ebaff42c1ce7" }, "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } } \ No newline at end of file From 67ca1fb784f830feed5fd288f833fa0ca1e7f57c Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 204/240] feat: disable treesitter-context This plugin is flooding my editor with errors when editing Markdown files. Disabling for now until I can look into it more. --- lazy-lock.json | 1 - lua/plugins/treesitter.lua | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 9a3b5b3..664ab00 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -29,7 +29,6 @@ "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "ec67d4b5370094b923dfcf6b09b39142f2964861" }, "nvim-treesitter": { "branch": "master", "commit": "122b4d3db1616c1f1305b847c5ed2217c4c329f1" }, - "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 0f277eb..3dcacaf 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -26,12 +26,12 @@ return { require("nvim-treesitter.configs").setup(opts) end, }, - { - "nvim-treesitter/nvim-treesitter-context", - opts = { - max_lines = 2, - }, - }, + -- { + -- "nvim-treesitter/nvim-treesitter-context", + -- opts = { + -- max_lines = 2, + -- }, + -- }, { "windwp/nvim-ts-autotag", event = "VeryLazy", From 562760d400c9fa78b1351eae415fb0aa5dc2ba12 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 205/240] chore: plugin update --- lazy-lock.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 664ab00..329b5a3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,34 +1,34 @@ { - "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, + "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "catppuccin": { "branch": "main", "commit": "67565cd353fa543fa30cb738570c2e4c87da3e9c" }, + "catppuccin": { "branch": "main", "commit": "31fcfb02c47952d5c75aec893b93b2878abe5fbb" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "9a06e83527407a7600a2fe4e0d10adf432b6215e" }, + "conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" }, "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gitsigns.nvim": { "branch": "main", "commit": "8df63f2ddc615feb71fd4aee45a4cee022876df1" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "bc620783663ab09d16bff9fdecc07da65b2a1528" }, + "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" }, + "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "lazy.nvim": { "branch": "main", "commit": "d0921f5b9b3d2c5e09618da55a018228edcc4d16" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.comment": { "branch": "main", "commit": "0b4ff4f594bc7d87a9e796e30760bf784b769f6d" }, - "mini.indentscope": { "branch": "main", "commit": "f15c61e71318b16c6616c2ace907136b76674f13" }, - "mini.pairs": { "branch": "main", "commit": "49edfefffeac6a339753339c3482dec33903b43a" }, - "mini.surround": { "branch": "main", "commit": "99eb6175801434d26496e81e47632d4e4543994a" }, + "mini.comment": { "branch": "main", "commit": "080f00bb91fea4bab799820bd2ce835a88d0703a" }, + "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, + "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, + "mini.surround": { "branch": "main", "commit": "7098744c8d4573a4b32cb172965f6b2ba03465d2" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "noice.nvim": { "branch": "main", "commit": "88ac36864b5976a64b14a8f156c616f41b32f228" }, - "nui.nvim": { "branch": "main", "commit": "a2bc1e9d0359caa5d11ad967cd1e30e8d4676226" }, + "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, - "nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" }, - "nvim-lspconfig": { "branch": "master", "commit": "0630abde4d99740773b6f7da70937268c20854a4" }, + "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, + "nvim-lspconfig": { "branch": "master", "commit": "53a3c6444ec5006b567071614c83edc8ad651f6d" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-spectre": { "branch": "master", "commit": "ec67d4b5370094b923dfcf6b09b39142f2964861" }, - "nvim-treesitter": { "branch": "master", "commit": "122b4d3db1616c1f1305b847c5ed2217c4c329f1" }, + "nvim-spectre": { "branch": "master", "commit": "49fae98ef2bfa8342522b337892992e3495065d5" }, + "nvim-treesitter": { "branch": "master", "commit": "6cd4ce6cab184e8787f164a182954534221f2af2" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, @@ -36,8 +36,8 @@ "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, - "toggleterm.nvim": { "branch": "main", "commit": "fee58a0473fd92b28c34f8f724e4918b15ba30a3" }, - "tokyonight.nvim": { "branch": "main", "commit": "81c867c5f638597a82c82094dcb90ed42444dabc" }, - "trouble.nvim": { "branch": "main", "commit": "82042f7bf42ebedc8f2751f0ab16ebaff42c1ce7" }, + "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, + "tokyonight.nvim": { "branch": "main", "commit": "c16eaeb9eaf4eb307431e58ec6101eecf2dbe52d" }, + "trouble.nvim": { "branch": "main", "commit": "e5d0e04121c662ce29190a57dd03655d43c59d44" }, "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } } \ No newline at end of file From 21934155992c63fd55366775c98687e55ff25e49 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 206/240] chore: remove catppuccin colorscheme --- lazy-lock.json | 1 - lua/plugins/colorscheme.lua | 36 ------------------------------------ 2 files changed, 37 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 329b5a3..16efa76 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,7 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "catppuccin": { "branch": "main", "commit": "31fcfb02c47952d5c75aec893b93b2878abe5fbb" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 3aa8984..251512c 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -8,40 +8,4 @@ return { terminal_colors = true, }, }, - { - "catppuccin/nvim", - name = "catppuccin", - priority = 1000, - opts = { - default_integrations = true, - dim_inactive = { - enabled = true, - }, - flavour = "macchiato", - integrations = { - alpha = true, - cmp = true, - flash = true, - gitsigns = true, - lsp_trouble = true, - native_lsp = { - enabled = true, - underlines = { - errors = { "undercurl" }, - hints = { "undercurl" }, - warnings = { "undercurl" }, - information = { "undercurl" }, - }, - }, - neotree = true, - noice = true, - telescope = { - enabled = true, - }, - treesitter = true, - treesitter_context = true, - which_key = true, - }, - }, - }, } From 9cb0684132b1c476fea03d22c3d71f0be2b05eb1 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 207/240] fix: remove linebreak and textwidth opts This was causing more issues than solving, so I'm getting rid of it. --- lua/autocmds.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/lua/autocmds.lua b/lua/autocmds.lua index 17c3268..c65d83b 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -15,7 +15,5 @@ vim.api.nvim_create_autocmd({ "FileType" }, { pattern = { "gitcommit", "markdown", "md", "mdx" }, callback = function() vim.opt_local.wrap = true - vim.opt_local.textwidth = 80 - vim.opt_local.linebreak = true end, }) From eabfd08e51a9cbdb7bb7e98989beff52401ed9a1 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 208/240] feat: add attempt.nvim This plugin is for creating new scratch windows. --- lazy-lock.json | 1 + lua/plugins/editor.lua | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/lazy-lock.json b/lazy-lock.json index 16efa76..671a5ae 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,7 @@ { "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, + "attempt.nvim": { "branch": "main", "commit": "3905db768478a2152fd927ab5a8def85bc2e34e7" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 245f1a0..2d11c4d 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -174,4 +174,20 @@ return { }, }, }, + { + "m-demare/attempt.nvim", + opts = { + ext_options = { "js", "lua" }, + }, + keys = function() + local attempt = require("attempt") + + return { + { "an", attempt.new_select, desc = "New attempt" }, + { "ar", attempt.run, desc = "Run attempt" }, + { "ad", attempt.delete_buf, desc = "Delete attempt buffer" }, + { "al", "Telescope attempt", desc = "Search attempts" }, + } + end, + }, } From f36215fb69fd8bce1f27112db966f489bf21eece Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 209/240] chore: plugin update --- lazy-lock.json | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 671a5ae..671b6bb 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -5,39 +5,39 @@ "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" }, - "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, - "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" }, + "conform.nvim": { "branch": "master", "commit": "25d48271e3d4404ba017cb92a37d3a681c1ad149" }, + "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, + "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, + "gitsigns.nvim": { "branch": "main", "commit": "f074844b60f9e151970fbcdbeb8a2cd52b6ef25a" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "d0921f5b9b3d2c5e09618da55a018228edcc4d16" }, - "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" }, + "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, - "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.comment": { "branch": "main", "commit": "080f00bb91fea4bab799820bd2ce835a88d0703a" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.comment": { "branch": "main", "commit": "03c13e37318bdb18481311c0ac1adc9ed731caf1" }, "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, - "mini.surround": { "branch": "main", "commit": "7098744c8d4573a4b32cb172965f6b2ba03465d2" }, + "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" }, + "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, + "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, - "nvim-lspconfig": { "branch": "master", "commit": "53a3c6444ec5006b567071614c83edc8ad651f6d" }, + "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-spectre": { "branch": "master", "commit": "49fae98ef2bfa8342522b337892992e3495065d5" }, - "nvim-treesitter": { "branch": "master", "commit": "6cd4ce6cab184e8787f164a182954534221f2af2" }, - "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, - "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, + "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, + "nvim-treesitter": { "branch": "master", "commit": "63be47f203d3e9174fdac3872fb9766e5bcc5a11" }, + "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, + "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, - "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, - "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, - "tokyonight.nvim": { "branch": "main", "commit": "c16eaeb9eaf4eb307431e58ec6101eecf2dbe52d" }, - "trouble.nvim": { "branch": "main", "commit": "e5d0e04121c662ce29190a57dd03655d43c59d44" }, - "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } + "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, + "toggleterm.nvim": { "branch": "main", "commit": "8ed0f52006d3207ec6c94de7db62da840937ef2a" }, + "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, + "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, + "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } } \ No newline at end of file From 3d1858b135364cf6d97fa53c5f4bffa04fb88970 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 210/240] feat: remove nvim-lint I found this plugin caused more issues than solved, so I'm dropping it in favour of using the ESLint LSP server instead. "EslintFixAll" covers the majority of my bases it seems. --- lua/plugins/linting.lua | 29 ----------------------------- lua/plugins/lsp.lua | 9 ++++++++- 2 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 lua/plugins/linting.lua diff --git a/lua/plugins/linting.lua b/lua/plugins/linting.lua deleted file mode 100644 index f441d4d..0000000 --- a/lua/plugins/linting.lua +++ /dev/null @@ -1,29 +0,0 @@ -return { - { - "mfussenegger/nvim-lint", - opts = { - events = { "BufWritePost", "BufReadPost", "InsertLeave" }, - linters_by_ft = { - html = { "djlint" }, - markdown = { "proselint" }, - javascript = { "eslint" }, - typescript = { "eslint" }, - javascriptreact = { "eslint" }, - typescriptreact = { "eslint" }, - }, - }, - config = function(_, opts) - local lint = require("lint") - lint.linters_by_ft = opts.linters_by_ft - - local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) - - vim.api.nvim_create_autocmd(opts.events, { - group = lint_augroup, - callback = function() - lint.try_lint() - end, - }) - end, - }, -} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index c34003c..1b4c2aa 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -41,7 +41,14 @@ return { opts = { servers = { cssls = {}, - eslint = {}, + eslint = { + on_attach = function(_, bufnr) + vim.api.nvim_create_autocmd("BufWritePre", { + buffer = bufnr, + command = "EslintFixAll", + }) + end, + }, html = {}, lua_ls = {}, taplo = {}, From d911c92077c7299d5242368c412f9eb342af49b5 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 211/240] feat: remove nvim-ts-context-commentstring Added folke's ts-comments.nvim as it is simpler and works the same. --- lazy-lock.json | 5 ++--- lua/plugins/coding.lua | 18 +++--------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 671b6bb..3f4c6f4 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -24,13 +24,11 @@ "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, "nvim-treesitter": { "branch": "master", "commit": "63be47f203d3e9174fdac3872fb9766e5bcc5a11" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, @@ -39,5 +37,6 @@ "toggleterm.nvim": { "branch": "main", "commit": "8ed0f52006d3207ec6c94de7db62da840937ef2a" }, "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, + "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } -} \ No newline at end of file +} diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 37e415e..a32a6fa 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -101,20 +101,8 @@ return { }, }, { - "JoosepAlviste/nvim-ts-context-commentstring", - opts = { - enable_autocmd = false, - }, - }, - { - "echasnovski/mini.comment", - version = false, - opts = { - options = { - custom_commentstring = function() - return require("ts_context_commentstring.internal").calculate_commentstring() or vim.bo.commentstring - end, - }, - }, + "folke/ts-comments.nvim", + event = "VeryLazy", + opts = {}, }, } From 97d79ca59ef47e4a35b849f8f8c9492a6de1160c Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 212/240] feat: add keybinds for staging/resetting hunks --- lua/plugins/editor.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 2d11c4d..7b9b3c3 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -172,6 +172,18 @@ return { changedelete = { text = "▎" }, untracked = { text = "▎" }, }, + signs_staged = { + add = { text = "▎" }, + change = { text = "▎" }, + delete = { text = "" }, + topdelete = { text = "" }, + changedelete = { text = "▎" }, + }, + }, + keys = { + { "ghb", ":Gitsigns blame_line", desc = "Blame line" }, + { "ghs", ":Gitsigns stage_hunk", desc = "Stage hunk", mode = { "n", "v" } }, + { "ghr", ":Gitsigns reset_hunk", desc = "Reset hunk", mode = { "n", "v" } }, }, }, { From 0624ee76ad71b7cd7112080c2376f1ae8885a7a2 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 213/240] chore: clean plugins --- lazy-lock.json | 1 - 1 file changed, 1 deletion(-) diff --git a/lazy-lock.json b/lazy-lock.json index 3f4c6f4..f68eb97 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -16,7 +16,6 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.comment": { "branch": "main", "commit": "03c13e37318bdb18481311c0ac1adc9ed731caf1" }, "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" }, From a30b081497c17558b6ba0a6b433fc402ece8fcec Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 214/240] chore: update plugins --- lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index f68eb97..b224a3c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -23,10 +23,10 @@ "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, + "nvim-lspconfig": { "branch": "master", "commit": "f95d371c1a274f60392edfd8ea5121b42dca736e" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, - "nvim-treesitter": { "branch": "master", "commit": "63be47f203d3e9174fdac3872fb9766e5bcc5a11" }, + "nvim-treesitter": { "branch": "master", "commit": "e265fec94c7dc0c8c64cb86820ff5ad3ee135c7d" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, From f3161e1e6ad9b3eb834dbb98b14da9f682a0a3be Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 215/240] feat: add markdown.nvim --- lazy-lock.json | 5 +++-- lua/plugins/editor.lua | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index b224a3c..f6f695b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,6 +13,7 @@ "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, + "markdown.nvim": { "branch": "main", "commit": "b512df739f1565950f7c5119a8258ed756c94fd4" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, @@ -23,10 +24,10 @@ "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-lspconfig": { "branch": "master", "commit": "f95d371c1a274f60392edfd8ea5121b42dca736e" }, + "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, - "nvim-treesitter": { "branch": "master", "commit": "e265fec94c7dc0c8c64cb86820ff5ad3ee135c7d" }, + "nvim-treesitter": { "branch": "master", "commit": "63be47f203d3e9174fdac3872fb9766e5bcc5a11" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 7b9b3c3..d816832 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -202,4 +202,10 @@ return { } end, }, + { + "MeanderingProgrammer/markdown.nvim", + main = "render-markdown", + opts = {}, + dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-tree/nvim-web-devicons" }, + }, } From 57de4b94723536753b3264db8921831673c7dbe0 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 216/240] chore: update plugins --- lazy-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index f6f695b..faf02ab 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -24,12 +24,12 @@ "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, + "nvim-lspconfig": { "branch": "master", "commit": "fdc44768a09a65140aa00c92872a5381ad486485" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, - "nvim-treesitter": { "branch": "master", "commit": "63be47f203d3e9174fdac3872fb9766e5bcc5a11" }, + "nvim-treesitter": { "branch": "master", "commit": "a7ba147b4b51631f7cf7d9da56f7d5763073b18d" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, - "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, + "nvim-web-devicons": { "branch": "master", "commit": "5be6c4e685618b99c3210a69375b38a1202369b4" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, From c91349d875c086bcb20579f6480f36b9331c96e2 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 217/240] chore: update plugins --- lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index faf02ab..36763ac 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,20 +1,20 @@ { - "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, + "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "attempt.nvim": { "branch": "main", "commit": "3905db768478a2152fd927ab5a8def85bc2e34e7" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "25d48271e3d4404ba017cb92a37d3a681c1ad149" }, + "conform.nvim": { "branch": "master", "commit": "2122fe2ff01e9a542fc358ee9398ce2cbddf345d" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "f074844b60f9e151970fbcdbeb8a2cd52b6ef25a" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, - "markdown.nvim": { "branch": "main", "commit": "b512df739f1565950f7c5119a8258ed756c94fd4" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6" }, + "markdown.nvim": { "branch": "main", "commit": "1c7b5ee30d8cf6e52628862dbd06f2e23ecb888e" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, @@ -23,13 +23,13 @@ "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-lspconfig": { "branch": "master", "commit": "fdc44768a09a65140aa00c92872a5381ad486485" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, - "nvim-treesitter": { "branch": "master", "commit": "a7ba147b4b51631f7cf7d9da56f7d5763073b18d" }, + "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, + "nvim-treesitter": { "branch": "master", "commit": "3e0feeb062b29bb7d6d6df1e32ba28111c2bb734" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, - "nvim-web-devicons": { "branch": "master", "commit": "5be6c4e685618b99c3210a69375b38a1202369b4" }, + "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, From c7a965f8ff07b98a908d5658476f438a538d3c78 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:48 -0700 Subject: [PATCH 218/240] feat: add pug support --- lua/plugins/treesitter.lua | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 3dcacaf..1c73413 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -5,17 +5,18 @@ return { build = ":TSUpdate", opts = { ensure_installed = { - "lua", - "javascript", - "typescript", - "tsx", - "htmldjango", "html", - "jsonc", - "json", + "htmldjango", + "javascript", "jsdoc", + "json", + "jsonc", + "lua", "markdown", "markdown_inline", + "pug", + "tsx", + "typescript", "vim", "vimdoc", }, From ef1e35e013063d7704c837a1a8ad1a37e8e9ff79 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 219/240] feat: add pug comment support --- lua/plugins/coding.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index a32a6fa..3e58dca 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -103,6 +103,10 @@ return { { "folke/ts-comments.nvim", event = "VeryLazy", - opts = {}, + opts = { + lang = { + pug = "// %s", + }, + }, }, } From 470451d8ea8ea2608658811a5d5e98b5ad551c73 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 220/240] feat: remove quit keybinds for terminal mode This was causing me so much grief while using `lazygit` within neovim. --- lua/keybinds.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lua/keybinds.lua b/lua/keybinds.lua index c89b74d..9ebff2f 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -18,10 +18,6 @@ vim.keymap.set("x", "p", '"_dP', { desc = "Paste without replacing clipb vim.keymap.set("n", "y", '"*y', { desc = "Yank into system clipboard" }) vim.keymap.set("v", "y", '"*y', { desc = "Yank into system clipboard" }) -vim.keymap.set("i", "jk", "", { desc = "Exit insert mode" }) - -vim.keymap.set("t", "", "", { desc = "Exit insert mode (Terminal)" }) -vim.keymap.set("t", "jk", "", { desc = "Exit insert mode (Terminal)" }) vim.keymap.set("t", "", "wincmd h", { desc = "Go to split on left (Terminal)" }) vim.keymap.set("t", "", "wincmd j", { desc = "Go to split above (Terminal)" }) vim.keymap.set("t", "", "wincmd k", { desc = "Go to split below (Terminal)" }) From 29d9fc6bc7cfc2bdb3e666d3cf07545107c2800b Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 221/240] chore: update plugins --- lazy-lock.json | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 36763ac..03be783 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,42 +1,42 @@ { - "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, - "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, + "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, + "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, "attempt.nvim": { "branch": "main", "commit": "3905db768478a2152fd927ab5a8def85bc2e34e7" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "2122fe2ff01e9a542fc358ee9398ce2cbddf345d" }, + "conform.nvim": { "branch": "master", "commit": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" }, - "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, - "markdown.nvim": { "branch": "main", "commit": "1c7b5ee30d8cf6e52628862dbd06f2e23ecb888e" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, + "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, + "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, + "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, + "lazygit.nvim": { "branch": "main", "commit": "2432b447483f42ff2e18b2d392cb2bb27e495c08" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, + "markdown.nvim": { "branch": "main", "commit": "a5e2d0b1215814c3d033be1fd8eccf59ce366399" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, - "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, - "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" }, + "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, + "mini.pairs": { "branch": "main", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" }, + "mini.surround": { "branch": "main", "commit": "0e67c4bc147f2a15cee94e7c94dcc0e115b9f55e" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" }, + "nvim-lspconfig": { "branch": "master", "commit": "38d4b239aab2dc3fdfe56b42e3f0f20c237ca695" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, - "nvim-treesitter": { "branch": "master", "commit": "3e0feeb062b29bb7d6d6df1e32ba28111c2bb734" }, - "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, - "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "nvim-treesitter": { "branch": "master", "commit": "4770d9a1a77b0cc2b723c646c3dbe43a9133e5db" }, + "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, + "nvim-web-devicons": { "branch": "master", "commit": "9793801f974bba70e4ac5d7eae6c4f5659993d8e" }, + "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, - "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, - "toggleterm.nvim": { "branch": "main", "commit": "8ed0f52006d3207ec6c94de7db62da840937ef2a" }, - "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, + "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, + "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" }, + "tokyonight.nvim": { "branch": "main", "commit": "4b386e66a9599057587c30538d5e6192e3d1c181" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, - "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } + "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" } } From cb133f1bb42967fb0abd4a07b04cfc7752de68c5 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 222/240] feat: config refresh The goal of this commit was to break my config into smaller, logical chunks. I was having a hard time remembering which file contained which plugin config. I also took the time to clean out some plugins I added but never used, and add an old favourite (tpope/vim-surround). --- lua/plugins/cmp.lua | 78 ++++++++++++++++ lua/plugins/coding.lua | 96 ++------------------ lua/plugins/editor.lua | 181 ------------------------------------- lua/plugins/git.lua | 46 ++++++++++ lua/plugins/neotree.lua | 35 +++++++ lua/plugins/telescope.lua | 58 ++++++++++++ lua/plugins/treesitter.lua | 6 -- lua/plugins/trouble.lua | 15 +++ lua/plugins/ui.lua | 11 --- 9 files changed, 238 insertions(+), 288 deletions(-) create mode 100644 lua/plugins/cmp.lua create mode 100644 lua/plugins/git.lua create mode 100644 lua/plugins/neotree.lua create mode 100644 lua/plugins/telescope.lua create mode 100644 lua/plugins/trouble.lua diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua new file mode 100644 index 0000000..a608b93 --- /dev/null +++ b/lua/plugins/cmp.lua @@ -0,0 +1,78 @@ +return { + { + "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/coding.lua b/lua/plugins/coding.lua index 3e58dca..8aadbc2 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -1,80 +1,6 @@ return { - { "saadparwaiz1/cmp_luasnip" }, { - "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", - }, + "tpope/vim-surround", }, { "echasnovski/mini.pairs", @@ -85,21 +11,6 @@ return { }, }, }, - { - "echasnovski/mini.surround", - version = false, - opts = { - mappings = { - add = "gsa", -- Add surrounding in Normal and Visual modes - delete = "gsd", -- Delete surrounding - find = "gsf", -- Find surrounding (to the right) - find_left = "gsF", -- Find surrounding (to the left) - highlight = "gsh", -- Highlight surrounding - replace = "gsr", -- Replace surrounding - update_n_lines = "gsn", -- Update `n_lines` - }, - }, - }, { "folke/ts-comments.nvim", event = "VeryLazy", @@ -109,4 +20,9 @@ return { }, }, }, + { + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = {}, + }, } diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index d816832..bc774d6 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -1,37 +1,4 @@ return { - { - "nvim-neo-tree/neo-tree.nvim", - event = "VeryLazy", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", - }, - keys = { - { "ee", "Neotree toggle", desc = "Toggle Neotree" }, - { "er", "Neotree reveal", desc = "Reveal file" }, - }, - opts = { - open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, - filesystem = { - filtered_items = { - show_hidden_count = false, - hide_dotfiles = false, - hide_gitignored = true, - always_show = { - ".env", - ".env.local", - }, - never_show = { - ".git", - "thumbs.db", - ".DS_Store", - }, - }, - }, - }, - }, { "folke/which-key.nvim", event = "VeryLazy", @@ -41,94 +8,6 @@ return { end, opts = {}, }, - { - "folke/trouble.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - opts = {}, - cmd = "Trouble", - keys = { - { - "tt", - "Trouble diagnostics toggle", - desc = "Toggle Trouble", - }, - }, - }, - { - "folke/todo-comments.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, - opts = {}, - }, - { - "nvim-pack/nvim-spectre", - dependencies = { "nvim-lua/plenary.nvim" }, - opts = { open_cmd = "noswapfile vnew" }, - keys = { - { - "sr", - function() - require("spectre").open() - end, - desc = "Replace in Files (Spectre)", - }, - }, - }, - { - "nvim-telescope/telescope.nvim", - tag = "0.1.6", - dependencies = { "nvim-lua/plenary.nvim" }, - keys = { - { - "ff", - "lua require'telescope.builtin'.git_files{}", - desc = "Search git_files", - }, - { - "fg", - "lua require'telescope.builtin'.live_grep{}", - desc = "Grep git_files", - }, - { - "fh", - "lua require'telescope.builtin'.help_tags{}", - desc = "View help tags", - }, - { - "fb", - "lua require'telescope.builtin'.buffers{}", - desc = "Search buffers", - }, - { - "sk", - "lua require'telescope.builtin'.keymaps{}", - desc = "View keymaps", - }, - { - "sR", - "lua require'telescope.builtin'.resume{}", - desc = "Resume", - }, - { - "st", - "TodoTelescope", - desc = "Search TODOs", - }, - }, - }, - { - "nvim-telescope/telescope-ui-select.nvim", - config = function() - require("telescope").setup({ - extensions = { - ["ui-select"] = { - require("telescope.themes").get_dropdown({}), - }, - }, - }) - - require("telescope").load_extension("ui-select") - end, - }, { "folke/flash.nvim", event = "VeryLazy", @@ -142,66 +21,6 @@ return { { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, }, }, - { - "kdheepak/lazygit.nvim", - event = "VeryLazy", - cmd = { - "LazyGit", - "LazyGitConfig", - "LazyGitCurrentFile", - "LazyGitFilter", - "LazyGitFilterCurrentFile", - }, - -- optional for floating window border decoration - dependencies = { - "nvim-lua/plenary.nvim", - }, - keys = { - { "gg", "LazyGit", desc = "LazyGit" }, - }, - }, - { - "lewis6991/gitsigns.nvim", - event = "VeryLazy", - opts = { - signs = { - add = { text = "▎" }, - change = { text = "▎" }, - delete = { text = "" }, - topdelete = { text = "" }, - changedelete = { text = "▎" }, - untracked = { text = "▎" }, - }, - signs_staged = { - add = { text = "▎" }, - change = { text = "▎" }, - delete = { text = "" }, - topdelete = { text = "" }, - changedelete = { text = "▎" }, - }, - }, - keys = { - { "ghb", ":Gitsigns blame_line", desc = "Blame line" }, - { "ghs", ":Gitsigns stage_hunk", desc = "Stage hunk", mode = { "n", "v" } }, - { "ghr", ":Gitsigns reset_hunk", desc = "Reset hunk", mode = { "n", "v" } }, - }, - }, - { - "m-demare/attempt.nvim", - opts = { - ext_options = { "js", "lua" }, - }, - keys = function() - local attempt = require("attempt") - - return { - { "an", attempt.new_select, desc = "New attempt" }, - { "ar", attempt.run, desc = "Run attempt" }, - { "ad", attempt.delete_buf, desc = "Delete attempt buffer" }, - { "al", "Telescope attempt", desc = "Search attempts" }, - } - end, - }, { "MeanderingProgrammer/markdown.nvim", main = "render-markdown", diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua new file mode 100644 index 0000000..4fe605a --- /dev/null +++ b/lua/plugins/git.lua @@ -0,0 +1,46 @@ +return { + { + "kdheepak/lazygit.nvim", + event = "VeryLazy", + cmd = { + "LazyGit", + "LazyGitConfig", + "LazyGitCurrentFile", + "LazyGitFilter", + "LazyGitFilterCurrentFile", + }, + -- optional for floating window border decoration + dependencies = { + "nvim-lua/plenary.nvim", + }, + keys = { + { "gg", "LazyGit", desc = "LazyGit" }, + }, + }, + { + "lewis6991/gitsigns.nvim", + event = "VeryLazy", + opts = { + signs = { + add = { text = "▎" }, + change = { text = "▎" }, + delete = { text = "" }, + topdelete = { text = "" }, + changedelete = { text = "▎" }, + untracked = { text = "▎" }, + }, + signs_staged = { + add = { text = "▎" }, + change = { text = "▎" }, + delete = { text = "" }, + topdelete = { text = "" }, + changedelete = { text = "▎" }, + }, + }, + keys = { + { "ghb", ":Gitsigns blame_line", desc = "Blame line" }, + { "ghs", ":Gitsigns stage_hunk", desc = "Stage hunk", mode = { "n", "v" } }, + { "ghr", ":Gitsigns reset_hunk", desc = "Reset hunk", mode = { "n", "v" } }, + }, + }, +} diff --git a/lua/plugins/neotree.lua b/lua/plugins/neotree.lua new file mode 100644 index 0000000..604b0d5 --- /dev/null +++ b/lua/plugins/neotree.lua @@ -0,0 +1,35 @@ +return { + { + "nvim-neo-tree/neo-tree.nvim", + event = "VeryLazy", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + keys = { + { "ee", "Neotree toggle", desc = "Toggle Neotree" }, + { "er", "Neotree reveal", desc = "Reveal file" }, + }, + opts = { + open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, + filesystem = { + filtered_items = { + show_hidden_count = false, + hide_dotfiles = false, + hide_gitignored = true, + always_show = { + ".env", + ".env.local", + }, + never_show = { + ".git", + "thumbs.db", + ".DS_Store", + }, + }, + }, + }, + }, +} diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua new file mode 100644 index 0000000..350c3fe --- /dev/null +++ b/lua/plugins/telescope.lua @@ -0,0 +1,58 @@ +return { + { + "nvim-telescope/telescope.nvim", + tag = "0.1.6", + dependencies = { "nvim-lua/plenary.nvim" }, + keys = { + { + "ff", + "lua require'telescope.builtin'.git_files{}", + desc = "Search git_files", + }, + { + "fg", + "lua require'telescope.builtin'.live_grep{}", + desc = "Grep git_files", + }, + { + "fh", + "lua require'telescope.builtin'.help_tags{}", + desc = "View help tags", + }, + { + "fb", + "lua require'telescope.builtin'.buffers{}", + desc = "Search buffers", + }, + { + "sk", + "lua require'telescope.builtin'.keymaps{}", + desc = "View keymaps", + }, + { + "sR", + "lua require'telescope.builtin'.resume{}", + desc = "Resume", + }, + { + "st", + "TodoTelescope", + desc = "Search TODOs", + }, + }, + }, + { + "nvim-telescope/telescope-ui-select.nvim", + config = function() + require("telescope").setup({ + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown({}), + }, + }, + }) + + require("telescope").load_extension("ui-select") + end, + }, +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 1c73413..f0cb64b 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -27,12 +27,6 @@ return { require("nvim-treesitter.configs").setup(opts) end, }, - -- { - -- "nvim-treesitter/nvim-treesitter-context", - -- opts = { - -- max_lines = 2, - -- }, - -- }, { "windwp/nvim-ts-autotag", event = "VeryLazy", diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua new file mode 100644 index 0000000..1482c9e --- /dev/null +++ b/lua/plugins/trouble.lua @@ -0,0 +1,15 @@ +return { + { + "folke/trouble.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + opts = {}, + cmd = "Trouble", + keys = { + { + "tt", + "Trouble diagnostics toggle", + desc = "Toggle Trouble", + }, + }, + }, +} diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 0d8bf45..82a12fc 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -141,15 +141,4 @@ return { alpha.setup(dashboard.opts) end, }, - { - "akinsho/toggleterm.nvim", - opts = {}, - keys = { - { - "T", - "ToggleTerm direction=float", - desc = "Open floating terminal", - }, - }, - }, } From 7bbcecf81a33f385010eb99a1cb742e03c835282 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 223/240] fix: clean up keybinds Previous keybinds for flash.nvim were conflicting with tpope/vim-surround. --- lazy-lock.json | 20 ++++++++------------ lua/plugins/editor.lua | 10 +++++----- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 03be783..c7a4688 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,11 +1,9 @@ { - "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, + "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, - "attempt.nvim": { "branch": "main", "commit": "3905db768478a2152fd927ab5a8def85bc2e34e7" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d" }, + "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, @@ -13,30 +11,28 @@ "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, "lazygit.nvim": { "branch": "main", "commit": "2432b447483f42ff2e18b2d392cb2bb27e495c08" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "markdown.nvim": { "branch": "main", "commit": "a5e2d0b1215814c3d033be1fd8eccf59ce366399" }, + "markdown.nvim": { "branch": "main", "commit": "f84eeaebac278e26bd2906fd47747631716a5edb" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, "mini.pairs": { "branch": "main", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" }, - "mini.surround": { "branch": "main", "commit": "0e67c4bc147f2a15cee94e7c94dcc0e115b9f55e" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "38d4b239aab2dc3fdfe56b42e3f0f20c237ca695" }, + "nvim-lspconfig": { "branch": "master", "commit": "46ce5fd8c081f179a509da423077f8372e63ffc4" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, - "nvim-treesitter": { "branch": "master", "commit": "4770d9a1a77b0cc2b723c646c3dbe43a9133e5db" }, + "nvim-treesitter": { "branch": "master", "commit": "b7160e87aadbb3f5f6ee87ce139406fe3433044e" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, - "nvim-web-devicons": { "branch": "master", "commit": "9793801f974bba70e4ac5d7eae6c4f5659993d8e" }, + "nvim-web-devicons": { "branch": "master", "commit": "9154484705968658e9aab2b894d1b2a64bf9f83d" }, "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, - "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" }, "tokyonight.nvim": { "branch": "main", "commit": "4b386e66a9599057587c30538d5e6192e3d1c181" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, + "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" } } diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index bc774d6..a94c304 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -14,11 +14,11 @@ return { 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" }, + { "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" }, }, }, { From ae5a8620ba8f08285e3f6076b98d88cc839d8c18 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 224/240] fix: rename tsserver to ts_ls --- lua/plugins/lsp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 1b4c2aa..b75933a 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -12,7 +12,7 @@ return { "html", "lua_ls", "taplo", -- .toml - "tsserver", + "ts_ls", "yamlls", -- .yml }, }, From dc8e0f88af36154bb3c77037a3ab0fec5f48a9fa Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 225/240] feat: update pug commentstring --- lua/plugins/coding.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 8aadbc2..1c3709f 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -16,7 +16,7 @@ return { event = "VeryLazy", opts = { lang = { - pug = "// %s", + pug = "//- %s", }, }, }, From 13e1f0950e002d394cc23a4efe83426b002ec030 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 226/240] chore: update plugins --- lazy-lock.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index c7a4688..55656f6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,38 +1,38 @@ { "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, - "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, + "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, + "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" }, + "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, - "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, - "lazygit.nvim": { "branch": "main", "commit": "2432b447483f42ff2e18b2d392cb2bb27e495c08" }, + "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, + "lazygit.nvim": { "branch": "main", "commit": "56760339a81cd1540d5a72fd9d93010a2677b55d" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "markdown.nvim": { "branch": "main", "commit": "f84eeaebac278e26bd2906fd47747631716a5edb" }, + "markdown.nvim": { "branch": "main", "commit": "e91b042b3865d2d040a0e21e0a3b13fb57f24094" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, - "mini.pairs": { "branch": "main", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, + "mini.pairs": { "branch": "main", "commit": "919a89ed3c9f4142215a44c9fffca72fa8c8e792" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, + "noice.nvim": { "branch": "main", "commit": "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "46ce5fd8c081f179a509da423077f8372e63ffc4" }, - "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-treesitter": { "branch": "master", "commit": "b7160e87aadbb3f5f6ee87ce139406fe3433044e" }, + "nvim-lspconfig": { "branch": "master", "commit": "aa615f62300465eef5115e0b7dfcf6dedc274f5d" }, + "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, + "nvim-treesitter": { "branch": "master", "commit": "da61d31a3d51f38a78a739392aabf79e7b2f523f" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, - "nvim-web-devicons": { "branch": "master", "commit": "9154484705968658e9aab2b894d1b2a64bf9f83d" }, - "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, + "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, - "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, - "tokyonight.nvim": { "branch": "main", "commit": "4b386e66a9599057587c30538d5e6192e3d1c181" }, + "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, + "tokyonight.nvim": { "branch": "main", "commit": "817bb6ffff1b9ce72cdd45d9fcfa8c9cd1ad3839" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, - "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, + "vim-commentary": { "branch": "master", "commit": "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" } + "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" } } From f19c3e021d5f668f5867929279cb9d88e4abb1b8 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 227/240] chore: update plugins --- lazy-lock.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 55656f6..8de4e55 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,36 +3,36 @@ "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" }, + "conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, - "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" }, + "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, - "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, - "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, + "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, + "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, "lazygit.nvim": { "branch": "main", "commit": "56760339a81cd1540d5a72fd9d93010a2677b55d" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "markdown.nvim": { "branch": "main", "commit": "e91b042b3865d2d040a0e21e0a3b13fb57f24094" }, + "markdown.nvim": { "branch": "main", "commit": "fe1002fddc61207e4ef4325d4bc0ca33697bbc7a" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, "mini.pairs": { "branch": "main", "commit": "919a89ed3c9f4142215a44c9fffca72fa8c8e792" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "noice.nvim": { "branch": "main", "commit": "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65" }, + "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "aa615f62300465eef5115e0b7dfcf6dedc274f5d" }, + "nvim-lspconfig": { "branch": "master", "commit": "04680101ff79e99b4e33a4386ec27cbd0d360c75" }, "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, - "nvim-treesitter": { "branch": "master", "commit": "da61d31a3d51f38a78a739392aabf79e7b2f523f" }, + "nvim-treesitter": { "branch": "master", "commit": "45e0d66246f31306d890b91301993fa1623e79f1" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, - "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" }, + "nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "817bb6ffff1b9ce72cdd45d9fcfa8c9cd1ad3839" }, - "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, - "vim-commentary": { "branch": "master", "commit": "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07" }, + "tokyonight.nvim": { "branch": "main", "commit": "2c85fad417170d4572ead7bf9fdd706057bd73d7" }, + "trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" }, + "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" } + "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" } } From 2a9d2537e139a1fd851307c0df073a1f180fb7aa Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 228/240] feat: config refresh --- init.lua | 37 ++------------ lazy-lock.json | 49 +++++++++--------- lua/{ => config}/autocmds.lua | 0 lua/config/keybinds.lua | 12 +++++ lua/config/lazy.lua | 35 +++++++++++++ lua/{ => config}/options.lua | 0 lua/filetypes.lua | 5 -- lua/keybinds.lua | 24 --------- lua/plugins/coding.lua | 25 ++++++++++ lua/plugins/formatting.lua | 92 ++++++++++++++++++++++------------ lua/plugins/git.lua | 19 ------- lua/plugins/lsp.lua | 21 +++----- lua/plugins/neotree.lua | 10 ++-- lua/plugins/snack.lua | 23 +++++++++ lua/plugins/treesitter.lua | 5 ++ lua/plugins/ui.lua | 93 +++++++---------------------------- 16 files changed, 217 insertions(+), 233 deletions(-) rename lua/{ => config}/autocmds.lua (100%) create mode 100644 lua/config/keybinds.lua create mode 100644 lua/config/lazy.lua rename lua/{ => config}/options.lua (100%) delete mode 100644 lua/filetypes.lua delete mode 100644 lua/keybinds.lua create mode 100644 lua/plugins/snack.lua diff --git a/init.lua b/init.lua index 19f8a58..3313b58 100644 --- a/init.lua +++ b/init.lua @@ -1,37 +1,8 @@ -require("options") +require("config.options") -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) -end -vim.opt.rtp:prepend(lazypath) +require("config.lazy") --- Fix for yanking to system clipboard on Windows -if vim.fn.has("wsl") == 1 then - vim.g.clipboard = { - name = "WslClipboard", - copy = { - ["+"] = "clip.exe", - ["*"] = "clip.exe", - }, - paste = { - ["+"] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', - ["*"] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', - }, - cache_enabled = 0, - } -end - -require("lazy").setup("plugins") -require("keybinds") -require("autocmds") -require("filetypes") +require("config.autocmds") +require("config.keybinds") vim.cmd.colorscheme("tokyonight") diff --git a/lazy-lock.json b/lazy-lock.json index 8de4e55..5a43fe3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,38 +1,35 @@ { - "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, - "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, + "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, + "conform.nvim": { "branch": "master", "commit": "62055b40c4d0b001c87559c7adf96a4a464bcdd5" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, - "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, - "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, - "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, - "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, - "lazygit.nvim": { "branch": "main", "commit": "56760339a81cd1540d5a72fd9d93010a2677b55d" }, - "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "markdown.nvim": { "branch": "main", "commit": "fe1002fddc61207e4ef4325d4bc0ca33697bbc7a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, + "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, + "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, + "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, + "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, + "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, + "markdown.nvim": { "branch": "main", "commit": "0022a579ac7355966be5ade77699b88c76b6a549" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "2daa8921b7afdcfa47419a21ea343c3df6d74fa0" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, - "mini.pairs": { "branch": "main", "commit": "919a89ed3c9f4142215a44c9fffca72fa8c8e792" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" }, - "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "04680101ff79e99b4e33a4386ec27cbd0d360c75" }, - "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, - "nvim-treesitter": { "branch": "master", "commit": "45e0d66246f31306d890b91301993fa1623e79f1" }, - "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, - "nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" }, + "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, + "neo-tree.nvim": { "branch": "main", "commit": "694fc4b8a5a722fcc85a57515cb47eea58212b53" }, + "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, + "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, + "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" }, + "nvim-treesitter": { "branch": "master", "commit": "2405274937718d520a40e03df92030dca6b4f0fd" }, + "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, + "nvim-web-devicons": { "branch": "master", "commit": "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "snacks.nvim": { "branch": "main", "commit": "98df370703b3c47a297988f3e55ce99628639590" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "2c85fad417170d4572ead7bf9fdd706057bd73d7" }, - "trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" }, - "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, + "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" }, + "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, + "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" } + "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" } } diff --git a/lua/autocmds.lua b/lua/config/autocmds.lua similarity index 100% rename from lua/autocmds.lua rename to lua/config/autocmds.lua diff --git a/lua/config/keybinds.lua b/lua/config/keybinds.lua new file mode 100644 index 0000000..5f342cb --- /dev/null +++ b/lua/config/keybinds.lua @@ -0,0 +1,12 @@ +vim.keymap.set("n", "", "wincmd h", { desc = "Go to split on left" }) +vim.keymap.set("n", "", "wincmd j", { desc = "Go to split above" }) +vim.keymap.set("n", "", "wincmd k", { desc = "Go to split below" }) +vim.keymap.set("n", "", "wincmd l", { desc = "Go to split on right" }) + +vim.keymap.set("n", "|", "v", { desc = "Split window right" }) +vim.keymap.set("n", "-", "s", { desc = "Split window below" }) +vim.keymap.set("n", "wd", "c", { desc = "Delete window" }) + +vim.keymap.set("n", "y", '"*y', { desc = "Yank into system clipboard" }) +vim.keymap.set("v", "y", '"*y', { desc = "Yank into system clipboard" }) + diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua new file mode 100644 index 0000000..f5ee74c --- /dev/null +++ b/lua/config/lazy.lua @@ -0,0 +1,35 @@ +-- Bootstrap lazy.nvim +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +-- Make sure to setup `mapleader` and `maplocalleader` before +-- loading lazy.nvim so that mappings are correct. +-- This is also a good place to setup other settings (vim.opt) +vim.g.mapleader = " " +vim.g.maplocalleader = "\\" + +-- Setup lazy.nvim +require("lazy").setup({ + spec = { + -- import your plugins + { import = "plugins" }, + }, + -- Configure any other settings here. See the documentation for more details. + -- colorscheme that will be used when installing plugins. + install = { colorscheme = { "habamax" } }, + -- automatically check for plugin updates + checker = { enabled = true }, +}) diff --git a/lua/options.lua b/lua/config/options.lua similarity index 100% rename from lua/options.lua rename to lua/config/options.lua diff --git a/lua/filetypes.lua b/lua/filetypes.lua deleted file mode 100644 index 587b138..0000000 --- a/lua/filetypes.lua +++ /dev/null @@ -1,5 +0,0 @@ -vim.filetype.add({ - extension = { - njk = "html", - }, -}) diff --git a/lua/keybinds.lua b/lua/keybinds.lua deleted file mode 100644 index 9ebff2f..0000000 --- a/lua/keybinds.lua +++ /dev/null @@ -1,24 +0,0 @@ -vim.keymap.set("n", "", "wincmd h", { desc = "Go to split on left" }) -vim.keymap.set("n", "", "wincmd j", { desc = "Go to split above" }) -vim.keymap.set("n", "", "wincmd k", { desc = "Go to split below" }) -vim.keymap.set("n", "", "wincmd l", { desc = "Go to split on right" }) - -vim.keymap.set("n", "|", "v", { desc = "Split window right" }) -vim.keymap.set("n", "-", "s", { desc = "Split window below" }) -vim.keymap.set("n", "wd", "c", { desc = "Delete window" }) - -vim.keymap.set("v", "J", ":m '>+1gv=gv", { desc = "Move lines under cursor up" }) -vim.keymap.set("v", "K", ":m '<-2gv=gv", { desc = "Move lines under cursor down" }) - -vim.keymap.set("n", "n", "nzzzv", { desc = "Go to next search result and keep cursor centered on screen" }) -vim.keymap.set("n", "N", "Nzzzv", { desc = "Go to previous search result and keep cursor centered on screen" }) - -vim.keymap.set("x", "p", '"_dP', { desc = "Paste without replacing clipboard contents" }) - -vim.keymap.set("n", "y", '"*y', { desc = "Yank into system clipboard" }) -vim.keymap.set("v", "y", '"*y', { desc = "Yank into system clipboard" }) - -vim.keymap.set("t", "", "wincmd h", { desc = "Go to split on left (Terminal)" }) -vim.keymap.set("t", "", "wincmd j", { desc = "Go to split above (Terminal)" }) -vim.keymap.set("t", "", "wincmd k", { desc = "Go to split below (Terminal)" }) -vim.keymap.set("t", "", "wincmd l", { desc = "Go to split on right (Terminal)" }) diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 1c3709f..b134b8f 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -16,7 +16,32 @@ return { event = "VeryLazy", opts = { lang = { + graphql = "# %s", + html = "", + javascript = { + "// %s", -- default commentstring when no treesitter node matches + "/* %s */", + call_expression = "// %s", -- specific commentstring for call_expression + jsx_attribute = "// %s", + jsx_element = "{/* %s */}", + jsx_fragment = "{/* %s */}", + spread_element = "// %s", + statement_block = "// %s", + }, pug = "//- %s", + php = "// %s", + tsx = { + "// %s", -- default commentstring when no treesitter node matches + "/* %s */", + call_expression = "// %s", -- specific commentstring for call_expression + jsx_attribute = "// %s", + jsx_element = "{/* %s */}", + jsx_fragment = "{/* %s */}", + spread_element = "// %s", + statement_block = "// %s", + }, + twig = "{# %s #}", + typescript = { "// %s", "/* %s */" }, -- langs can have multiple commentstrings }, }, }, diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index 82c9b4a..c44b105 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -1,36 +1,66 @@ return { - "stevearc/conform.nvim", - opts = { - formatters_by_ft = { - css = { "prettierd" }, - scss = { "prettierd" }, - html = { "djlint" }, - lua = { "stylua" }, - markdown = { "prettierd" }, - javascript = { "prettierd" }, - javascriptreact = { "prettierd" }, - json = { "prettierd" }, - jsonc = { "prettierd" }, - toml = { "taplo" }, - typescript = { "prettierd" }, - typescriptreact = { "prettierd" }, - }, - format_on_save = { - lsp_fallback = true, - }, - formatters = { - taplo = { - args = function() - -- conform.nvim does not parse bash envvars, so we do it ourselves - local CONFIG_PATH = os.getenv("HOME") .. "/.config/taplo/taplo.toml" - return { - "format", - "--config", - CONFIG_PATH, - "-", - } - end, + { + "stevearc/conform.nvim", + opts = { + formatters_by_ft = { + css = { "prettierd" }, + scss = { "prettierd" }, + html = { "djlint" }, + lua = { "stylua" }, + markdown = { "prettierd" }, + javascript = { "prettierd" }, + javascriptreact = { "prettierd" }, + json = { "prettierd" }, + jsonc = { "prettierd" }, + php = { "php_cs_fixer" }, + toml = { "taplo" }, + typescript = { "prettierd" }, + typescriptreact = { "prettierd" }, + twig = { "twig-cs-fixer" }, + }, + format_on_save = { + lsp_fallback = true, + }, + formatters = { + taplo = { + args = function() + -- conform.nvim does not parse bash envvars, so we do it ourselves + local CONFIG_PATH = os.getenv("HOME") .. "/.config/taplo/taplo.toml" + return { + "format", + "--config", + CONFIG_PATH, + "-", + } + end, + }, + php_cs_fixer = { + args = function() + local CONFIG_PATH = os.getenv("HOME") .. "/.config/php-cs-fixer/php-cs-fixer.php" + return { + "fix", + "$FILENAME", + "--config", + CONFIG_PATH, + } + end, + }, }, }, }, + { + "WhoIsSethDaniel/mason-tool-installer.nvim", + opts = { + ensure_installed = { + "djlint", + "php-cs-fixer", + "prettierd", + "proselint", + "stylua", + "twig-cs-fixer", + }, + auto_update = true, + automatic_installation = true, + }, + }, } diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua index 4fe605a..9bc7cb0 100644 --- a/lua/plugins/git.lua +++ b/lua/plugins/git.lua @@ -1,22 +1,4 @@ return { - { - "kdheepak/lazygit.nvim", - event = "VeryLazy", - cmd = { - "LazyGit", - "LazyGitConfig", - "LazyGitCurrentFile", - "LazyGitFilter", - "LazyGitFilterCurrentFile", - }, - -- optional for floating window border decoration - dependencies = { - "nvim-lua/plenary.nvim", - }, - keys = { - { "gg", "LazyGit", desc = "LazyGit" }, - }, - }, { "lewis6991/gitsigns.nvim", event = "VeryLazy", @@ -38,7 +20,6 @@ return { }, }, keys = { - { "ghb", ":Gitsigns blame_line", desc = "Blame line" }, { "ghs", ":Gitsigns stage_hunk", desc = "Stage hunk", mode = { "n", "v" } }, { "ghr", ":Gitsigns reset_hunk", desc = "Reset hunk", mode = { "n", "v" } }, }, diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index b75933a..131e859 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -11,25 +11,14 @@ return { "eslint", "html", "lua_ls", + "psalm", -- .php "taplo", -- .toml "ts_ls", + "twiggy_language_server", -- .twig "yamlls", -- .yml }, }, }, - { - "WhoIsSethDaniel/mason-tool-installer.nvim", - opts = { - ensure_installed = { - "djlint", - "prettierd", - "proselint", - "stylua", - }, - auto_update = true, - automatic_installation = true, - }, - }, -- lspconfig should be the last step. { "neovim/nvim-lspconfig", @@ -49,10 +38,12 @@ return { }) end, }, - html = {}, lua_ls = {}, + html = {}, + psalm = {}, taplo = {}, - tsserver = {}, + ts_ls = {}, + twiggy_language_server = {}, yamlls = {}, }, }, diff --git a/lua/plugins/neotree.lua b/lua/plugins/neotree.lua index 604b0d5..ce1d3a0 100644 --- a/lua/plugins/neotree.lua +++ b/lua/plugins/neotree.lua @@ -1,13 +1,11 @@ return { { "nvim-neo-tree/neo-tree.nvim", - event = "VeryLazy", - branch = "v3.x", dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim", - }, + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, keys = { { "ee", "Neotree toggle", desc = "Toggle Neotree" }, { "er", "Neotree reveal", desc = "Reveal file" }, diff --git a/lua/plugins/snack.lua b/lua/plugins/snack.lua new file mode 100644 index 0000000..3256280 --- /dev/null +++ b/lua/plugins/snack.lua @@ -0,0 +1,23 @@ +return { + "folke/snacks.nvim", + priority = 1000, + lazy = false, + opts = { + dashboard = { enabled = true }, + git = { enabled = true }, + lazygit = { enabled = true }, + notifier = { enabled = true }, + quickfile = { enabled = true }, + scratch = { 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" }, + } +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index f0cb64b..9398d46 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -3,8 +3,11 @@ return { "nvim-treesitter/nvim-treesitter", version = false, build = ":TSUpdate", + event = { "VeryLazy" }, + lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline opts = { ensure_installed = { + "graphql", "html", "htmldjango", "javascript", @@ -14,8 +17,10 @@ return { "lua", "markdown", "markdown_inline", + "php", "pug", "tsx", + "twig", "typescript", "vim", "vimdoc", diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 82a12fc..58ac8b6 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,6 +1,7 @@ return { { "nvim-lualine/lualine.nvim", + event = "VeryLazy", dependencies = { "nvim-tree/nvim-web-devicons", }, @@ -36,17 +37,20 @@ return { scope = { enabled = false }, exclude = { filetypes = { - "help", + "Trouble", "alpha", "dashboard", - "neo-tree", - "Trouble", - "trouble", + "help", "lazy", "mason", + "neo-tree", "notify", + "snacks_dashboard", + "snacks_notif", + "snacks_terminal", + "snacks_win", "toggleterm", - "lazyterm", + "trouble", }, }, }, @@ -61,84 +65,25 @@ return { init = function() vim.api.nvim_create_autocmd("FileType", { pattern = { - "help", + "Trouble", "alpha", "dashboard", - "neo-tree", - "Trouble", - "trouble", + "help", "lazy", "mason", + "neo-tree", "notify", + "snacks_dashboard", + "snacks_notif", + "snacks_terminal", + "snacks_win", "toggleterm", - "lazyterm", + "trouble", }, - callback = function() - vim.b.miniindentscope_disable = true + callback = function(data) + vim.b[data.buf].miniindentscope_disable = true end, }) end, }, - { - "rcarriga/nvim-notify", - opts = { - timeout = 2000, - stages = "static", - }, - }, - { - "MunifTanjim/nui.nvim", - }, - { - "folke/noice.nvim", - event = "VeryLazy", - opts = {}, - dependencies = { - "MunifTanjim/nui.nvim", - "rcarriga/nvim-notify", - }, - }, - { - "goolord/alpha-nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - local alpha = require("alpha") - local dashboard = require("alpha.themes.dashboard") - - -- https://github.com/MaximilianLloyd/ascii.nvim - dashboard.section.header.val = { - " ", - " ░░░ ▄▄▄▄▄▄███▄▄▄▄▄ ", - " ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ", - " ▐████▄▄ ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■ ██▄ ", - " ▀█████████▄▄▄▄▄███████████▀▀ ▄▄ ████░▄▄▄ ", - " ▐██▄ ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄ ▄▄ ▐███▏▐██▓▄████ ", - " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███ ████▏██▀████▀ ", - " ▐███▄███░▀████████▀▀ ▀▓█████▓▀██▓████▀▀ ███████ ▄█████ ■ ██▀ ", - " ▀████▓██ ▐██████ ▐████ ▐████▀ ▒████████▄ ▄███████ ", - " ▀███ ▀▀█████▄ ▄████ ▄████▏ ▄█████▀█████████▀ ███ ", - " ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀ ▐██ ", - " ▀████████▀ ▀████▀▀████████▀▐██▏ ▀██▀▀ ▐██▏ ", - " ▓▓█ ▀████ ▀ ■███▄▄ ███ ██▏ ", - " ▀▀▀ ▀▀ ▀█████▄▓▀ ██▏ ", - " ░░ ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄ ▒▒▒ ██▏ ▄▄ ", - " ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄ ░░░░ ▐█▏ ■▀▀ ", - " ▀▀▀▀▀▀█████▓▓▓▓█▄▄ ▐█ ", - " ▄█████████▄▄ ", - " ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ", - " ▄▄█████▀▀▀▀ ▀■ ", - " ▄███▀▀▀▀ ", - " ■▀▀ ", - " ", - } - - dashboard.section.buttons.val = { - dashboard.button("e", " > New File", "ene"), - dashboard.button("SPC ee", " > File explorer", "Neotree"), - dashboard.button("q", " > Quit", "qa"), - } - - alpha.setup(dashboard.opts) - end, - }, } From c5d274078c12f4395b551247e3fc3b63dd4852cb Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 229/240] chore: plugin update --- lazy-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 5a43fe3..a24ff70 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,7 +2,7 @@ "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, - "conform.nvim": { "branch": "master", "commit": "62055b40c4d0b001c87559c7adf96a4a464bcdd5" }, + "conform.nvim": { "branch": "master", "commit": "339b3e4519ec49312d34fcfa275aa15bfaa67025" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, @@ -15,13 +15,13 @@ "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, - "neo-tree.nvim": { "branch": "main", "commit": "694fc4b8a5a722fcc85a57515cb47eea58212b53" }, + "neo-tree.nvim": { "branch": "main", "commit": "45c75e5f31e3581fb4b4883a81c7d7c4f3578b70" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, - "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" }, - "nvim-treesitter": { "branch": "master", "commit": "2405274937718d520a40e03df92030dca6b4f0fd" }, + "nvim-lspconfig": { "branch": "master", "commit": "c580f34bc5fdca8aaf737a9ab8a5d775cb940e57" }, + "nvim-treesitter": { "branch": "master", "commit": "50947387c20ec3fb8c30b8c1c1a1c39f68deb970" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, - "nvim-web-devicons": { "branch": "master", "commit": "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb" }, + "nvim-web-devicons": { "branch": "master", "commit": "15c7d0f616ebf88960ce5c4221828f62789d36d9" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "snacks.nvim": { "branch": "main", "commit": "98df370703b3c47a297988f3e55ce99628639590" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, From 97f96a26cfd442fff49535bcafe5c2cca8376b0c Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 230/240] chore: plugin update --- lazy-lock.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index a24ff70..7e416e6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,35 +1,35 @@ { - "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, + "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, - "conform.nvim": { "branch": "master", "commit": "339b3e4519ec49312d34fcfa275aa15bfaa67025" }, + "conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, + "gitsigns.nvim": { "branch": "main", "commit": "abcd00a7d5bc1a9470cb21b023c575acade3e4db" }, "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, - "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, + "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "markdown.nvim": { "branch": "main", "commit": "0022a579ac7355966be5ade77699b88c76b6a549" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "2daa8921b7afdcfa47419a21ea343c3df6d74fa0" }, + "markdown.nvim": { "branch": "main", "commit": "d7b646f2e6136d963e1bd3abbb9e2ac3fa90837a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, - "neo-tree.nvim": { "branch": "main", "commit": "45c75e5f31e3581fb4b4883a81c7d7c4f3578b70" }, + "neo-tree.nvim": { "branch": "main", "commit": "343886b020cb6bfbb326c4a07a7c356eb5ee05b7" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, - "nvim-lspconfig": { "branch": "master", "commit": "c580f34bc5fdca8aaf737a9ab8a5d775cb940e57" }, - "nvim-treesitter": { "branch": "master", "commit": "50947387c20ec3fb8c30b8c1c1a1c39f68deb970" }, + "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" }, + "nvim-lspconfig": { "branch": "master", "commit": "0913481440219390969ab56a3c33089679365ef7" }, + "nvim-treesitter": { "branch": "master", "commit": "c7dc251cddf2cdef1fa279fa797799728a5bfd78" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, - "nvim-web-devicons": { "branch": "master", "commit": "15c7d0f616ebf88960ce5c4221828f62789d36d9" }, - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "snacks.nvim": { "branch": "main", "commit": "98df370703b3c47a297988f3e55ce99628639590" }, + "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, + "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, + "snacks.nvim": { "branch": "main", "commit": "d2b2b7bcbf9814d61f2e8049affed750509f44e3" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" }, + "tokyonight.nvim": { "branch": "main", "commit": "775f82f08a3d1fb55a37fc6d3a4ab10cd7ed8a10" }, "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" } + "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" } } From 91086ce9faab4ab8ee2b7936cb0ae6e414ec35cf Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 231/240] chore: plugin update --- lazy-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 7e416e6..20319e3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -18,17 +18,17 @@ "neo-tree.nvim": { "branch": "main", "commit": "343886b020cb6bfbb326c4a07a7c356eb5ee05b7" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" }, - "nvim-lspconfig": { "branch": "master", "commit": "0913481440219390969ab56a3c33089679365ef7" }, + "nvim-lspconfig": { "branch": "master", "commit": "355c565eae59810c1af4cf132938fa0fc251c5a2" }, "nvim-treesitter": { "branch": "master", "commit": "c7dc251cddf2cdef1fa279fa797799728a5bfd78" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "snacks.nvim": { "branch": "main", "commit": "d2b2b7bcbf9814d61f2e8049affed750509f44e3" }, + "snacks.nvim": { "branch": "main", "commit": "1b7a57a0b14b37a708330a346a767865954ce448" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "tokyonight.nvim": { "branch": "main", "commit": "775f82f08a3d1fb55a37fc6d3a4ab10cd7ed8a10" }, - "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, + "trouble.nvim": { "branch": "main", "commit": "4d36b8979287f5facc03fd6d955ace67db667e1d" }, "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" } From cc1e0600a6cd6d0c1e5e593f346d692ebf7b62d3 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 232/240] chore: plugin update --- lazy-lock.json | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 20319e3..a434517 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,34 +2,34 @@ "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, - "conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" }, - "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, + "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" }, + "flash.nvim": { "branch": "main", "commit": "f899265876ecdcf7352dbc9f0adf87068cedefbb" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "abcd00a7d5bc1a9470cb21b023c575acade3e4db" }, - "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, - "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, + "gitsigns.nvim": { "branch": "main", "commit": "9b36d497495436c135659902054ee637e0ba6021" }, + "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, + "lazy.nvim": { "branch": "main", "commit": "7527af40ddd4a93a02911be570b32609b9d4ea53" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "markdown.nvim": { "branch": "main", "commit": "d7b646f2e6136d963e1bd3abbb9e2ac3fa90837a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, + "markdown.nvim": { "branch": "main", "commit": "1ba6fb7998985736ca3480366c9792be05b93ad7" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "374c78d3ebb5c53f43ea6bd906b6587b5e899b9e" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, - "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, - "neo-tree.nvim": { "branch": "main", "commit": "343886b020cb6bfbb326c4a07a7c356eb5ee05b7" }, + "mini.indentscope": { "branch": "main", "commit": "8ce41a77eed7f4121c83c67fda5e2e86af999e6d" }, + "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" }, + "neo-tree.nvim": { "branch": "main", "commit": "6a4f0a830f2322f187bce6f18a9e6b5b7ba188e3" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" }, - "nvim-lspconfig": { "branch": "master", "commit": "355c565eae59810c1af4cf132938fa0fc251c5a2" }, - "nvim-treesitter": { "branch": "master", "commit": "c7dc251cddf2cdef1fa279fa797799728a5bfd78" }, + "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, + "nvim-lspconfig": { "branch": "master", "commit": "ead2fbc4893fdd062e1dd0842679a48bfb7bac5c" }, + "nvim-treesitter": { "branch": "master", "commit": "7e3942ceca9e0c28760f77ac33bc16399146d879" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, - "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, + "nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "snacks.nvim": { "branch": "main", "commit": "1b7a57a0b14b37a708330a346a767865954ce448" }, + "snacks.nvim": { "branch": "main", "commit": "f936021dfed8107c33c38fb775dfe6a147ca7726" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, - "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "775f82f08a3d1fb55a37fc6d3a4ab10cd7ed8a10" }, - "trouble.nvim": { "branch": "main", "commit": "4d36b8979287f5facc03fd6d955ace67db667e1d" }, + "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, + "tokyonight.nvim": { "branch": "main", "commit": "dca4adba7dc5f09302a00b0e76078d54d82d2658" }, + "trouble.nvim": { "branch": "main", "commit": "6f380b8826fb819c752c8fd7daaee9ef96d4c689" }, "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" } + "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" } } From b821cbc68c298fe178af18d5af54cd0bf2508e6c Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 233/240] feat: add more php support --- lua/plugins/formatting.lua | 5 ++++- lua/plugins/lsp.lua | 6 +++--- lua/plugins/treesitter.lua | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index c44b105..aa21a36 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -3,6 +3,7 @@ return { "stevearc/conform.nvim", opts = { formatters_by_ft = { + blade = { "blade-formatter" }, css = { "prettierd" }, scss = { "prettierd" }, html = { "djlint" }, @@ -12,7 +13,7 @@ return { javascriptreact = { "prettierd" }, json = { "prettierd" }, jsonc = { "prettierd" }, - php = { "php_cs_fixer" }, + php = { "pint", "php_cs_fixer", stop_after_first = true }, toml = { "taplo" }, typescript = { "prettierd" }, typescriptreact = { "prettierd" }, @@ -52,7 +53,9 @@ return { "WhoIsSethDaniel/mason-tool-installer.nvim", opts = { ensure_installed = { + "blade-formatter", "djlint", + "phpcs", "php-cs-fixer", "prettierd", "proselint", diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 131e859..3f62b50 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -11,7 +11,7 @@ return { "eslint", "html", "lua_ls", - "psalm", -- .php + "phpactor", -- php "taplo", -- .toml "ts_ls", "twiggy_language_server", -- .twig @@ -38,9 +38,9 @@ return { }) end, }, - lua_ls = {}, html = {}, - psalm = {}, + lua_ls = {}, + phpactor = {}, taplo = {}, ts_ls = {}, twiggy_language_server = {}, diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 9398d46..99a83ae 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -4,10 +4,10 @@ return { version = false, build = ":TSUpdate", event = { "VeryLazy" }, - lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline + lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline opts = { ensure_installed = { - "graphql", + "graphql", "html", "htmldjango", "javascript", @@ -18,6 +18,7 @@ return { "markdown", "markdown_inline", "php", + "php_only", "pug", "tsx", "twig", From 8898d4ddfb33311481e586bc3a92597014aac68d Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 234/240] chore: plugin update --- lazy-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index a434517..069aa17 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -5,25 +5,25 @@ "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" }, "flash.nvim": { "branch": "main", "commit": "f899265876ecdcf7352dbc9f0adf87068cedefbb" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "9b36d497495436c135659902054ee637e0ba6021" }, + "gitsigns.nvim": { "branch": "main", "commit": "9772ce68a9a6d156f3f2166bfd0a17a09ab37eba" }, "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, "lazy.nvim": { "branch": "main", "commit": "7527af40ddd4a93a02911be570b32609b9d4ea53" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "markdown.nvim": { "branch": "main", "commit": "1ba6fb7998985736ca3480366c9792be05b93ad7" }, + "markdown.nvim": { "branch": "main", "commit": "2a9e0ab6043bfb4996ce6a6a35594ab357e5d299" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "374c78d3ebb5c53f43ea6bd906b6587b5e899b9e" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.indentscope": { "branch": "main", "commit": "8ce41a77eed7f4121c83c67fda5e2e86af999e6d" }, "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" }, - "neo-tree.nvim": { "branch": "main", "commit": "6a4f0a830f2322f187bce6f18a9e6b5b7ba188e3" }, + "neo-tree.nvim": { "branch": "main", "commit": "9f0c96720559461530a51d3e1c170519345941da" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, - "nvim-lspconfig": { "branch": "master", "commit": "ead2fbc4893fdd062e1dd0842679a48bfb7bac5c" }, - "nvim-treesitter": { "branch": "master", "commit": "7e3942ceca9e0c28760f77ac33bc16399146d879" }, + "nvim-lspconfig": { "branch": "master", "commit": "66bc018936c6ff76beb75f89d986af6442db4001" }, + "nvim-treesitter": { "branch": "master", "commit": "9e0b5e7f0d148963d6ec71c48cec1a3f8607d619" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, - "nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" }, + "nvim-web-devicons": { "branch": "master", "commit": "402377242b04be3f4f0f3720bd952df86e946c30" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "snacks.nvim": { "branch": "main", "commit": "f936021dfed8107c33c38fb775dfe6a147ca7726" }, + "snacks.nvim": { "branch": "main", "commit": "f821b4a846647ef8aed2d382dfd10edfa7d4fb2c" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, From 932e1954dfbc3fe13be81a99006a163d61c23d52 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 235/240] fix: php_cs_fixer on php versions >8.3 --- lua/plugins/formatting.lua | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index aa21a36..f0ade9a 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -13,7 +13,7 @@ return { javascriptreact = { "prettierd" }, json = { "prettierd" }, jsonc = { "prettierd" }, - php = { "pint", "php_cs_fixer", stop_after_first = true }, + php = { "php_cs_fixer", stop_after_first = true }, toml = { "taplo" }, typescript = { "prettierd" }, typescriptreact = { "prettierd" }, @@ -36,6 +36,9 @@ return { end, }, php_cs_fixer = { + env = { + PHP_CS_FIXER_IGNORE_ENV = "1", + }, args = function() local CONFIG_PATH = os.getenv("HOME") .. "/.config/php-cs-fixer/php-cs-fixer.php" return { @@ -46,6 +49,16 @@ return { } end, }, + -- pint = { + -- args = function() + -- local CONFIG_PATH = os.getenv("HOME") .. "/.config/pint/pint.json" + -- return { + -- "--config", + -- CONFIG_PATH, + -- "$FILENAME", + -- } + -- end, + -- }, }, }, }, From 8838cd7afaec32e51726137763aaae4a750755ce Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 236/240] chore: plugin update --- lazy-lock.json | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 069aa17..1337b52 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,34 +2,34 @@ "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, - "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" }, - "flash.nvim": { "branch": "main", "commit": "f899265876ecdcf7352dbc9f0adf87068cedefbb" }, + "conform.nvim": { "branch": "master", "commit": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d" }, + "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "9772ce68a9a6d156f3f2166bfd0a17a09ab37eba" }, + "gitsigns.nvim": { "branch": "main", "commit": "011dc6718bcebdf92a5336bb0da79189c3afe621" }, "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, - "lazy.nvim": { "branch": "main", "commit": "7527af40ddd4a93a02911be570b32609b9d4ea53" }, - "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "markdown.nvim": { "branch": "main", "commit": "2a9e0ab6043bfb4996ce6a6a35594ab357e5d299" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "374c78d3ebb5c53f43ea6bd906b6587b5e899b9e" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, + "markdown.nvim": { "branch": "main", "commit": "c065031d030955e1d071a7fcdd8c59e0fd2f0343" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "5639d58a3d11ff7c05c8e31e159bfedae55d7961" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.indentscope": { "branch": "main", "commit": "8ce41a77eed7f4121c83c67fda5e2e86af999e6d" }, "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" }, - "neo-tree.nvim": { "branch": "main", "commit": "9f0c96720559461530a51d3e1c170519345941da" }, - "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, - "nvim-lspconfig": { "branch": "master", "commit": "66bc018936c6ff76beb75f89d986af6442db4001" }, - "nvim-treesitter": { "branch": "master", "commit": "9e0b5e7f0d148963d6ec71c48cec1a3f8607d619" }, - "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, - "nvim-web-devicons": { "branch": "master", "commit": "402377242b04be3f4f0f3720bd952df86e946c30" }, - "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "snacks.nvim": { "branch": "main", "commit": "f821b4a846647ef8aed2d382dfd10edfa7d4fb2c" }, + "neo-tree.nvim": { "branch": "main", "commit": "8c6349bceb1d8a863964dd25dc7944d588a56aaa" }, + "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, + "nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" }, + "nvim-lspconfig": { "branch": "master", "commit": "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0" }, + "nvim-treesitter": { "branch": "master", "commit": "548ed98f8a0af738d095ef1be5961f41061ed743" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, + "nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "tokyonight.nvim": { "branch": "main", "commit": "dca4adba7dc5f09302a00b0e76078d54d82d2658" }, - "trouble.nvim": { "branch": "main", "commit": "6f380b8826fb819c752c8fd7daaee9ef96d4c689" }, - "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, + "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, + "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, + "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" } + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } From a9a8d774526d38ad7a2bc37ced1e7bf21cd0e095 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 237/240] chore: plugin update Also locks mason and mason-lspconfig to v1 to prevent breaking changes --- lazy-lock.json | 36 ++++++++++++++++++------------------ lua/plugins/lsp.lua | 10 ++++++---- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 1337b52..89f2746 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,27 +1,27 @@ { - "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, - "conform.nvim": { "branch": "master", "commit": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d" }, + "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, + "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "conform.nvim": { "branch": "master", "commit": "374aaf384e2e841607b8e2fe63fa3ad01d111c91" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, - "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "011dc6718bcebdf92a5336bb0da79189c3afe621" }, - "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, + "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "gitsigns.nvim": { "branch": "main", "commit": "43b0c856ae5f32a195d83f4a27fe21d63e6c966c" }, + "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, - "markdown.nvim": { "branch": "main", "commit": "c065031d030955e1d071a7fcdd8c59e0fd2f0343" }, + "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, + "markdown.nvim": { "branch": "main", "commit": "935c2c70c296d87ed1bcce9ce667c239c9c982b5" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "5639d58a3d11ff7c05c8e31e159bfedae55d7961" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "aafae207d5a2a28c59c9d478d8581c2739135d09" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mini.indentscope": { "branch": "main", "commit": "8ce41a77eed7f4121c83c67fda5e2e86af999e6d" }, - "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" }, - "neo-tree.nvim": { "branch": "main", "commit": "8c6349bceb1d8a863964dd25dc7944d588a56aaa" }, - "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, - "nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" }, - "nvim-lspconfig": { "branch": "master", "commit": "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0" }, - "nvim-treesitter": { "branch": "master", "commit": "548ed98f8a0af738d095ef1be5961f41061ed743" }, + "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" }, + "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, + "neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, + "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-lspconfig": { "branch": "master", "commit": "f817582301b2c188c1cff7c956971ce3f85631ff" }, + "nvim-treesitter": { "branch": "master", "commit": "28d480e0624b259095e56f353ec911f9f2a0f404" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, - "nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" }, + "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 3f62b50..2d570c1 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -1,11 +1,17 @@ return { + -- Locking mason.nvim and mason-lspconfig.nvim to v1 + -- See -- see https://github.com/LazyVim/LazyVim/issues/6039 { "williamboman/mason.nvim", + version = "^1.0.0", opts = {}, }, { "williamboman/mason-lspconfig.nvim", + version = "^1.0.0", + dependencies = { "neovim/nvim-lspconfig" }, opts = { + automatic_enable = false, ensure_installed = { "cssls", "eslint", @@ -23,10 +29,6 @@ return { { "neovim/nvim-lspconfig", event = "VeryLazy", - dependencies = { - "mason.nvim", - "williamboman/mason-lspconfig.nvim", - }, opts = { servers = { cssls = {}, From b543a996cd2db70380a9239176f057ff889dda04 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 238/240] chore: plugin update --- lazy-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 89f2746..7646531 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -11,14 +11,14 @@ "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, "markdown.nvim": { "branch": "main", "commit": "935c2c70c296d87ed1bcce9ce667c239c9c982b5" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "aafae207d5a2a28c59c9d478d8581c2739135d09" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "62f821a14e20f3f2ee358cd44d0b3d299a508e72" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" }, "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, - "neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, + "neo-tree.nvim": { "branch": "main", "commit": "56f383aa157f1ff20a59154907cc5f9fe26e4db9" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "f817582301b2c188c1cff7c956971ce3f85631ff" }, + "nvim-lspconfig": { "branch": "master", "commit": "61e5109c8cf24807e4ae29813a3a82b31821dd45" }, "nvim-treesitter": { "branch": "master", "commit": "28d480e0624b259095e56f353ec911f9f2a0f404" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" }, From 4c24f66f4244bf6026cab5d77f736593804a13ef Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 239/240] chore: plugin update --- lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 7646531..c2dfb8c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,27 +1,27 @@ { - "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, + "LuaSnip": { "branch": "master", "commit": "faf3c94a44508cec1b961406d36cc65113ff3b98" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, - "conform.nvim": { "branch": "master", "commit": "374aaf384e2e841607b8e2fe63fa3ad01d111c91" }, + "conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "43b0c856ae5f32a195d83f4a27fe21d63e6c966c" }, + "gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, - "markdown.nvim": { "branch": "main", "commit": "935c2c70c296d87ed1bcce9ce667c239c9c982b5" }, + "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, + "markdown.nvim": { "branch": "main", "commit": "df64d5d5432e13026a79384ec4e2bab185fd4eb5" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "62f821a14e20f3f2ee358cd44d0b3d299a508e72" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" }, "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, - "neo-tree.nvim": { "branch": "main", "commit": "56f383aa157f1ff20a59154907cc5f9fe26e4db9" }, - "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, + "neo-tree.nvim": { "branch": "main", "commit": "3f1dd2de5045659e00bfbe27c8aca3b52c1fdbde" }, + "nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "61e5109c8cf24807e4ae29813a3a82b31821dd45" }, - "nvim-treesitter": { "branch": "master", "commit": "28d480e0624b259095e56f353ec911f9f2a0f404" }, + "nvim-lspconfig": { "branch": "master", "commit": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, - "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" }, + "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, From e0c9e4607c1d016c7447b55dbf4d3726e1089d22 Mon Sep 17 00:00:00 2001 From: Devin Haska Date: Tue, 27 May 2025 11:54:49 -0700 Subject: [PATCH 240/240] feat: add eslint to formatting language servers --- lua/plugins/formatting.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index f0ade9a..362d402 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -68,6 +68,7 @@ return { ensure_installed = { "blade-formatter", "djlint", + "eslint", "phpcs", "php-cs-fixer", "prettierd",