From 3591ba06556f142536bbe855f0297af3aa351e77 Mon Sep 17 00:00:00 2001 From: titusdmoore Date: Sat, 1 Apr 2023 23:26:30 -0400 Subject: [PATCH 01/36] Copilot chanage --- init.lua | 46 ++++--------------------------------- lua/custom/plugins/init.lua | 6 ++++- 2 files changed, 9 insertions(+), 43 deletions(-) diff --git a/init.lua b/init.lua index 72890326d47..4255a8365b6 100644 --- a/init.lua +++ b/init.lua @@ -1,42 +1,3 @@ ---[[ - -===================================================================== -==================== READ THIS BEFORE CONTINUING ==================== -===================================================================== - -Kickstart.nvim is *not* a distribution. - -Kickstart.nvim is a template for your own configuration. - The goal is that you can read every line of code, top-to-bottom, and understand - what your configuration is doing. - - Once you've done that, you should start exploring, configuring and tinkering to - explore Neovim! - - If you don't know anything about Lua, I recommend taking some time to read through - a guide. One possible example: - - https://learnxinyminutes.com/docs/lua/ - - And then you can explore or search through `:help lua-guide` - - -Kickstart Guide: - -I have left several `:help X` comments throughout the init.lua -You should run that command and read that help section for more information. - -In addition, I have some `NOTE:` items throughout the file. -These are for you, the reader to help understand what is happening. Feel free to delete -them once you know what you're doing, but they should serve as a guide for when you -are first encountering a few different constructs in your nvim config. - -I hope you enjoy your Neovim journey, -- TJ - -P.S. You can delete this when you're done too. It's your config now :) ---]] - --- Set as the leader key -- See `:help mapleader` -- NOTE: Must happen before plugins are required (otherwise wrong leader will be used) vim.g.mapleader = ' ' @@ -175,7 +136,7 @@ require('lazy').setup({ -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart -- These are some example plugins that I've included in the kickstart repository. -- Uncomment any of the lines below to enable them. - -- require 'kickstart.plugins.autoformat', + require 'kickstart.plugins.autoformat', -- require 'kickstart.plugins.debug', -- NOTE: The import below automatically adds your own plugins, configuration, etc from `lua/custom/plugins/*.lua` @@ -197,6 +158,7 @@ vim.o.hlsearch = false -- Make line numbers default vim.wo.number = true +vim.wo.relativenumber = true -- Enable mouse mode vim.o.mouse = 'a' @@ -288,8 +250,8 @@ vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { de -- See `:help nvim-treesitter` require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'help', 'vim' }, - + ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vim' }, + -- ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'help', 'vim' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index be0eb9d8d7a..2ad10d8d1bb 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -2,4 +2,8 @@ -- I promise not to create any merge conflicts in this directory :) -- -- See the kickstart.nvim README for more information -return {} +return { + { + "github/copilot.vim" + } +} From b9ee8f57e0b931bb0388f587139df35e16eee249 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Mon, 3 Apr 2023 16:09:43 -0400 Subject: [PATCH 02/36] Re-alias copilot command --- init.lua | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/init.lua b/init.lua index 4255a8365b6..c77b0dc8c54 100644 --- a/init.lua +++ b/init.lua @@ -36,7 +36,8 @@ require('lazy').setup({ -- NOTE: This is where your plugins related to LSP can be installed. -- The configuration is done below. Search for lspconfig to find it below. - { -- LSP Configuration & Plugins + { + -- LSP Configuration & Plugins 'neovim/nvim-lspconfig', dependencies = { -- Automatically install LSPs to stdpath for neovim @@ -52,14 +53,16 @@ require('lazy').setup({ }, }, - { -- Autocompletion + { + -- Autocompletion 'hrsh7th/nvim-cmp', dependencies = { 'hrsh7th/cmp-nvim-lsp', 'L3MON4D3/LuaSnip', 'saadparwaiz1/cmp_luasnip' }, }, -- Useful plugin to show you pending keybinds. - { 'folke/which-key.nvim', opts = {} }, - { -- Adds git releated signs to the gutter, as well as utilities for managing changes + { 'folke/which-key.nvim', opts = {} }, + { + -- Adds git releated signs to the gutter, as well as utilities for managing changes 'lewis6991/gitsigns.nvim', opts = { -- See `:help gitsigns.txt` @@ -73,7 +76,8 @@ require('lazy').setup({ }, }, - { -- Theme inspired by Atom + { + -- Theme inspired by Atom 'navarasu/onedark.nvim', priority = 1000, config = function() @@ -81,7 +85,8 @@ require('lazy').setup({ end, }, - { -- Set lualine as statusline + { + -- Set lualine as statusline 'nvim-lualine/lualine.nvim', -- See `:help lualine.txt` opts = { @@ -94,7 +99,8 @@ require('lazy').setup({ }, }, - { -- Add indentation guides even on blank lines + { + -- Add indentation guides even on blank lines 'lukas-reineke/indent-blankline.nvim', -- Enable `lukas-reineke/indent-blankline.nvim` -- See `:help indent_blankline.txt` @@ -105,7 +111,7 @@ require('lazy').setup({ }, -- "gc" to comment visual regions/lines - { 'numToStr/Comment.nvim', opts = {} }, + { 'numToStr/Comment.nvim', opts = {} }, -- Fuzzy Finder (files, lsp, etc) { 'nvim-telescope/telescope.nvim', version = '*', dependencies = { 'nvim-lua/plenary.nvim' } }, @@ -123,7 +129,8 @@ require('lazy').setup({ end, }, - { -- Highlight, edit, and navigate code + { + -- Highlight, edit, and navigate code 'nvim-treesitter/nvim-treesitter', dependencies = { 'nvim-treesitter/nvim-treesitter-textobjects', @@ -246,6 +253,11 @@ vim.keymap.set('n', 'sw', require('telescope.builtin').grep_string, { de vim.keymap.set('n', 'sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' }) vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' }) +-- Copilot Re-alias +vim.g.copilot_no_tab_map = true +vim.g.copilot_assumed_mapped = true +vim.keymap.set('i', '', 'copilot#Accept("")', { expr = true, silent = true }) + -- [[ Configure Treesitter ]] -- See `:help nvim-treesitter` require('nvim-treesitter.configs').setup { @@ -372,9 +384,8 @@ local servers = { -- clangd = {}, -- gopls = {}, -- pyright = {}, - -- rust_analyzer = {}, - -- tsserver = {}, - + rust_analyzer = {}, + tsserver = {}, lua_ls = { Lua = { workspace = { checkThirdParty = false }, From a302871104a09c09e4a1df1de4452b159a439896 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Tue, 4 Apr 2023 16:11:06 -0400 Subject: [PATCH 03/36] Add auto close plugin as well as php parser --- init.lua | 2 +- lua/custom/plugins/init.lua | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index c77b0dc8c54..3c4751edf5e 100644 --- a/init.lua +++ b/init.lua @@ -262,7 +262,7 @@ vim.keymap.set('i', '', 'copilot#Accept("")', { expr = true, silent = t -- See `:help nvim-treesitter` require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vim' }, + ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vim', 'php' }, -- ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'help', 'vim' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 2ad10d8d1bb..e4bf4393e0c 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -5,5 +5,11 @@ return { { "github/copilot.vim" + }, + { + "windwp/nvim-autopairs", + config = function() + require("nvim-autopairs").setup {} + end, } } From 4eba0d9b6d218d4b92eaa5f95d1d29323bf989d1 Mon Sep 17 00:00:00 2001 From: titusdmoore Date: Tue, 4 Apr 2023 20:49:23 -0400 Subject: [PATCH 04/36] Added astro formatting --- lua/custom/plugins/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index e4bf4393e0c..a44f4038d4f 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -11,5 +11,8 @@ return { config = function() require("nvim-autopairs").setup {} end, + }, + { + 'wuelnerdotexe/vim-astro' } } From bd200c89c2e5f1550bda3c08618237c41c738e29 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Wed, 12 Apr 2023 17:59:47 -0400 Subject: [PATCH 05/36] Actually add the file --- lua/custom/plugins/filetree.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 lua/custom/plugins/filetree.lua diff --git a/lua/custom/plugins/filetree.lua b/lua/custom/plugins/filetree.lua new file mode 100644 index 00000000000..b228effe853 --- /dev/null +++ b/lua/custom/plugins/filetree.lua @@ -0,0 +1,14 @@ +vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]]) + +return { + "nvim-neo-tree/neo-tree.nvim", + version = "*", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended + "MunifTanjim/nui.nvim", + }, + config = function() + require('neo-tree').setup {} + end, +} From e70ecd06e6dfc9fbadb2a031a451078e2a1aa0b7 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Thu, 13 Apr 2023 12:11:42 -0400 Subject: [PATCH 06/36] Resolved merge conflicts --- .github/ISSUE_TEMPLATE/bug_report.md | 16 +++++++++------- README.md | 4 ++-- init.lua | 13 ++++--------- lua/kickstart/plugins/debug.lua | 10 ++++------ 4 files changed, 19 insertions(+), 24 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6999d51e856..2ad4d31ddb0 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -8,19 +8,21 @@ assignees: '' --- -**Describe the bug** -A clear and concise description of what the bug is. -**To Reproduce** -Steps to reproduce the behavior: +## Describe the bug + + +## To Reproduce + 1. ... -**Desktop (please complete the following information):** +## Desktop + - OS: - Terminal: -** Neovim Version ** - - Output of running `:version` from inside of neovim: +## Neovim Version + ``` ``` diff --git a/README.md b/README.md index ce72ebbfe64..21fcab3de3f 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ return { } ``` -This will install the tree plugin and add the command `:NeoTree` for you. You can explore the documentation at [neo-tree.nvim](https://github.com/nvim-neo-tree/neo-tree.nvim) for more information. +This will install the tree plugin and add the command `:Neotree` for you. You can explore the documentation at [neo-tree.nvim](https://github.com/nvim-neo-tree/neo-tree.nvim) for more information. #### Example: Adding a file to change default options @@ -118,7 +118,7 @@ Each PR, especially those which increase the line count, should have a descripti Installation may require installing build tools, and updating the run command for `telescope-fzf-native` -See `telescope-fzf-native` documention for [more details](https://github.com/nvim-telescope/telescope-fzf-native.nvim#installation) +See `telescope-fzf-native` documentation for [more details](https://github.com/nvim-telescope/telescope-fzf-native.nvim#installation) This requires: diff --git a/init.lua b/init.lua index 3c4751edf5e..204cd21f699 100644 --- a/init.lua +++ b/init.lua @@ -41,7 +41,7 @@ require('lazy').setup({ 'neovim/nvim-lspconfig', dependencies = { -- Automatically install LSPs to stdpath for neovim - 'williamboman/mason.nvim', + { 'williamboman/mason.nvim', config = true }, 'williamboman/mason-lspconfig.nvim', -- Useful status updates for LSP @@ -135,9 +135,7 @@ require('lazy').setup({ dependencies = { 'nvim-treesitter/nvim-treesitter-textobjects', }, - config = function() - pcall(require('nvim-treesitter.install').update { with_sync = true }) - end, + build = ":TSUpdate", }, -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart @@ -262,8 +260,8 @@ vim.keymap.set('i', '', 'copilot#Accept("")', { expr = true, silent = t -- See `:help nvim-treesitter` require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vim', 'php' }, - -- ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'help', 'vim' }, + ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim', 'php' }, + -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, @@ -401,9 +399,6 @@ require('neodev').setup() local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) --- Setup mason so it can manage external tooling -require('mason').setup() - -- Ensure the servers above are installed local mason_lspconfig = require 'mason-lspconfig' diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua index 0b68c43b94b..000bcb8fc47 100644 --- a/lua/kickstart/plugins/debug.lua +++ b/lua/kickstart/plugins/debug.lua @@ -9,7 +9,6 @@ return { -- NOTE: Yes, you can install new plugins here! 'mfussenegger/nvim-dap', - -- NOTE: And you can specify dependencies as well dependencies = { -- Creates a beautiful debugger UI @@ -22,7 +21,6 @@ return { -- Add your own debuggers here 'leoluz/nvim-dap-go', }, - config = function() local dap = require 'dap' local dapui = require 'dapui' @@ -32,6 +30,10 @@ return { -- reasonable debug configurations automatic_setup = true, + -- You can provide additional configuration to the handlers, + -- see mason-nvim-dap README for more information + handlers = {}, + -- You'll need to check that you have the required things installed -- online, please don't ask me how to install them :) ensure_installed = { @@ -40,10 +42,6 @@ return { }, } - -- You can provide additional configuration to the handlers, - -- see mason-nvim-dap README for more information - require('mason-nvim-dap').setup_handlers() - -- Basic debugging keymaps, feel free to change to your liking! vim.keymap.set('n', '', dap.continue) vim.keymap.set('n', '', dap.step_into) From 17180cbf127067ea418cdcf2def2d303fbd8fe11 Mon Sep 17 00:00:00 2001 From: Titus Moore <52931380+titusdmoore@users.noreply.github.com> Date: Thu, 13 Apr 2023 12:16:18 -0400 Subject: [PATCH 07/36] Update init.lua --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 1cfa228b68e..6be40373e52 100644 --- a/init.lua +++ b/init.lua @@ -286,7 +286,7 @@ vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { de -- See `:help nvim-treesitter` require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim' }, + ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim', 'php' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, From 840b0895c171fc9fecf6d939f1b2bf46fefa7a60 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Fri, 21 Apr 2023 11:28:36 -0400 Subject: [PATCH 08/36] Added vim trainer --- lua/custom/plugins/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index a44f4038d4f..2db2e724c12 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -14,5 +14,8 @@ return { }, { 'wuelnerdotexe/vim-astro' + }, + { + 'ThePrimeagen/vim-be-good' } } From 125979e2b6c349608c6f21015eec2bbfb70b6a7a Mon Sep 17 00:00:00 2001 From: titusdmoore Date: Sat, 22 Apr 2023 12:01:26 -0400 Subject: [PATCH 09/36] Added some vertical motion remaps --- init.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 204cd21f699..9fc2e3c8434 100644 --- a/init.lua +++ b/init.lua @@ -3,6 +3,12 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' +-- Random Motion Keybind Remap +vim.keymap.set('n', '', 'zz', { noremap = true, silent = true }) +vim.keymap.set('n', '', 'zz', { noremap = true, silent = true }) +vim.keymap.set('n', 'n', 'nzzzv', { noremap = true, silent = true }) +vim.keymap.set('n', 'N', 'Nzzzv', { noremap = true, silent = true }) + -- Install package manager -- https://github.com/folke/lazy.nvim -- `:help lazy.nvim.txt` for more info @@ -46,7 +52,7 @@ require('lazy').setup({ -- Useful status updates for LSP -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - { 'j-hui/fidget.nvim', opts = {} }, + { 'j-hui/fidget.nvim', opts = {} }, -- Additional lua configuration, makes nvim stuff amazing! 'folke/neodev.nvim', From 6046259fae95b31a91e8e912b11def4cbc331f99 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Tue, 25 Apr 2023 11:33:46 -0400 Subject: [PATCH 10/36] Added dart --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 9fc2e3c8434..7154737293f 100644 --- a/init.lua +++ b/init.lua @@ -266,7 +266,7 @@ vim.keymap.set('i', '', 'copilot#Accept("")', { expr = true, silent = t -- See `:help nvim-treesitter` require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim', 'php' }, + ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim', 'php', 'dart' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, From fd883927d717397e73267a44956b10bb7ac624b2 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Tue, 25 Apr 2023 17:55:54 -0400 Subject: [PATCH 11/36] Added dart and flutter functionality --- lua/custom/plugins/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 2db2e724c12..1068738909d 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -17,5 +17,8 @@ return { }, { 'ThePrimeagen/vim-be-good' + }, + { + 'thosakwe/vim-flutter' } } From 884eea798ef51dd95aa3d4324d96c855cde7e724 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Mon, 1 May 2023 14:46:13 -0400 Subject: [PATCH 12/36] Added dart --- init.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/init.lua b/init.lua index cee4c189cb8..8c3c6887a2c 100644 --- a/init.lua +++ b/init.lua @@ -423,6 +423,14 @@ mason_lspconfig.setup_handlers { end, } +-- Add dart for lspconfig outside of mason +--dartls = { +--cmd = { '/Users/titusmoore/.flutter/bin/dart', 'language-server', '--protocol=lsp' }, +-- }, +require 'lspconfig'.dartls.setup({ + cmd = { '/Users/titusmoore/.flutter/bin/dart', 'language-server', '--protocol=lsp' }, +}) + -- nvim-cmp setup local cmp = require 'cmp' local luasnip = require 'luasnip' From baf8caa6f5a40ee2bce0f5532151ba199cbc041a Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Mon, 1 May 2023 16:35:50 -0400 Subject: [PATCH 13/36] Added harpoon --- init.lua | 12 ++++++++++++ lua/custom/plugins/init.lua | 3 +++ 2 files changed, 15 insertions(+) diff --git a/init.lua b/init.lua index 8c3c6887a2c..f26e3e0aa51 100644 --- a/init.lua +++ b/init.lua @@ -263,6 +263,18 @@ vim.g.copilot_no_tab_map = true vim.g.copilot_assumed_mapped = true vim.keymap.set('i', '', 'copilot#Accept("")', { expr = true, silent = true }) +-- Configure Harpoon +vim.keymap.set('n', 'hh', require('harpoon.ui').toggle_quick_menu, { desc = '[H]arpoon [H]ome' }) +vim.keymap.set('n', 'hx', require('harpoon.mark').add_file, { desc = '[H]arpoon [X]mark' }) +vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(1) end, { desc = '[H]arpoon [N]avigate [F]ile 1' }) +vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(2) end, { desc = '[H]arpoon [N]avigate [F]ile 2' }) +vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(3) end, { desc = '[H]arpoon [N]avigate [F]ile 3' }) +vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(4) end, { desc = '[H]arpoon [N]avigate [F]ile 4' }) +vim.keymap.set('n', 'hn', function() require('harpoon.ui').nav_next() end, + { desc = '[H]arpoon [N]ext' }) +vim.keymap.set('n', 'hp', function() require('harpoon.ui').nav_prev() end, + { desc = '[H]arpoon [P]revious' }) + -- [[ Configure Treesitter ]] -- See `:help nvim-treesitter` require('nvim-treesitter.configs').setup { diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 1068738909d..4ccc6fc1df0 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -20,5 +20,8 @@ return { }, { 'thosakwe/vim-flutter' + }, + { + 'ThePrimeagen/harpoon' } } From c8306cb467aa936ea9a41e6969e78e84c88d5968 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Fri, 5 May 2023 11:47:26 -0400 Subject: [PATCH 14/36] Added C# support in treesitter --- init.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index f26e3e0aa51..69def9d57b9 100644 --- a/init.lua +++ b/init.lua @@ -279,7 +279,8 @@ vim.keymap.set('n', 'hp', function() require('harpoon.ui').nav_prev() en -- See `:help nvim-treesitter` require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim', 'php', 'dart' }, + ensure_installed = { 'c', 'cpp', 'c_sharp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim', 'php', + 'dart' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, From 3e5806a1392a924c8a337f533101ff98a761224a Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Tue, 13 Jun 2023 16:17:50 -0400 Subject: [PATCH 15/36] Cursor changes --- init.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 69def9d57b9..ccd028d7163 100644 --- a/init.lua +++ b/init.lua @@ -192,6 +192,9 @@ vim.o.smartcase = true -- Keep signcolumn on by default vim.wo.signcolumn = 'yes' +vim.o.guicursor = 'n-v-c-sm:block,i-ci-ve:ver25-Cursor,r-cr-o:hor20,n-v-c:blinkwait700-blinkoff400-blinkon25' + + -- Decrease update time vim.o.updatetime = 250 vim.o.timeout = true @@ -280,7 +283,7 @@ vim.keymap.set('n', 'hp', function() require('harpoon.ui').nav_prev() en require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter ensure_installed = { 'c', 'cpp', 'c_sharp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim', 'php', - 'dart' }, + 'dart', 'zig' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, From 9cc8144f55cbe08772be2dfaf9d59f43aefe491e Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Mon, 24 Jul 2023 14:48:11 -0400 Subject: [PATCH 16/36] Added svelte --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index ccd028d7163..aa3bd437601 100644 --- a/init.lua +++ b/init.lua @@ -283,7 +283,7 @@ vim.keymap.set('n', 'hp', function() require('harpoon.ui').nav_prev() en require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter ensure_installed = { 'c', 'cpp', 'c_sharp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim', 'php', - 'dart', 'zig' }, + 'dart', 'zig', 'svelte' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, From fe74c49386de9f78e8a5d3421c26dc67daf23aaa Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Mon, 24 Jul 2023 15:01:16 -0400 Subject: [PATCH 17/36] Re-enable custom plugins --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 93066a9ab78..9b6cc998914 100644 --- a/init.lua +++ b/init.lua @@ -209,7 +209,7 @@ require('lazy').setup({ -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. -- -- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, }, {}) -- [[ Setting options ]] From e3cc5dd8f957b33a683e02cc87e9e5138916aab5 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Wed, 6 Sep 2023 11:17:59 -0400 Subject: [PATCH 18/36] I added something, kotlin maybe --- init.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/init.lua b/init.lua index f510c3ce6c8..baaae677728 100644 --- a/init.lua +++ b/init.lua @@ -92,7 +92,7 @@ require('lazy').setup({ -- Useful status updates for LSP -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - { 'j-hui/fidget.nvim', tag = 'legacy', opts = {} }, + { 'j-hui/fidget.nvim', tag = 'legacy', opts = {} }, -- Additional lua configuration, makes nvim stuff amazing! 'folke/neodev.nvim', @@ -116,7 +116,7 @@ require('lazy').setup({ }, -- Useful plugin to show you pending keybinds. - { 'folke/which-key.nvim', opts = {} }, + { 'folke/which-key.nvim', opts = {} }, { -- Adds git related signs to the gutter, as well as utilities for managing changes 'lewis6991/gitsigns.nvim', @@ -130,7 +130,8 @@ require('lazy').setup({ changedelete = { text = '~' }, }, on_attach = function(bufnr) - vim.keymap.set('n', 'gp', require('gitsigns').prev_hunk, { buffer = bufnr, desc = '[G]o to [P]revious Hunk' }) + vim.keymap.set('n', 'gp', require('gitsigns').prev_hunk, + { buffer = bufnr, desc = '[G]o to [P]revious Hunk' }) vim.keymap.set('n', 'gn', require('gitsigns').next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' }) vim.keymap.set('n', 'ph', require('gitsigns').preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' }) end, @@ -172,7 +173,7 @@ require('lazy').setup({ }, -- "gc" to comment visual regions/lines - { 'numToStr/Comment.nvim', opts = {} }, + { 'numToStr/Comment.nvim', opts = {} }, -- Fuzzy Finder (files, lsp, etc) { @@ -341,7 +342,7 @@ vim.keymap.set('n', 'hp', function() require('harpoon.ui').nav_prev() en require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter ensure_installed = { 'c', 'cpp', 'c_sharp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim', 'php', - 'dart', 'zig', 'svelte' }, + 'kotlin', 'zig', 'svelte' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, From 590af61a7fe4298206d92999f4b3fc98494b5bf6 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Fri, 3 Nov 2023 18:43:21 -0400 Subject: [PATCH 19/36] Added new theme I think? --- init.lua | 11 +++++++++++ lua/custom/plugins/init.lua | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/init.lua b/init.lua index baaae677728..2e89a693658 100644 --- a/init.lua +++ b/init.lua @@ -138,6 +138,11 @@ require('lazy').setup({ }, }, + -- I want to be able to use this, TODO resolve + -- { + -- "nyoom-engineering/oxocarbon.nvim" + -- }, + { -- Theme inspired by Atom 'navarasu/onedark.nvim', @@ -220,6 +225,12 @@ require('lazy').setup({ { import = 'custom.plugins' }, }, {}) +-- Configure Glow +require('glow').setup({ + style = 'dark', + install_path = os.getenv("GLOW_PATH") +}) + -- [[ Setting options ]] -- See `:help vim.o` -- NOTE: You can change these options as you wish! diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 4ccc6fc1df0..143fbe1962c 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -23,5 +23,10 @@ return { }, { 'ThePrimeagen/harpoon' + }, + { + "ellisonleao/glow.nvim", + config = true, + cmd = "Glow" } } From 2218ce9db8d84c5ae5e2c826f8c297ddf6a36f99 Mon Sep 17 00:00:00 2001 From: titusdmoore Date: Fri, 3 Nov 2023 20:07:57 -0400 Subject: [PATCH 20/36] Changed theme --- init.lua | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/init.lua b/init.lua index 2e89a693658..7e5959d5174 100644 --- a/init.lua +++ b/init.lua @@ -138,20 +138,26 @@ require('lazy').setup({ }, }, - -- I want to be able to use this, TODO resolve - -- { - -- "nyoom-engineering/oxocarbon.nvim" - -- }, - { - -- Theme inspired by Atom - 'navarasu/onedark.nvim', - priority = 1000, - config = function() - vim.cmd.colorscheme 'onedark' + "tiagovla/tokyodark.nvim", + opts = { + -- custom options here + }, + config = function(_, opts) + require("tokyodark").setup(opts) -- calling setup is optional + vim.cmd [[colorscheme tokyodark]] end, }, + -- { + -- -- Theme inspired by Atom + -- 'navarasu/onedark.nvim', + -- priority = 1000, + -- config = function() + -- vim.cmd.colorscheme 'onedark' + -- end, + -- }, + { -- Set lualine as statusline 'nvim-lualine/lualine.nvim', @@ -159,7 +165,7 @@ require('lazy').setup({ opts = { options = { icons_enabled = false, - theme = 'onedark', + theme = 'tokyodark', component_separators = '|', section_separators = '', }, From 78a94034356406c41890e312e3d90d7e20c29e2c Mon Sep 17 00:00:00 2001 From: titusdmoore Date: Fri, 3 Nov 2023 22:28:49 -0400 Subject: [PATCH 21/36] Tokyo Dark --- init.lua | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index 7e5959d5174..5e7814f1cff 100644 --- a/init.lua +++ b/init.lua @@ -139,14 +139,13 @@ require('lazy').setup({ }, { - "tiagovla/tokyodark.nvim", - opts = { - -- custom options here - }, - config = function(_, opts) - require("tokyodark").setup(opts) -- calling setup is optional - vim.cmd [[colorscheme tokyodark]] + "folke/tokyonight.nvim", + lazy = false, + config = function() + vim.cmd.colorscheme 'tokyonight-night' end, + priority = 1000, + opts = {}, }, -- { @@ -165,7 +164,7 @@ require('lazy').setup({ opts = { options = { icons_enabled = false, - theme = 'tokyodark', + theme = 'tokyonight', component_separators = '|', section_separators = '', }, From 9abcc60cf3981f45125699e1c02b636cf710593d Mon Sep 17 00:00:00 2001 From: titusdmoore Date: Fri, 3 Nov 2023 22:46:39 -0400 Subject: [PATCH 22/36] More theme configuration --- init.lua | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/init.lua b/init.lua index 5e7814f1cff..6c4c7753a8a 100644 --- a/init.lua +++ b/init.lua @@ -141,21 +141,18 @@ require('lazy').setup({ { "folke/tokyonight.nvim", lazy = false, - config = function() - vim.cmd.colorscheme 'tokyonight-night' - end, priority = 1000, opts = {}, }, - -- { - -- -- Theme inspired by Atom - -- 'navarasu/onedark.nvim', - -- priority = 1000, - -- config = function() - -- vim.cmd.colorscheme 'onedark' - -- end, - -- }, + { + -- Theme inspired by Atom + 'navarasu/onedark.nvim', + priority = 1000, + config = function() + vim.cmd.colorscheme 'onedark' + end, + }, { -- Set lualine as statusline @@ -236,6 +233,14 @@ require('glow').setup({ install_path = os.getenv("GLOW_PATH") }) +-- Configure Theme +require('tokyonight').setup({ + style = 'night', + terminal_colors = true, + sidebars = { 'qf', 'vista_kind', 'terminal', 'packer' }, +}) +vim.cmd.colorscheme 'tokyonight' + -- [[ Setting options ]] -- See `:help vim.o` -- NOTE: You can change these options as you wish! From 07c76ddd83c48f8574c87c0ce012f947136bca88 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Sat, 4 Nov 2023 15:44:53 -0400 Subject: [PATCH 23/36] Formatting --- init.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/init.lua b/init.lua index baaae677728..0824b2891b3 100644 --- a/init.lua +++ b/init.lua @@ -326,16 +326,16 @@ vim.g.copilot_assumed_mapped = true vim.keymap.set('i', '', 'copilot#Accept("")', { expr = true, silent = true }) -- Configure Harpoon -vim.keymap.set('n', 'hh', require('harpoon.ui').toggle_quick_menu, { desc = '[H]arpoon [H]ome' }) -vim.keymap.set('n', 'hx', require('harpoon.mark').add_file, { desc = '[H]arpoon [X]mark' }) -vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(1) end, { desc = '[H]arpoon [N]avigate [F]ile 1' }) -vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(2) end, { desc = '[H]arpoon [N]avigate [F]ile 2' }) -vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(3) end, { desc = '[H]arpoon [N]avigate [F]ile 3' }) -vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(4) end, { desc = '[H]arpoon [N]avigate [F]ile 4' }) -vim.keymap.set('n', 'hn', function() require('harpoon.ui').nav_next() end, - { desc = '[H]arpoon [N]ext' }) -vim.keymap.set('n', 'hp', function() require('harpoon.ui').nav_prev() end, - { desc = '[H]arpoon [P]revious' }) +-- vim.keymap.set('n', 'hh', require('harpoon.ui').toggle_quick_menu, { desc = '[H]arpoon [H]ome' }) +-- vim.keymap.set('n', 'hx', require('harpoon.mark').add_file, { desc = '[H]arpoon [X]mark' }) +-- vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(1) end, { desc = '[H]arpoon [N]avigate [F]ile 1' }) +-- vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(2) end, { desc = '[H]arpoon [N]avigate [F]ile 2' }) +-- vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(3) end, { desc = '[H]arpoon [N]avigate [F]ile 3' }) +-- vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(4) end, { desc = '[H]arpoon [N]avigate [F]ile 4' }) +-- vim.keymap.set('n', 'hn', function() require('harpoon.ui').nav_next() end, +-- { desc = '[H]arpoon [N]ext' }) +-- vim.keymap.set('n', 'hp', function() require('harpoon.ui').nav_prev() end, +-- { desc = '[H]arpoon [P]revious' }) -- [[ Configure Treesitter ]] -- See `:help nvim-treesitter` From 2b3d0194b918e7418c58bab384442464847b4634 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Sun, 5 Nov 2023 16:07:39 -0500 Subject: [PATCH 24/36] Testing config --- init.lua | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/init.lua b/init.lua index bb63c3ac2c9..b6bb2798335 100644 --- a/init.lua +++ b/init.lua @@ -138,12 +138,23 @@ require('lazy').setup({ }, }, - { - "folke/tokyonight.nvim", - lazy = false, - priority = 1000, - opts = {}, - }, + + + { + "folke/tokyonight.nvim", + lazy = false, + priority = 1000, + opts = {}, + }, + +-- require('tokyonight').setup({ +-- on_highlights = function(h1, c) +-- h1.TelescopeResultsTitle = { +-- bg = c.bg_statusline, +-- fg = c.fg_sidebar, +-- } +-- end +-- }) { -- Theme inspired by Atom From 9e6838bd6ea0b28fc9ddb2cac18c70e089553f22 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Mon, 6 Nov 2023 10:38:34 -0500 Subject: [PATCH 25/36] Lualine config --- init.lua | 135 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 120 insertions(+), 15 deletions(-) diff --git a/init.lua b/init.lua index b6bb2798335..65c6e639c88 100644 --- a/init.lua +++ b/init.lua @@ -140,21 +140,21 @@ require('lazy').setup({ - { - "folke/tokyonight.nvim", - lazy = false, - priority = 1000, - opts = {}, - }, + { + "folke/tokyonight.nvim", + lazy = false, + priority = 1000, + opts = {}, + }, --- require('tokyonight').setup({ --- on_highlights = function(h1, c) --- h1.TelescopeResultsTitle = { --- bg = c.bg_statusline, --- fg = c.fg_sidebar, --- } --- end --- }) + -- require('tokyonight').setup({ + -- on_highlights = function(h1, c) + -- h1.TelescopeResultsTitle = { + -- bg = c.bg_statusline, + -- fg = c.fg_sidebar, + -- } + -- end + -- }) { -- Theme inspired by Atom @@ -174,7 +174,7 @@ require('lazy').setup({ icons_enabled = false, theme = 'tokyonight', component_separators = '|', - section_separators = '', + section_separators = { left = '', right = '' }, }, }, }, @@ -252,6 +252,111 @@ require('tokyonight').setup({ }) vim.cmd.colorscheme 'tokyonight' + +local colors = require('tokyonight.colors').setup() +local empty = require('lualine.component'):extend() +function empty:draw(default_highlight) + self.status = '' + self.applied_separator = '' + self:apply_highlights(default_highlight) + self:apply_section_separators() + return self.status +end + +-- Put proper separators and gaps between components in sections +local function process_sections(sections) + for name, section in pairs(sections) do + local left = name:sub(9, 10) < 'x' + for pos = 1, name ~= 'lualine_z' and #section or #section - 1 do + table.insert(section, pos * 2, { empty, color = { fg = colors.white, bg = colors.white } }) + end + for id, comp in ipairs(section) do + if type(comp) ~= 'table' then + comp = { comp } + section[id] = comp + end + comp.separator = left and { right = '' } or { left = '' } + end + end + return sections +end + +local function search_result() + if vim.v.hlsearch == 0 then + return '' + end + local last_search = vim.fn.getreg('/') + if not last_search or last_search == '' then + return '' + end + local searchcount = vim.fn.searchcount { maxcount = 9999 } + return last_search .. '(' .. searchcount.current .. '/' .. searchcount.total .. ')' +end + +local function modified() + if vim.bo.modified then + return '+' + elseif vim.bo.modifiable == false or vim.bo.readonly == true then + return '-' + end + return '' +end + +require('lualine').setup { + options = { + theme = 'tokyonight', + component_separators = '', + section_separators = { left = '', right = '' }, + }, + sections = process_sections { + lualine_a = { 'mode' }, + lualine_b = { + 'branch', + 'diff', + { + 'diagnostics', + source = { 'nvim' }, + sections = { 'error' }, + diagnostics_color = { error = { bg = colors.red, fg = colors.white } }, + }, + { + 'diagnostics', + source = { 'nvim' }, + sections = { 'warn' }, + diagnostics_color = { warn = { bg = colors.orange, fg = colors.white } }, + }, + { 'filename', file_status = false, path = 1 }, + { modified, color = { bg = colors.red } }, + { + '%w', + cond = function() + return vim.wo.previewwindow + end, + }, + { + '%r', + cond = function() + return vim.bo.readonly + end, + }, + { + '%q', + cond = function() + return vim.bo.buftype == 'quickfix' + end, + }, + }, + lualine_c = {}, + lualine_x = {}, + lualine_y = { search_result, 'filetype' }, + lualine_z = { '%l:%c', '%p%%/%L' }, + }, + inactive_sections = { + lualine_c = { '%f %y %m' }, + lualine_x = {}, + }, +} + -- [[ Setting options ]] -- See `:help vim.o` -- NOTE: You can change these options as you wish! From 36f9cbb3590e433d996c6870fd1f69bca581917f Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Tue, 7 Nov 2023 12:54:16 -0500 Subject: [PATCH 26/36] Fixed telescope highlighting --- init.lua | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/init.lua b/init.lua index 65c6e639c88..fe3bb05fccf 100644 --- a/init.lua +++ b/init.lua @@ -147,23 +147,15 @@ require('lazy').setup({ opts = {}, }, - -- require('tokyonight').setup({ - -- on_highlights = function(h1, c) - -- h1.TelescopeResultsTitle = { - -- bg = c.bg_statusline, - -- fg = c.fg_sidebar, - -- } - -- end - -- }) - { - -- Theme inspired by Atom - 'navarasu/onedark.nvim', - priority = 1000, - config = function() - vim.cmd.colorscheme 'onedark' - end, - }, + -- { + -- -- Theme inspired by Atom + -- 'navarasu/onedark.nvim', + -- priority = 1000, + -- config = function() + -- vim.cmd.colorscheme 'onedark' + -- end, + -- }, { -- Set lualine as statusline @@ -249,6 +241,12 @@ require('tokyonight').setup({ style = 'night', terminal_colors = true, sidebars = { 'qf', 'vista_kind', 'terminal', 'packer' }, + on_highlights = function(hl, c) + hl.TelescopeSelection = { + fg = c.cyan, + bg = c.bg_visual, + } + end }) vim.cmd.colorscheme 'tokyonight' From aaa3e175330f668e0b2d955e961461355dd91497 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Wed, 20 Dec 2023 21:11:33 -0500 Subject: [PATCH 27/36] Not sure what changed, but here it is --- init.lua | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/init.lua b/init.lua index fe3bb05fccf..c965a9d620a 100644 --- a/init.lua +++ b/init.lua @@ -461,16 +461,16 @@ vim.g.copilot_assumed_mapped = true vim.keymap.set('i', '', 'copilot#Accept("")', { expr = true, silent = true }) -- Configure Harpoon --- vim.keymap.set('n', 'hh', require('harpoon.ui').toggle_quick_menu, { desc = '[H]arpoon [H]ome' }) --- vim.keymap.set('n', 'hx', require('harpoon.mark').add_file, { desc = '[H]arpoon [X]mark' }) --- vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(1) end, { desc = '[H]arpoon [N]avigate [F]ile 1' }) --- vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(2) end, { desc = '[H]arpoon [N]avigate [F]ile 2' }) --- vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(3) end, { desc = '[H]arpoon [N]avigate [F]ile 3' }) --- vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(4) end, { desc = '[H]arpoon [N]avigate [F]ile 4' }) --- vim.keymap.set('n', 'hn', function() require('harpoon.ui').nav_next() end, --- { desc = '[H]arpoon [N]ext' }) --- vim.keymap.set('n', 'hp', function() require('harpoon.ui').nav_prev() end, --- { desc = '[H]arpoon [P]revious' }) +vim.keymap.set('n', 'hh', require('harpoon.ui').toggle_quick_menu, { desc = '[H]arpoon [H]ome' }) +vim.keymap.set('n', 'hx', require('harpoon.mark').add_file, { desc = '[H]arpoon [X]mark' }) +vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(1) end, { desc = '[H]arpoon [N]avigate [F]ile 1' }) +vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(2) end, { desc = '[H]arpoon [N]avigate [F]ile 2' }) +vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(3) end, { desc = '[H]arpoon [N]avigate [F]ile 3' }) +vim.keymap.set('n', '', function() require('harpoon.ui').nav_file(4) end, { desc = '[H]arpoon [N]avigate [F]ile 4' }) +vim.keymap.set('n', 'hn', function() require('harpoon.ui').nav_next() end, + { desc = '[H]arpoon [N]ext' }) +vim.keymap.set('n', 'hp', function() require('harpoon.ui').nav_prev() end, + { desc = '[H]arpoon [P]revious' }) -- [[ Configure Treesitter ]] -- See `:help nvim-treesitter` @@ -484,6 +484,10 @@ require('nvim-treesitter.configs').setup { highlight = { enable = true }, indent = { enable = true }, + injection = { + enable = true, + language_tree = true, + }, incremental_selection = { enable = true, keymaps = { From 9666b52b58a877240bfc3ed8f6b196c996960338 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Wed, 7 Feb 2024 13:21:37 -0500 Subject: [PATCH 28/36] Added leptos --- init.lua | 18 +++++++++++++++++- lazy-lock.json | 5 +++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/init.lua b/init.lua index 0901e1cd54b..3809e9d16c6 100644 --- a/init.lua +++ b/init.lua @@ -586,7 +586,7 @@ vim.defer_fn(function() require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter ensure_installed = { 'c', 'cpp', 'c_sharp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim', 'php', - 'kotlin', 'zig', 'svelte', 'bash' }, + 'kotlin', 'zig', 'svelte', 'bash' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, @@ -777,6 +777,22 @@ require 'lspconfig'.dartls.setup({ cmd = { '/Users/titusmoore/.flutter/bin/dart', 'language-server', '--protocol=lsp' }, }) +-- Leptos Config +require('lspconfig').rust_analyzer.setup { + settings = { + ['rust-analyzer'] = { + procMacro = { + ignore = { + leptos_macro = { + "component", + "server" + } + } + }, + }, + }, +} + -- [[ Configure nvim-cmp ]] -- See `:help cmp` local cmp = require 'cmp' diff --git a/lazy-lock.json b/lazy-lock.json index f8a09eda565..26c22f962eb 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,10 +1,11 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b" }, + "LuaSnip": { "branch": "master", "commit": "57c9f5c31b3d712376c704673eac8e948c82e9c1" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot.vim": { "branch": "release", "commit": "5b19fb001d7f31c4c7c5556d7a97b243bd29f45f" }, - "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, + "fidget.nvim": { "branch": "main", "commit": "7638c0dd51be8078e10263d73eecfdd42262d69b" }, "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, "glow.nvim": { "branch": "main", "commit": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5" }, From 2ce82ea8ed231fa08d48e9707649aca9ec25985e Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Wed, 27 Nov 2024 09:45:33 -0500 Subject: [PATCH 29/36] Update items from mac --- init.lua | 16 +++++----- lazy-lock.json | 63 ++++++++++++++++++------------------- lua/custom/plugins/init.lua | 5 --- 3 files changed, 39 insertions(+), 45 deletions(-) diff --git a/init.lua b/init.lua index 6fd7947c7f2..0bab374b109 100644 --- a/init.lua +++ b/init.lua @@ -94,7 +94,7 @@ require('lazy').setup({ -- Useful status updates for LSP -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - { 'j-hui/fidget.nvim', opts = {} }, + { 'j-hui/fidget.nvim', opts = {} }, -- Additional lua configuration, makes nvim stuff amazing! 'folke/neodev.nvim', @@ -212,7 +212,13 @@ require('lazy').setup({ "folke/tokyonight.nvim", lazy = false, priority = 1000, - opts = {}, + opts = { + transparent = true, + styles = { + sidebars = "transparent", + floats = "transparent", + } + }, }, @@ -296,12 +302,6 @@ require('lazy').setup({ { import = 'custom.plugins' }, }, {}) --- Configure Glow -require('glow').setup({ - style = 'dark', - install_path = os.getenv("GLOW_PATH") -}) - -- Configure Theme require('tokyonight').setup({ style = 'night', diff --git a/lazy-lock.json b/lazy-lock.json index 26c22f962eb..c0de756ca3c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,38 +1,37 @@ { - "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "57c9f5c31b3d712376c704673eac8e948c82e9c1" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, + "LuaSnip": { "branch": "master", "commit": "0f7bbce41ea152a94d12aea286f2ce98e63c0f58" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "copilot.vim": { "branch": "release", "commit": "5b19fb001d7f31c4c7c5556d7a97b243bd29f45f" }, - "fidget.nvim": { "branch": "main", "commit": "7638c0dd51be8078e10263d73eecfdd42262d69b" }, - "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, - "glow.nvim": { "branch": "main", "commit": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5" }, - "harpoon": { "branch": "master", "commit": "867e212ac153e793f95b316d1731f3ca1894625e" }, - "indent-blankline.nvim": { "branch": "master", "commit": "f3eb33c04c3c5028b4efa7dbf8f68abdb6ab50ed" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" }, - "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, - "neo-tree.nvim": { "branch": "main", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, - "neodev.nvim": { "branch": "main", "commit": "93ab59d5d436b36698c14d0374150a7e5e7bccb6" }, - "nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" }, - "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, - "nvim-lspconfig": { "branch": "master", "commit": "a2e84ddef8d17a71dc8115f72e264c97328f5d33" }, - "nvim-treesitter": { "branch": "master", "commit": "732c8cb0b43b7336525c3cecb2e28db153994e62" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" }, - "nvim-web-devicons": { "branch": "master", "commit": "a1425903ab52a0a0460622519e827f224e5b4fee" }, - "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" }, + "fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" }, + "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, + "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, + "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, + "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" }, + "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, + "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, + "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, + "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, + "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, + "nvim-cmp": { "branch": "main", "commit": "ed31156aa2cc14e3bc066c59357cc91536a2bc01" }, + "nvim-lspconfig": { "branch": "master", "commit": "4ae9796c4e95ca84ec77946a9f9089b8f1a3eec9" }, + "nvim-treesitter": { "branch": "master", "commit": "8d4fdc5e47e2a4e00179e43f56221250ce365973" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, + "nvim-web-devicons": { "branch": "master", "commit": "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, + "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "tokyonight.nvim": { "branch": "main", "commit": "c2725eb6d086c8c9624456d734bd365194660017" }, "vim-astro": { "branch": "main", "commit": "9b4674ecfe1dd84b5fb9b4de1653975de6e8e2e1" }, - "vim-be-good": { "branch": "master", "commit": "c290810728a4f75e334b07dc0f3a4cdea908d351" }, + "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" }, "vim-flutter": { "branch": "master", "commit": "422ff301a4fe7b989b79b83adf95add0c71ffda5" }, - "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, + "vim-fugitive": { "branch": "master", "commit": "320b18fba2a4f2fe3c8225c778c687e0d2620384" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, - "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } + "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, + "which-key.nvim": { "branch": "main", "commit": "b9684c6ec54d8a8452bdcf0d613c7ad0223fc3fe" } } \ No newline at end of file diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 143fbe1962c..e2748db5330 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -24,9 +24,4 @@ return { { 'ThePrimeagen/harpoon' }, - { - "ellisonleao/glow.nvim", - config = true, - cmd = "Glow" - } } From 63da41e1d3534a7fcb4388ea757189bcf398e3b0 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Tue, 18 Feb 2025 14:07:21 -0500 Subject: [PATCH 30/36] Small quality of life updates --- init.lua | 19 ++++++++----- lazy-lock.json | 53 ++++++++++++++++++------------------- lua/custom/plugins/init.lua | 24 ++++++++++++----- 3 files changed, 56 insertions(+), 40 deletions(-) diff --git a/init.lua b/init.lua index 789d5d1c351..ec588901b46 100644 --- a/init.lua +++ b/init.lua @@ -279,7 +279,7 @@ require('lazy').setup({ -- Then, because we use the `opts` key (recommended), the configuration runs -- after the plugin has been loaded as `require(MODULE).setup(opts)`. - { -- Useful plugin to show you pending keybinds. + { -- Useful plugin to show you pending keybinds. 'folke/which-key.nvim', event = 'VimEnter', -- Sets the loading event to 'VimEnter' opts = { @@ -325,7 +325,7 @@ require('lazy').setup({ -- Document existing key chains spec = { - { 'c', group = '[C]ode', mode = { 'n', 'x' } }, + { 'c', group = '[C]ode', mode = { 'n', 'x' } }, { 'd', group = '[D]ocument' }, { 'r', group = '[R]ename' }, { 's', group = '[S]earch' }, @@ -365,7 +365,7 @@ require('lazy').setup({ { 'nvim-telescope/telescope-ui-select.nvim' }, -- Useful for getting pretty icons, but requires a Nerd Font. - { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, + { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, }, config = function() -- Telescope is a fuzzy finder that comes with a lot of different things that @@ -473,7 +473,7 @@ require('lazy').setup({ 'WhoIsSethDaniel/mason-tool-installer.nvim', -- Useful status updates for LSP. - { 'j-hui/fidget.nvim', opts = {} }, + { 'j-hui/fidget.nvim', opts = {} }, -- Allows extra capabilities provided by nvim-cmp 'hrsh7th/cmp-nvim-lsp', @@ -991,8 +991,7 @@ require('lazy').setup({ -- This is the easiest way to modularize your config. -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- { import = 'custom.plugins' }, - -- + { import = 'custom.plugins' }, -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! -- In normal mode type `sh` then write `lazy.nvim-plugin` @@ -1019,5 +1018,13 @@ require('lazy').setup({ }, }) +-- CUSTOM REMAPS +-- Random Motion Keybind Remap +vim.keymap.set('n', '', 'zz', { noremap = true, silent = true }) +vim.keymap.set('n', '', 'zz', { noremap = true, silent = true }) +vim.keymap.set('n', 'n', 'nzzzv', { noremap = true, silent = true }) +vim.keymap.set('n', 'N', 'Nzzzv', { noremap = true, silent = true }) +-- END CUSTOM REMAPS + -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lazy-lock.json b/lazy-lock.json index c0de756ca3c..83811954202 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,37 +1,36 @@ { - "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "0f7bbce41ea152a94d12aea286f2ce98e63c0f58" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, + "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "conform.nvim": { "branch": "master", "commit": "a6f5bdb78caa305496357d17e962bbc4c0b392e2" }, "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" }, - "fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" }, - "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, - "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, + "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, + "gitsigns.nvim": { "branch": "main", "commit": "6668f379ca634c36b8e11453118590b91bf8b295" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, - "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" }, - "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, - "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, - "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-cmp": { "branch": "main", "commit": "ed31156aa2cc14e3bc066c59357cc91536a2bc01" }, - "nvim-lspconfig": { "branch": "master", "commit": "4ae9796c4e95ca84ec77946a9f9089b8f1a3eec9" }, - "nvim-treesitter": { "branch": "master", "commit": "8d4fdc5e47e2a4e00179e43f56221250ce365973" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, + "lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" }, + "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "374c78d3ebb5c53f43ea6bd906b6587b5e899b9e" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "mini.nvim": { "branch": "main", "commit": "a84b7e555fe382c1859e6ca46b4983c822a1f77f" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "e96fd85bf18bc345dab332b345098fa5460dffac" }, + "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, + "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, + "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, + "nvim-lspconfig": { "branch": "master", "commit": "1110787f1b464888c59a044c48c5119d14078044" }, + "nvim-treesitter": { "branch": "master", "commit": "1a6e42bb8c5c23d8e2c0acb842dcacac5ee06761" }, "nvim-web-devicons": { "branch": "master", "commit": "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509" }, - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "2a5ceff981501cff8f46871d5402cd3378a8ab6a" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "tokyonight.nvim": { "branch": "main", "commit": "c2725eb6d086c8c9624456d734bd365194660017" }, + "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, + "tokyonight.nvim": { "branch": "main", "commit": "c8ea87cd34b0267c44a67e90ff8f6e7d6af46ff9" }, "vim-astro": { "branch": "main", "commit": "9b4674ecfe1dd84b5fb9b4de1653975de6e8e2e1" }, - "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" }, + "vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" }, "vim-flutter": { "branch": "master", "commit": "422ff301a4fe7b989b79b83adf95add0c71ffda5" }, - "vim-fugitive": { "branch": "master", "commit": "320b18fba2a4f2fe3c8225c778c687e0d2620384" }, - "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, - "which-key.nvim": { "branch": "main", "commit": "b9684c6ec54d8a8452bdcf0d613c7ad0223fc3fe" } -} \ No newline at end of file + "which-key.nvim": { "branch": "main", "commit": "5bf7a73fe851896d5ac26d313db849bf00f45b78" } +} diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index e2748db5330..9ca212998f5 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -4,24 +4,34 @@ -- See the kickstart.nvim README for more information return { { - "github/copilot.vim" + 'github/copilot.vim', }, { - "windwp/nvim-autopairs", + 'windwp/nvim-autopairs', config = function() - require("nvim-autopairs").setup {} + require('nvim-autopairs').setup {} end, }, { - 'wuelnerdotexe/vim-astro' + 'wuelnerdotexe/vim-astro', }, { - 'ThePrimeagen/vim-be-good' + 'ThePrimeagen/vim-be-good', }, { - 'thosakwe/vim-flutter' + 'thosakwe/vim-flutter', }, { - 'ThePrimeagen/harpoon' + 'ThePrimeagen/harpoon', + }, + { + 'nvim-neo-tree/neo-tree.nvim', + branch = 'v3.x', + dependencies = { + 'nvim-lua/plenary.nvim', + 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended + 'MunifTanjim/nui.nvim', + -- {"3rd/image.nvim", opts = {}}, -- Optional image support in preview window: See `# Preview Mode` for more information + }, }, } From fab0cb7e278294c2b4edd3394bff9f145bd38d64 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Tue, 18 Feb 2025 14:10:44 -0500 Subject: [PATCH 31/36] Relative line numbers --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index ec588901b46..5362ceefbbf 100644 --- a/init.lua +++ b/init.lua @@ -102,7 +102,7 @@ vim.g.have_nerd_font = false vim.opt.number = true -- You can also add relative line numbers, to help with jumping. -- Experiment for yourself to see if you like it! --- vim.opt.relativenumber = true +vim.opt.relativenumber = true -- Enable mouse mode, can be useful for resizing splits for example! vim.opt.mouse = 'a' From 25b6aeff3a1912bea9d3b207e5c15cf1eb764746 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Fri, 21 Mar 2025 16:30:13 -0400 Subject: [PATCH 32/36] Updated harpoon --- init.lua | 34 ++++++++++++++++++++++++++++++++++ lua/custom/plugins/init.lua | 2 ++ 2 files changed, 36 insertions(+) diff --git a/init.lua b/init.lua index 5362ceefbbf..b5af30ffe1a 100644 --- a/init.lua +++ b/init.lua @@ -1026,5 +1026,39 @@ vim.keymap.set('n', 'n', 'nzzzv', { noremap = true, silent = true }) vim.keymap.set('n', 'N', 'Nzzzv', { noremap = true, silent = true }) -- END CUSTOM REMAPS +-- CUSTOM CODE +local harpoon = require 'harpoon' + +harpoon:setup() + +-- Harpoon Remaps +vim.set('n', 'ha', function() + harpoon:list():add() +end) +vim.set('n', 'hh', function() + harpoon.ui:toggle_quick_menu(harpoon:list()) +end) + +vim.set('n', '', function() + harpoon:list():select(1) +end) +vim.set('n', '', function() + harpoon:list():select(2) +end) +vim.set('n', '', function() + harpoon:list():select(3) +end) +vim.set('n', '', function() + harpoon:list():select(4) +end) + +vim.set('n', '', function() + harpoon:list():prev() +end) +vim.set('n', '', function() + harpoon:list():next() +end) +-- END CUSTOM CODE + -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 9ca212998f5..907ae699554 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -23,6 +23,8 @@ return { }, { 'ThePrimeagen/harpoon', + branch = 'harpoon2', + dependencies = { 'nvim-lua/plenary.nvim' }, }, { 'nvim-neo-tree/neo-tree.nvim', From 6b5dea1f3813dbe8e1d11c59cfb0c0c21b90c65f Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Fri, 21 Mar 2025 16:32:31 -0400 Subject: [PATCH 33/36] Fix typo in vim.set to vim.keymap.set --- init.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index b5af30ffe1a..f9645158ede 100644 --- a/init.lua +++ b/init.lua @@ -1032,30 +1032,30 @@ local harpoon = require 'harpoon' harpoon:setup() -- Harpoon Remaps -vim.set('n', 'ha', function() +vim.keymap.set('n', 'ha', function() harpoon:list():add() end) -vim.set('n', 'hh', function() +vim.keymap.set('n', 'hh', function() harpoon.ui:toggle_quick_menu(harpoon:list()) end) -vim.set('n', '', function() +vim.keymap.set('n', '', function() harpoon:list():select(1) end) -vim.set('n', '', function() +vim.keymap.set('n', '', function() harpoon:list():select(2) end) -vim.set('n', '', function() +vim.keymap.set('n', '', function() harpoon:list():select(3) end) -vim.set('n', '', function() +vim.keymap.set('n', '', function() harpoon:list():select(4) end) -vim.set('n', '', function() +vim.keymap.set('n', '', function() harpoon:list():prev() end) -vim.set('n', '', function() +vim.keymap.set('n', '', function() harpoon:list():next() end) -- END CUSTOM CODE From f39e83bfae2bf6f209b81b9155a16f2cc4835157 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Fri, 21 Mar 2025 16:55:41 -0400 Subject: [PATCH 34/36] Updated packages to fix fatal errors after adding harpoon --- lazy-lock.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 83811954202..3374c26f9a0 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -4,33 +4,33 @@ "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "conform.nvim": { "branch": "master", "commit": "a6f5bdb78caa305496357d17e962bbc4c0b392e2" }, - "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" }, + "conform.nvim": { "branch": "master", "commit": "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5" }, + "copilot.vim": { "branch": "release", "commit": "5015939f131627a6a332c9e3ecad9a7cb4c2e549" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, - "gitsigns.nvim": { "branch": "main", "commit": "6668f379ca634c36b8e11453118590b91bf8b295" }, - "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, - "lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" }, - "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" }, + "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, + "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "374c78d3ebb5c53f43ea6bd906b6587b5e899b9e" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "5639d58a3d11ff7c05c8e31e159bfedae55d7961" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mini.nvim": { "branch": "main", "commit": "a84b7e555fe382c1859e6ca46b4983c822a1f77f" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "e96fd85bf18bc345dab332b345098fa5460dffac" }, - "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, - "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, - "nvim-lspconfig": { "branch": "master", "commit": "1110787f1b464888c59a044c48c5119d14078044" }, - "nvim-treesitter": { "branch": "master", "commit": "1a6e42bb8c5c23d8e2c0acb842dcacac5ee06761" }, + "mini.nvim": { "branch": "main", "commit": "9425f0e30e8d426a8c918c417df76ebf2d6bfc99" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, + "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, + "nvim-autopairs": { "branch": "master", "commit": "6522027785b305269fa17088395dfc0f456cedd2" }, + "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" }, + "nvim-lspconfig": { "branch": "master", "commit": "fb733ac734249ccf293e5c8018981d4d8f59fa8f" }, + "nvim-treesitter": { "branch": "master", "commit": "5f38dffb6a07669a678f073bfe0f62b1a020dffc" }, "nvim-web-devicons": { "branch": "master", "commit": "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "2a5ceff981501cff8f46871d5402cd3378a8ab6a" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "tokyonight.nvim": { "branch": "main", "commit": "c8ea87cd34b0267c44a67e90ff8f6e7d6af46ff9" }, + "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "vim-astro": { "branch": "main", "commit": "9b4674ecfe1dd84b5fb9b4de1653975de6e8e2e1" }, "vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" }, "vim-flutter": { "branch": "master", "commit": "422ff301a4fe7b989b79b83adf95add0c71ffda5" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, - "which-key.nvim": { "branch": "main", "commit": "5bf7a73fe851896d5ac26d313db849bf00f45b78" } + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } From 6d0c7e1e7a1878bfd71c23fb36714b1eb07bbc05 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Tue, 25 Mar 2025 10:54:45 -0400 Subject: [PATCH 35/36] Modified harpoon binds --- init.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index f9645158ede..273a86248a3 100644 --- a/init.lua +++ b/init.lua @@ -1051,11 +1051,14 @@ end) vim.keymap.set('n', '', function() harpoon:list():select(4) end) +vim.keymap.set('n', '', function() + harpoon:list():select(5) +end) -vim.keymap.set('n', '', function() +vim.keymap.set('n', '', function() harpoon:list():prev() end) -vim.keymap.set('n', '', function() +vim.keymap.set('n', '', function() harpoon:list():next() end) -- END CUSTOM CODE From 955b41e84dbafdfadb2ab3fad2cb18c628a05f42 Mon Sep 17 00:00:00 2001 From: Titus Moore Date: Tue, 25 Mar 2025 11:03:11 -0400 Subject: [PATCH 36/36] Update lock --- lazy-lock.json | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 3374c26f9a0..f0ecb6fb58f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -5,23 +5,22 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "conform.nvim": { "branch": "master", "commit": "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5" }, - "copilot.vim": { "branch": "release", "commit": "5015939f131627a6a332c9e3ecad9a7cb4c2e549" }, + "copilot.vim": { "branch": "release", "commit": "a9228e015528c9307890c48083c925eb98a64a79" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "5639d58a3d11ff7c05c8e31e159bfedae55d7961" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "98767d37f8e5255a5111fc1e3163232d4dc07bda" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mini.nvim": { "branch": "main", "commit": "9425f0e30e8d426a8c918c417df76ebf2d6bfc99" }, + "mini.nvim": { "branch": "main", "commit": "3ad46cdb7a51281e0024416023b56cf5c7909ae7" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, "nvim-autopairs": { "branch": "master", "commit": "6522027785b305269fa17088395dfc0f456cedd2" }, "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" }, - "nvim-lspconfig": { "branch": "master", "commit": "fb733ac734249ccf293e5c8018981d4d8f59fa8f" }, - "nvim-treesitter": { "branch": "master", "commit": "5f38dffb6a07669a678f073bfe0f62b1a020dffc" }, - "nvim-web-devicons": { "branch": "master", "commit": "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509" }, + "nvim-lspconfig": { "branch": "master", "commit": "200280dab91a7df2ca42fd2ab3cb4c5fab056666" }, + "nvim-treesitter": { "branch": "master", "commit": "e329e94a6a0a5ccf6ec8bfec1d10faf5eaae665f" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },