Refining harpoon2 keybindings and add telescope binding

Change wrap indicator to 95 (company standards)

.gitignore

@@ -1 +1,3 @@
 plugin/packer_compiled.lua
+lazy-lock.json
+

after/plugin/harpoon.lua

@@ -1,11 +1,47 @@
--- fast switching between files
-local mark = require("harpoon.mark")
-local ui = require("harpoon.ui")
+local harpoon = require("harpoon")
 
-vim.keymap.set("n", "<leader>a", mark.add_file)
-vim.keymap.set("n", "<leader>h", ui.toggle_quick_menu)
+-- REQUIRED
+harpoon:setup({})
+-- REQUIRED
+--
+-- basic telescope configuration
+local conf = require("telescope.config").values
+local function toggle_telescope(harpoon_files)
+    local file_paths = {}
+    for _, item in ipairs(harpoon_files.items) do
+        table.insert(file_paths, item.value)
+    end
 
-vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
-vim.keymap.set("n", "<C-j>", function() ui.nav_file(2) end)
-vim.keymap.set("n", "<C-k>", function() ui.nav_file(3) end)
-vim.keymap.set("n", "<C-l>", function() ui.nav_file(4) end)
+    require("telescope.pickers").new({}, {
+        prompt_title = "Harpoon",
+        finder = require("telescope.finders").new_table({
+            results = file_paths,
+        }),
+        previewer = conf.file_previewer({}),
+        sorter = conf.generic_sorter({}),
+    }):find()
+end
+
+vim.keymap.set("n", "<leader>H", function() toggle_telescope(harpoon:list()) end,
+    { desc = "Open harpoon in telescope" })
+
+
+vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end,
+    { desc = "Harpoon: Add current buffer" })
+vim.keymap.set("n", "<leader>h", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end,
+    { desc = "Harpoon: Toggle quick menu" })
+
+vim.keymap.set("n", "<C-h>", function() harpoon:list():select(1) end)
+vim.keymap.set("n", "<C-j>", function() harpoon:list():select(2) end)
+vim.keymap.set("n", "<C-k>", function() harpoon:list():select(3) end)
+vim.keymap.set("n", "<C-l>", function() harpoon:list():select(4) end)
+vim.keymap.set("n", "<C-y>", function() harpoon:list():select(5) end)
+vim.keymap.set("n", "<C-u>", function() harpoon:list():select(6) end)
+vim.keymap.set("n", "<C-i>", function() harpoon:list():select(7) end)
+vim.keymap.set("n", "<C-o>", function() harpoon:list():select(8) end)
+
+-- Toggle previous & next buffers stored within Harpoon list
+vim.keymap.set("n", "<C-S-P>", function() harpoon:list():prev() end,
+    { desc = "Harpoon: Previous buffer" })
+vim.keymap.set("n", "<C-S-N>", function() harpoon:list():next() end,
+    { desc = "Harpoon: Next buffer" })

after/plugin/lsp.lua

@@ -1,11 +1,15 @@
--- language server manager (via Mason)
-local lsp = require('lsp-zero').preset({})
+local lsp_zero = require('lsp-zero')
 
