Cleanup configs and add grapple

init.lua

@@ -8,7 +8,6 @@ require('plugin-mappings')
 
 require('gopls')
 require('code-completion')
-require('cokeline-config')
 require('commands')
 
 local vim = vim
@@ -17,65 +16,12 @@ local vim = vim
 vim.g.loaded_netrw = 1
 vim.g.loaded_netrwPlugin = 1
 
--- nvim-tree
-require('nvim-tree').setup {
-    on_attach = nvim_tree_attach,
-}
-
 -- Bufferline
 vim.opt.termguicolors = true
 
 -- Theme
 require('onedark').load()
 
--- navic
-local navic = require("nvim-navic")
-navic.setup({
-    icons = {
-        File          = "󰈙 ",
-        Module        = " ",
-        Namespace     = "󰌗 ",
-        Package       = " ",
-        Class         = "󰌗 ",
-        Method        = "󰆧 ",
-        Property      = " ",
-        Field         = " ",
-        Constructor   = " ",
-        Enum          = "󰕘",
-        Interface     = "󰕘",
-        Function      = "󰊕 ",
-        Variable      = "󰆧 ",
-        Constant      = "󰏿 ",
-        String        = "󰀬 ",
-        Number        = "󰎠 ",
-        Boolean       = "◩ ",
-        Array         = "󰅪 ",
-        Object        = "󰅩 ",
-        Key           = "󰌋 ",
-        Null          = "󰟢 ",
-        EnumMember    = " ",
-        Struct        = "󰌗 ",
-        Event         = " ",
-        Operator      = "󰆕 ",
-        TypeParameter = "󰊄 ",
-    },
-})
-
-require("lualine").setup({
-    sections = {
-        lualine_c = {
-            {
-                require('auto-session.lib').current_session_name
-            },
-            {
-                "navic",
-                color_correction = nil,
-                navic_opts = nil
-            },
-        }
-    },
-})
-
 -- neodev
 require("neodev").setup({})
 
@@ -101,11 +47,6 @@ lspconfig.clangd.setup {
     end
 }
 
-
--- Goto
-goto_preview = require('goto-preview')
-goto_preview.setup {}
-
 -- conform
 require("conform").setup({
     formatters_by_ft = {

lazy-lock.json

@@ -16,13 +16,11 @@
   "copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" },
   "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" },
   "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
-  "fzf": { "branch": "master", "commit": "f0fbed6007d628216a5b75b62646aea90d489afa" },
-  "fzf.vim": { "branch": "master", "commit": "1e054c1d075d87903647db9320116d360eb8b024" },
   "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" },
   "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" },
   "glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" },
   "go.nvim": { "branch": "master", "commit": "24d2fa373d55d9900cd4b502a88214dc17e6fab6" },
-  "goto-preview": { "branch": "main", "commit": "16ec236fabb40b2cebfe283b1d701338886462db" },
+  "grapple.nvim": { "branch": "main", "commit": "12172536620464f8cc124e07c6e3ccd306ea3c5c" },
   "guess-indent.nvim": { "branch": "main", "commit": "b8ae749fce17aa4c267eec80a6984130b94f80b2" },
   "guihua.lua": { "branch": "master", "commit": "9fb6795474918b492d9ab01b1ebaf85e8bf6fe0b" },
   "gx.nvim": { "branch": "main", "commit": "78070bbd8e7e15a1623cdd6832a9529d2ee63e0c" },
@@ -32,22 +30,21 @@
   "indent-blankline.nvim": { "branch": "master", "commit": "5da5546947f3125dfd6aa85ab21074dc83f776d5" },
   "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
   "lsp-inlayhints.nvim": { "branch": "main", "commit": "d981f65c9ae0b6062176f0accb9c151daeda6f16" },
+  "lspsaga.nvim": { "branch": "main", "commit": "f20985499cd8ff0fbbfe8e7c770428ef764fc3be" },
   "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" },
   "marks.nvim": { "branch": "master", "commit": "74e8d01b2a2131b6e46354cffc553aa7f81bcf5b" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" },
   "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
   "maximize.nvim": { "branch": "master", "commit": "97bfc171775c404396f8248776347ebe64474fe7" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" },
   "neodev.nvim": { "branch": "main", "commit": "029899ea32d3dc8ed8c910ceca2ee5d16e566c11" },
   "neogit": { "branch": "master", "commit": "e02121f5aad420dc16411a6cde59879230f9d5b9" },
   "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" },
   "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" },
   "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
