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/autoclose.lua

@@ -1,12 +1,23 @@
-local autoclose = require("autoclose")
+-- Close brackets
+local config = {
+   keys = {
+      ["("] = { escape = false, close = true, pair = "()", disabled_filetypes = {} },
+      ["["] = { escape = false, close = true, pair = "[]", disabled_filetypes = {} },
+      ["{"] = { escape = false, close = true, pair = "{}", disabled_filetypes = {} },
 
-autoclose.setup({
+      [">"] = { escape = true, close = false, pair = "<>", disabled_filetypes = {} },
-    options = {
+      [")"] = { escape = true, close = false, pair = "()", disabled_filetypes = {} },
-        disabled_filetypes = { "text", "markdown", "neogit", },
+      ["]"] = { escape = true, close = false, pair = "[]", disabled_filetypes = {} },
-        disable_when_touch = true,
+      ["}"] = { escape = true, close = false, pair = "{}", disabled_filetypes = {} },
-        pair_spaces = true,
+
-        auto_indent = true,
+      ['"'] = { escape = true, close = true, pair = '""', disabled_filetypes = {} },
-        disable_command_mode = true,
+      ["'"] = { escape = true, close = true, pair = "''", disabled_filetypes = {} },
+      ["`"] = { escape = true, close = true, pair = "``", disabled_filetypes = {} },
    },
-})
+   options = {
-
+      disabled_filetypes = { "text", "markdown", "norg" },
+      disable_when_touch = false,
+      pair_spaces = false,
+      auto_indent = true,
+   },
+}

after/plugin/barbecue.lua

@@ -19,7 +19,7 @@ require("barbecue").setup({
     ---modified.
     ---
     ---@type boolean
-    show_modified = true,
+    show_modified = false,
 
     ---Get modified status of file.
     ---

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,4 +1,4 @@
-local lsp_zero = require("lsp-zero")
+local lsp_zero = require('lsp-zero')
 
 lsp_zero.on_attach(function(client, bufnr)
     -- see :help lsp-zero-keybindings
@@ -6,17 +6,10 @@ lsp_zero.on_attach(function(client, bufnr)
     lsp_zero.default_keymaps({buffer = bufnr})
 end)
 
-require("mason").setup({})
+require('mason').setup({})
-require("mason-lspconfig").setup({
+require('mason-lspconfig').setup({
     ensure_installed = {},
     handlers = {
         lsp_zero.default_setup,
     },
 })
-
-
-local codeium = require("codeium")
-codeium.setup({
-    enable_chat = true,
-})
-

after/plugin/mini.lua

@@ -1,48 +0,0 @@
--- Configuration of mini.nvim plugins
-
--- mini.map
-local map = require("mini.map")
-map.setup({
-    symbols = {
-        encode = map.gen_encode_symbols.dot("3x2")
-    },
-    window = {
-        width = 16,
-        show_integration_count = false
-    },
-    integrations = {
-        map.gen_integration.diagnostic({
-            error = "DiagnosticFloatingError",
-            warn = "DiagnosticFloatingWarn",
-            info = "DiagnosticFloatingInfo",
-            hint = "DiagnosticFloatingHint",
-        }),
-        map.gen_integration.builtin_search(),
-    },
-})
-
-vim.keymap.set("n", "<Leader>mf", map.toggle_focus)
-vim.keymap.set("n", "<Leader>mr", map.refresh)
-vim.keymap.set("n", "<Leader>mt", map.toggle)
-
-
--- mini.animate
-local animate = require("mini.animate")
-animate.setup({
-    cursor = {
-        timing = animate.gen_timing.linear({ duration = 150, unit = "total" })
-    },
-    scroll = {
-        timing = animate.gen_timing.linear({ duration = 150, unit = "total" })
-    },
-    resize = {
-        timing = animate.gen_timing.linear({ duration = 150, unit = "total" })
-    },
-    open = {
-        timing = animate.gen_timing.linear({ duration = 150, unit = "total" })
-    },
-    close = {
-        timing = animate.gen_timing.linear({ duration = 150, unit = "total" })
-    },
-})
-

after/plugin/notes.lua

@@ -1,6 +0,0 @@
--- Configuration of note taking setup
-
-local mkdnflow = require("mkdnflow")
-mkdnflow.setup({
-    wrap = true
-})

after/plugin/oil.lua

@@ -1,4 +1,4 @@
-require("oil").setup({
+require('oil').setup({
     default_file_explorer = false,
 
     columns = {
@@ -10,8 +10,8 @@ require("oil").setup({
 
     float = {
         -- Padding around the floating window
-        padding = 12,
+        padding = 8,
-        max_width = 120,
+        max_width = 80,
         max_height = 64,
         border = "rounded",
         win_options = {
@@ -22,7 +22,23 @@ require("oil").setup({
         override = function(conf)
             return conf
         end,
-    }
+    },
+
+    keymaps = {
+        ["g?"] = "actions.show_help",
+        ["<CR>"] = "actions.select",
+        ["<C-s>"] = "actions.select_vsplit",
+        ["<C-h>"] = "actions.select_split",
+        ["<C-t>"] = "actions.select_tab",
+        ["<C-p>"] = "actions.preview",
+        ["<Esc>"] = "actions.close",
+        ["<C-r>"] = "actions.refresh",
+        ["-"] = "actions.parent",
+        ["_"] = "actions.open_cwd",
+        ["`"] = "actions.cd",
+        ["~"] = "actions.tcd",
+        ["g."] = "actions.toggle_hidden",
+    },
 })
 
-vim.keymap.set("n", "<leader>-", ":Oil --float <CR>")
+vim.keymap.set('n', '<leader>-', ":Oil --float <CR>")

after/plugin/sessions.lua

@@ -1,10 +1,13 @@
-sessions = require("seshmgr")
+require("auto-session").setup {
+    log_level = "error",
+    auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/"},
+}
 
-sessions.setup({
+require('session-lens').setup({
-    session_dir = os.getenv("HOME") .. "/.nvim/sessions",
+    path_display = {'shorten'},
-
+    theme_conf = { border = true },
-    telescope = {
+    previewer = false,
-        enabled = true,
-        keymap = "<leader>ss",
-    },
 })
+
+
+vim.keymap.set('n', '<leader>ss', ":SearchSession<CR>")

after/plugin/telescope.lua

@@ -1,7 +1,7 @@
 -- finding files in working dir and repo
-local builtin = require("telescope.builtin")
+local builtin = require('telescope.builtin')
-vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
+vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-vim.keymap.set("n", "<leader>pf", builtin.git_files, {})
+vim.keymap.set('n', '<leader>pf', builtin.git_files, {})
-vim.keymap.set("n", "<leader>ps", function()
+vim.keymap.set('n', '<leader>ps', function()
 	builtin.grep_string({ search = vim.fn.input("Grep > ") });
 end)

after/plugin/treesitter.lua

@@ -1,31 +1,19 @@
 -- parsing and highlighting
-require"nvim-treesitter.configs".setup {
+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" },
 
-    ensure_installed = "all",
   -- 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
+  -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
   auto_install = true,
 
-
-    incremental_selection = {
-        enable = true,
-        keymaps = {
-            init_selection = "gnn",
-            node_incremental = "grn",
-            scope_incremental = "grc",
-            node_decremental = "grm",
-        },
-    },
-
   highlight = {
       enable = true,
   },
 
-    -- Needed because treesitter highlight turns off autoindent for php files
   indent = {
       enable = true,
   },

after/plugin/undotree.lua

@@ -1,7 +1,2 @@
 -- advanced undo history
 vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
-
-vim.opt.undodir = os.getenv("HOME") .. "/.nvim/undodir"
-vim.opt.swapfile = false
-vim.opt.backup = false
-vim.opt.undofile = 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

@@ -10,40 +10,32 @@ return {
 
 
     -- useful
-
+    { "rmagatti/session-lens",
-    --{ dir = "/mnt/nas_belar/code/vim-plugins/narrator.nvim" },
+        dependencies = {
+            "rmagatti/auto-session",
+            "nvim-telescope/telescope.nvim"
+        }
+    },
 
     { "nvim-telescope/telescope.nvim", 
         version = "0.1.x",
         dependencies = { "nvim-lua/plenary.nvim" }
     },
 
-    { "mackeper/SeshMgr.nvim",
-        event = "VeryLazy"
-    },
-
     { "ThePrimeagen/harpoon",
     	branch = "harpoon2",
-        dependencies = { "nvim-lua/plenary.nvim" },
-    },
-
-    { "ThePrimeagen/refactoring.nvim",
         dependencies = { 
             "nvim-lua/plenary.nvim",
-            "nvim-treesitter/nvim-treesitter",
+            "nvim-telescope/telescope.nvim"
         },
-        lazy = false,
-        config = function()
-            require("refactoring").setup()
-        end,
     },
 
     { "NeogitOrg/neogit",
-        branch = "master",
+        branch = "nightly",
         dependencies = { 
             "nvim-lua/plenary.nvim",
-            "sindrets/diffview.nvim",
+            "sindrets/diffview.nvim",        -- optional - Diff integration
-            "nvim-telescope/telescope.nvim",
+            "nvim-telescope/telescope.nvim", -- optional
         }
     },
 
@@ -59,27 +51,29 @@ return {
         end
     },
 
-    { "mbbill/undotree" },
+    { "numToStr/Comment.nvim",
-
+        lazy = false,
-    { "m4xshen/autoclose.nvim" },
+        config = function()
-
+            require("Comment").setup()
-
+        end
-    -- Notes
-
-    { "jbyuki/nabla.nvim",
-        dependencies = { "nvim-treesitter/nvim-treesitter" }
     },
 
-    { "jakewvincent/mkdnflow.nvim" },
+    { "mbbill/undotree" },
+
+    { "m4xshen/autoclose.nvim",
+        config = function ()
+            require("autoclose").setup()
+        end
+    },
 
 
     -- pretty
 
-    { "navarasu/onedark.nvim",
+    { "loctvl842/monokai-pro.nvim",
         lazy = false,
         priority = 1000,
         config = function()
-            vim.cmd("colorscheme onedark")
+            vim.cmd("colorscheme monokai-pro")
         end
     },
 
@@ -103,97 +97,21 @@ return {
     },
 
 
-    -- mini
-
-    { "echasnovski/mini.basics",
-        version = false,
-        config = function()
-            require("mini.basics").setup()
-        end
-    },
-
-    { "echasnovski/mini.ai",
-        version = false,
-        config = function()
-            require("mini.ai").setup()
-        end
-    },
-
-    { "echasnovski/mini.comment",
-        version = false,
-        config = function()
-            require("mini.comment").setup()
-        end
-    },
-
-    { "echasnovski/mini.map",
-        version = false,
-    },
-
-    { "echasnovski/mini.statusline",
-        version = false,
-        config = function()
-            require("mini.statusline").setup()
-        end
-    },
-
-    { "echasnovski/mini.animate",
-        version = false,
-        config = function()
-            require("mini.animate").setup()
-        end
-    },
-
-    { "echasnovski/mini.fuzzy",
-        version = false,
-        config = function()
-            require("mini.fuzzy").setup()
-        end
-    },
-
-    { "echasnovski/mini.splitjoin",
-        version = false,
-        config = function()
-            require("mini.splitjoin").setup()
-        end
-    },
-
-    -- Style Checker
-
-    { "averms/black-nvim" },
-
-    -- trouble
-
-    { "folke/trouble.nvim",
-        branch = "dev",
-    },
-
     -- lsp
 
-    { "Exafunction/codeium.nvim",
+    { "github/copilot.vim" },
-        dependencies = {
-            "nvim-lua/plenary.nvim",
-            "hrsh7th/nvim-cmp",
-        },
-    },
 
-
+    {"williamboman/mason.nvim",
-    { "neoclide/coc.nvim",
+        lazy = false,
-        branch = "release"
-    },
-
-
-
-    { "williamboman/mason.nvim",
         config = function()
             require("mason").setup({})
         end
     },
-    { "williamboman/mason-lspconfig.nvim" },
+    {"williamboman/mason-lspconfig.nvim"},
 
-    { "VonHeikemen/lsp-zero.nvim", branch = "v3.x" },
+    {"VonHeikemen/lsp-zero.nvim", branch = "v3.x"},
-    { "neovim/nvim-lspconfig" },
+    {"neovim/nvim-lspconfig"},
-    { "hrsh7th/cmp-nvim-lsp" },
+    {"hrsh7th/cmp-nvim-lsp"},
-    { "hrsh7th/nvim-cmp" },
+    {"hrsh7th/nvim-cmp"},
-    { "L3MON4D3/LuaSnip" },
+    {"L3MON4D3/LuaSnip"},
 }

lua/sevi-kun/remap.lua

@@ -5,6 +5,8 @@ vim.keymap.set("n", "<leader>.", vim.cmd.Ex)
 
 vim.keymap.set("n", "<C-b>", ":e #<CR>")
 
+vim.keymap.set("n", "<C-b>w", ":wq<CR>")
+
 vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
 vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
 
@@ -20,5 +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>l", ":noh<CR>")

lua/sevi-kun/set.lua

@@ -14,6 +14,11 @@ vim.opt.smartindent = true
 
 vim.opt.wrap = false
 
+vim.opt.swapfile = false
+vim.opt.backup = false
+vim.opt.undodir = os.getenv("LOCALAPPDATA") .. "\\nvim-data\\undodir"
+vim.opt.undofile = true
+
 vim.opt.hlsearch = true
 vim.opt.incsearch = true
 
@@ -25,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