Refining harpoon2 keybindings and add telescope binding

Change wrap indicator to 95 (company standards)

.luarc.json

@@ -1,13 +0,0 @@
-{
-  "runtime.version": "LuaJIT",
-  "runtime.path": [
-    "lua/?.lua",
-    "lua/?/init.lua"
-  ],
-  "diagnostics.globals": ["vim"],
-  "workspace.checkThirdParty": false,
-  "workspace.library": [
-    "$VIMRUNTIME",
-    "./lua"
-  ]
-}

after/plugin/harpoon.lua

@@ -28,17 +28,20 @@ vim.keymap.set("n", "<leader>H", function() toggle_telescope(harpoon:list()) end
 
 vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end,
     { desc = "Harpoon: Add current buffer" })
-vim.keymap.set("n", "<leader>hh", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end,
+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", "<leader>hp", function() harpoon:list():prev() end,
+vim.keymap.set("n", "<C-S-P>", function() harpoon:list():prev() end,
     { desc = "Harpoon: Previous buffer" })
-vim.keymap.set("n", "<leader>hn", function() harpoon:list():next() end,
+vim.keymap.set("n", "<C-S-N>", function() harpoon:list():next() end,
     { desc = "Harpoon: Next buffer" })
-

after/plugin/lsp.lua

@@ -1,42 +1,15 @@
-  -- Set up nvim-cmp.
-  local cmp = require'cmp'
+local lsp_zero = require('lsp-zero')
 
-  cmp.setup({
-    snippet = {
-      -- REQUIRED - you must specify a snippet engine
-      expand = function(args)
-        vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
-        -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
-        -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
-        -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
-        -- vim.snippet.expand(args.body) -- For native neovim snippets (Neovim v0.10+)
+lsp_zero.on_attach(function(client, bufnr)
+    -- see :help lsp-zero-keybindings
+    -- to learn the available actions
+    lsp_zero.default_keymaps({buffer = bufnr})
+end)
 
-        -- For `mini.snippets` users:
-        -- local insert = MiniSnippets.config.expand.insert or MiniSnippets.default_insert
-        -- insert({ body = args.body }) -- Insert at cursor
-        -- cmp.resubscribe({ "TextChangedI", "TextChangedP" })
-        -- require("cmp.config").set_onetime({ sources = {} })
-      end,
+require('mason').setup({})
+require('mason-lspconfig').setup({
+    ensure_installed = {},
+    handlers = {
+        lsp_zero.default_setup,
     },
-    window = {
-      -- completion = cmp.config.window.bordered(),
-      -- documentation = cmp.config.window.bordered(),
-    },
-    mapping = cmp.mapping.preset.insert({
-      ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-      ['<C-f>'] = cmp.mapping.scroll_docs(4),
-      ['<C-Space>'] = cmp.mapping.complete(),
-      ['<C-e>'] = cmp.mapping.abort(),
-      ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-    }),
-    sources = cmp.config.sources({
-      { name = 'nvim_lsp' },
-      { name = 'vsnip' }, -- For vsnip users.
-      -- { name = 'luasnip' }, -- For luasnip users.
-      -- { name = 'ultisnips' }, -- For ultisnips users.
-      -- { name = 'snippy' }, -- For snippy users.
-    }, {
-      { name = 'buffer' },
-    })
-  })
-
+})

after/plugin/telescope.lua

@@ -1,7 +1,7 @@
 -- finding files in working dir and repo
 local builtin = require('telescope.builtin')
 vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-vim.keymap.set('n', '<leader>fp', builtin.git_files, {})
-vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live grep' })
-vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' })
-vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Telescope help tags' })
+vim.keymap.set('n', '<leader>pf', builtin.git_files, {})
+vim.keymap.set('n', '<leader>ps', function()
+	builtin.grep_string({ search = vim.fn.input("Grep > ") });
+end)

after/plugin/treesitter.lua

@@ -0,0 +1,20 @@
+-- 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", "bash", "lua", "vim", "vimdoc", "query" },
+
+  -- Install parsers synchronously (only applied to `ensure_installed`)
+  sync_install = false,
+
+  -- Automatically install missing parsers when entering buffer
+  -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
+  auto_install = true,
+
+  highlight = {
+      enable = true,
+  },
+
+  indent = {
+      enable = true,
+  },
+}

init.lua

@@ -1,6 +1,6 @@
 require("sevi-kun")
 
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+local lazypath = vim.fn.stdpath("data") .. "\\lazy\\lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
   vim.fn.system({
     "git",

lua/sevi-kun/plugins.lua

@@ -1,6 +1,14 @@
 -- lazy.nvim plugins
 
 return {
+    -- treesitter
+    { "nvim-treesitter/nvim-treesitter",
+        build = ":TSUpdate"
+    },
+    { "nvim-treesitter/playground" },
+    { "nvim-treesitter/nvim-treesitter-context" },
+
+
     -- useful
     { "rmagatti/session-lens",
         dependencies = {
@@ -9,22 +17,25 @@ return {
         }
     },
 
-    { "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" },
+        dependencies = { 
+            "nvim-lua/plenary.nvim",
+            "nvim-telescope/telescope.nvim"
+        },
     },
 
     { "NeogitOrg/neogit",
-        branch = "master",
-        dependencies = {
+        branch = "nightly",
+        dependencies = { 
             "nvim-lua/plenary.nvim",
-            "sindrets/diffview.nvim",
-            "nvim-telescope/telescope.nvim",
+            "sindrets/diffview.nvim",        -- optional - Diff integration
+            "nvim-telescope/telescope.nvim", -- optional
         }
     },
 
@@ -58,11 +69,11 @@ return {
 
     -- pretty
 
-    { "navarasu/onedark.nvim",
+    { "loctvl842/monokai-pro.nvim",
         lazy = false,
         priority = 1000,
         config = function()
-            vim.cmd("colorscheme onedark")
+            vim.cmd("colorscheme monokai-pro")
         end
     },
 
@@ -88,40 +99,19 @@ return {
 
     -- lsp
 
-    -- {
-    --     'Exafunction/windsurf.vim',
-    --     event = 'BufEnter'
-    -- },
+    { "github/copilot.vim" },
 
-    {
-        "mason-org/mason.nvim",
-        opts = {}
-    },
-    {
-        "mason-org/mason-lspconfig.nvim",
-        opts = {},
-        dependencies = {
-            { "mason-org/mason.nvim", opts = {} },
-            "neovim/nvim-lspconfig",
-        },
-    },
-
-    {
-        "rachartier/tiny-inline-diagnostic.nvim",
-        event = "VeryLazy",
-        priority = 1000,
+    {"williamboman/mason.nvim",
+        lazy = false,
         config = function()
-            require("tiny-inline-diagnostic").setup()
-            vim.diagnostic.config({ virtual_text = false }) -- Disable Neovim's default virtual text diagnostics
-        end,
+            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"},
-    {"hrsh7th/cmp-buffer"},
-    {"hrsh7th/cmp-path"},
-    {"hrsh7th/cmp-cmdline"},
-    {"hrsh7th/cmp-vsnip"},
-    {"hrsh7th/vim-vsnip"}
+    {"L3MON4D3/LuaSnip"},
 }

lua/sevi-kun/remap.lua

@@ -22,6 +22,3 @@ vim.keymap.set("v", "<leader>y", "\"+y")
 vim.keymap.set("n", "<leader>Y", "\"+Y")
 
 vim.keymap.set("n", "<F5>", ":make")
-
-vim.keymap.set("n", "<leader>vs", ":vs #<CR>")
-vim.keymap.set("n", "<leader>sp", ":sp #<CR>")

lua/sevi-kun/set.lua

@@ -16,7 +16,7 @@ vim.opt.wrap = false
 
 vim.opt.swapfile = false
 vim.opt.backup = false
-vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
+vim.opt.undodir = os.getenv("LOCALAPPDATA") .. "\\nvim-data\\undodir"
 vim.opt.undofile = true
 
 vim.opt.hlsearch = true
@@ -30,7 +30,7 @@ vim.opt.isfname:append("@-@")
 
 vim.opt.updatetime = 50
 
-vim.opt.colorcolumn = "80"
+vim.opt.colorcolumn = "95"
 
 vim.g.netrw_preview   = 1
 vim.g.netrw_liststyle = 3