-  "nvim-cokeline": { "branch": "main", "commit": "07069496c3a25c3d9956292d05008ca17036afe0" },
   "nvim-lspconfig": { "branch": "master", "commit": "9099871a7c7e1c16122e00d70208a2cd02078d80" },
-  "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
   "nvim-notify": { "branch": "master", "commit": "ebcdd8219e2a2cbc0a4bef68002f6867f1fde269" },
   "nvim-surround": { "branch": "main", "commit": "a4e30d33add8a9743b4f518b3a788b3c8e5def71" },
-  "nvim-tree.lua": { "branch": "master", "commit": "50f30bcd8c62ac4a83d133d738f268279f2c2ce2" },
   "nvim-treesitter": { "branch": "master", "commit": "27f68c0b6a87cbad900b3d016425450af8268026" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" },
   "nvim-ufo": { "branch": "main", "commit": "c6d88523f574024b788f1c3400c5d5b9bb1a0407" },
@@ -61,8 +58,6 @@
   "rainbow": { "branch": "master", "commit": "61f719aebe0dc5c3048330c50db72cfee1afdd34" },
   "refactoring.nvim": { "branch": "master", "commit": "156532476deb10b1b2a32cb38e1078b3f9951c42" },
   "remember.nvim": { "branch": "master", "commit": "b7613e14692478a0428dc69ca380b6fbb2448e60" },
-  "resession.nvim": { "branch": "master", "commit": "25b177d9068813972996381a6b1ed3df25ba912c" },
-  "rest.nvim": { "branch": "main", "commit": "84e81a19ab24ccf05c9233d34d4dfce61c233abe" },
   "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
   "telescope-file-browser.nvim": { "branch": "master", "commit": "4bd5657b14b58e069287f5ac591a647bb860b2ed" },
   "telescope-tabs": { "branch": "master", "commit": "a38c8fee471257a0ff233e065c4a0d123f8e67b0" },

lua/mappings.lua

@@ -75,11 +75,6 @@ vim.api.nvim_set_keymap("n", "<leader>fe", "<cmd>Telescope lsp_references<CR>",
 vim.api.nvim_set_keymap("n", "<leader>fd", "<cmd>Telescope lsp_definitions<CR>", { noremap = true, silent = true })
 vim.api.nvim_set_keymap("n", "<leader>,", "<cmd>Telescope buffers<CR>", { noremap = true, silent = true })
 
--- rest
-vim.api.nvim_set_keymap("n", "<leader>rr", "<Plug>RestNvim", { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<leader>rp", "<Plug>RestNvimPreview", { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<leader>rl", "<Plug>RestNvimLast", { noremap = true, silent = true })
-
 -- aerial
 vim.api.nvim_set_keymap("n", "<leader>aa", "<cmd>AerialToggle<CR>", { noremap = true, silent = true })
 
@@ -95,12 +90,6 @@ vim.api.nvim_set_keymap("n", "<leader>ss", "<cmd>SessionSave<CR>", { noremap = t
 vim.api.nvim_set_keymap("n", "<leader>sr", "<cmd>SessionRestore<CR>", { noremap = true, silent = true })
 vim.api.nvim_set_keymap("n", "<leader>sd", "<cmd>SessionDelete<CR>", { noremap = true, silent = true })
 
--- cokeline
-vim.keymap.set("n", "<leader>bb", function()
-    require('cokeline.mappings').pick("focus")
-end, { desc = "Pick a buffer to focus" })
--- vim.keymap.set("n", "<leader>bd", "<Plug>(cokeline-pick-close)", { silent = true })
-
 -- terminal
 vim.api.nvim_set_keymap("n", "<leader>tn", "<cmd>ToggleTerm direction=horizontal size=15<CR>", { noremap = true, silent = true })
 vim.api.nvim_set_keymap("n", "<leader>tv", "<cmd>ToggleTerm direction=vertical size=70<CR>", { noremap = true, silent = true })

lua/plugin-mappings.lua

@@ -66,8 +66,8 @@ vim.keymap.set('', 'T', function()
   hop.hint_char1({ direction = directions.BEFORE_CURSOR, current_line_only = true, hint_offset = 1 })
 end, {remap=true})
 
--- Inc Rename
-vim.keymap.set("n", "<leader>lr", ":IncRename ")
+-- Lspsaga
+vim.keymap.set("n", "<leader>lr", ":Lspsaga rename<CR>", { noremap = true, silent = true })
 
 -- action-preview
 -- This is for code actions