-lsp.on_attach(function(client, bufnr)
-  lsp.default_keymaps({buffer = bufnr})
+lsp_zero.on_attach(function(client, bufnr)
+    -- see :help lsp-zero-keybindings
+    -- to learn the available actions
+    lsp_zero.default_keymaps({buffer = bufnr})
 end)
 
--- (Optional) Configure lua language server for neovim
-require('lspconfig').lua_ls.setup(lsp.nvim_lua_ls())
-
-lsp.setup()
+require('mason').setup({})
+require('mason-lspconfig').setup({
+    ensure_installed = {},
+    handlers = {
+        lsp_zero.default_setup,
+    },
+})

after/plugin/neorg.lua

@@ -1,7 +0,0 @@
--- Note keymaps
-vim.keymap.set("n", "<leader>ni", ":Neorg index<CR>")
-vim.keymap.set("n", "<leader>nr", ":Neorg return<CR>")
-vim.keymap.set("n", "<leader>nj", ":Neorg journal custom<CR>")
-
-vim.keymap.set("n", "<leader>nim", ":Neorg inject-metadata<CR>")
-vim.keymap.set("n", "<leader>nis", ":Neorg inject-metadata<CR>")

after/plugin/treesitter.lua

@@ -1,7 +1,7 @@
 -- parsing and highlighting
 require'nvim-treesitter.configs'.setup {
   -- A list of parser names, or "all" (the five listed parsers should always be installed)
-  ensure_installed = { "python", "javascript", "php", "typescript", "c", "rust", "bash", "lua", "vim", "vimdoc", "query" },
+  ensure_installed = { "python", "javascript", "php", "typescript", "bash", "lua", "vim", "vimdoc", "query" },
 
   -- Install parsers synchronously (only applied to `ensure_installed`)
   sync_install = false,
@@ -11,13 +11,10 @@ require'nvim-treesitter.configs'.setup {
   auto_install = true,
 
   highlight = {
-    enable = true,
+      enable = true,
+  },
 
-
-    -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-    -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-    -- Using this option may slow down your editor, and you may see some duplicate highlights.
-    -- Instead of true it can also be a list of languages
-    additional_vim_regex_highlighting = false,
+  indent = {
+      enable = true,
   },
 }

init.lua

@@ -1 +1,16 @@
 require("sevi-kun")
+
+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("lazy").setup("sevi-kun.plugins")

lua/sevi-kun/packer.lua

@@ -1,142 +0,0 @@
--- This file can be loaded by calling `lua require('plugins')` from your init.vim
-
--- Only required if you have packer configured as `opt`
-vim.cmd [[packadd packer.nvim]]
-
-return require('packer').startup(function(use)
-    -- Packer can manage itself
-    use 'wbthomason/packer.nvim'
-
-
-    -- treesitter
-    use ('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'})
-    use ('nvim-treesitter/playground')
-    use ('nvim-treesitter/nvim-treesitter-context')
-
-
-    -- useful
-    use { 'rmagatti/auto-session' }
-
-    use {
-        'rmagatti/session-lens',
-        requires = {'rmagatti/auto-session', 'nvim-telescope/telescope.nvim'},
-    }
-
-    use {
-        'nvim-telescope/telescope.nvim', tag = '0.1.2',
-        requires = 'nvim-lua/plenary.nvim'
-    }
-
-    use {
-        'ThePrimeagen/harpoon',
-        requires = 'nvim-lua/plenary.nvim'
-    }
-
-    use {
-        'NeogitOrg/neogit',
-        requires = 'nvim-lua/plenary.nvim'
-    }
-
-    use { 'stevearc/oil.nvim' }
-
-    use {
-        "nvim-neorg/neorg",
-        tag = "*",
-        run = ":Neorg sync-parsers",
-        requires = "nvim-lua/plenary.nvim",
-        config = function ()
-            require('neorg').setup {
-                load = {
-                    ["core.defaults"] = {},
-                    ["core.concealer"] = {},
-                    ["core.summary"] = {},
-                    ["core.export"] = {},
-                    ["core.export.markdown"] = {},
-                    ["core.ui"] = {},
-                    ["core.ui.calendar"] = {},
-                    ["core.dirman"] = {
-                        config = {
-                            workspaces = {
-                                notes = os.getenv("LOCALAPPDATA") .. "\\nvim-data\\Notes",
-                            },
-                            default_workspace = "notes",
-                        },
-                    },
-                },
-            }
-        end
-    }
-
-    use({
-        "kylechui/nvim-surround",
-        tag = "*", -- Use for stability; omit to use `main` branch for the latest features
-        config = function()
-            require("nvim-surround").setup()
-        end
-    })
-
-    use {
-        'numToStr/Comment.nvim',
-        config = function()
-            require('Comment').setup()
-        end
-    }
-
-    use ('mbbill/undotree')
-
-    use {
-        'm4xshen/autoclose.nvim',
-        config = function ()
-            require("autoclose").setup()
-        end
-    }
-
-
-    -- pretty
-    use {
-        "loctvl842/monokai-pro.nvim",
-        config = function()
-            require("monokai-pro").setup()
-            vim.cmd([[colorscheme monokai-pro]])
-        end
-    }
-
-    use { "lukas-reineke/indent-blankline.nvim" }
-
-    use {
-        "utilyre/barbecue.nvim", tag = "*",
-        requires = {
-            "SmiteshP/nvim-navic",
-            "nvim-tree/nvim-web-devicons", -- optional dependency
-        },
-        after = "nvim-web-devicons", -- keep this if you're using NvChad
-        config = function()
-            require("barbecue").setup()
-        end,
-    }
-
-
-    -- lsp
-    use ('github/copilot.vim')
-
-    use {
-        'VonHeikemen/lsp-zero.nvim',
-        branch = 'v2.x',
-        requires = {
-            -- LSP Support
-            {'neovim/nvim-lspconfig'},             -- Required
-            {                                      -- Optional
-            'williamboman/mason.nvim',
-            run = function()
-                pcall(vim.cmd, 'MasonUpdate')
-            end,
-        },
-        {'williamboman/mason-lspconfig.nvim'}, -- Optional
-
-        -- Autocompletion
-        {'hrsh7th/nvim-cmp'},     -- Required
-        {'hrsh7th/cmp-nvim-lsp'}, -- Required
-        {'L3MON4D3/LuaSnip'},     -- Required
-        }
-    }
-end)

lua/sevi-kun/plugins.lua

@@ -0,0 +1,117 @@
+-- lazy.nvim plugins
+
+return {
+    -- treesitter
+    { "nvim-treesitter/nvim-treesitter",
+        build = ":TSUpdate"
+    },
+    { "nvim-treesitter/playground" },
+    { "nvim-treesitter/nvim-treesitter-context" },
+
+
+    -- useful
+    { "rmagatti/session-lens",
+        dependencies = {
+            "rmagatti/auto-session",
+            "nvim-telescope/telescope.nvim"
+        }
+    },
+
+    { "nvim-telescope/telescope.nvim", 
+        version = "0.1.x",
+        dependencies = { "nvim-lua/plenary.nvim" }
+    },
+
+    { "ThePrimeagen/harpoon",
+    	branch = "harpoon2",
+        dependencies = { 
+            "nvim-lua/plenary.nvim",
+            "nvim-telescope/telescope.nvim"
+        },
+    },
+
+    { "NeogitOrg/neogit",
+        branch = "nightly",
+        dependencies = { 
+            "nvim-lua/plenary.nvim",
+            "sindrets/diffview.nvim",        -- optional - Diff integration
+            "nvim-telescope/telescope.nvim", -- optional
+        }
+    },
+
+    { "stevearc/oil.nvim",
+        dependencies = { "nvim-tree/nvim-web-devicons" }
+    },
+
+    { "kylechui/nvim-surround",
+        version = "*",
+        event = "VeryLazy",
+        config = function()
+            require("nvim-surround").setup()
+        end
+    },
+
+    { "numToStr/Comment.nvim",
+        lazy = false,
+        config = function()
+            require("Comment").setup()
+        end
+    },
+
+    { "mbbill/undotree" },
+
+    { "m4xshen/autoclose.nvim",
+        config = function ()
+            require("autoclose").setup()
+        end
+    },
+
+
+    -- pretty
+
+    { "loctvl842/monokai-pro.nvim",
+        lazy = false,
+        priority = 1000,
+        config = function()
+            vim.cmd("colorscheme monokai-pro")
+        end
+    },
+
+    { "lukas-reineke/indent-blankline.nvim",
+        lazy = false,
+        main = "ibl",
+        opts = {},
+        config = function()
+            require("ibl").setup({})
+        end
+    },
+
+    { "utilyre/barbecue.nvim",
+        lazy = false,
+        name = "barbecue",
+        version = "*",
+        dependencies = {
+            "SmiteshP/nvim-navic",
+            "nvim-tree/nvim-web-devicons",
+        },
+    },
+
+
+    -- lsp
+
+    { "github/copilot.vim" },
+
+    {"williamboman/mason.nvim",
+        lazy = false,
+        config = function()
+            require("mason").setup({})
+        end
+    },
+    {"williamboman/mason-lspconfig.nvim"},
+
+    {"VonHeikemen/lsp-zero.nvim", branch = "v3.x"},
+    {"neovim/nvim-lspconfig"},
+    {"hrsh7th/cmp-nvim-lsp"},
+    {"hrsh7th/nvim-cmp"},
+    {"L3MON4D3/LuaSnip"},
+}

lua/sevi-kun/set.lua

@@ -3,6 +3,7 @@ vim.g.mapleader = " "
 vim.opt.nu = true
 vim.opt.relativenumber = true
 vim.opt.ignorecase = true
+vim.opt.cursorline = true
 
 vim.opt.tabstop =  4
 vim.opt.softtabstop = 4
@@ -11,7 +12,7 @@ vim.opt.expandtab = true
 
 vim.opt.smartindent = true
 
-vim.opt.wrap = true
+vim.opt.wrap = false
 
 vim.opt.swapfile = false
 vim.opt.backup = false