additional harpoon keymaps

lua/custom/plugins/filetree.lua

@@ -1,34 +0,0 @@
--- Unless you are still migrating, remove the deprecated commands from v1.x
-vim.cmd [[ let g:neo_tree_remove_legacy_commands = 1 ]]
-
--- Open nvim-neo-tree window
-vim.keymap.set({ 'n', 'v' }, '<leader>f', ':Neotree toggle<enter>', { desc = 'Explore [F]ile Tree' })
-
-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 {
-      filesystem = {
-        filtered_items = {
-          visible = true,
-          hide_dotfiles = false,
-          hide_gitignored = false,
-          hide_by_name = {
-            'node_modules',
-            '.svelte-kit',
-            'target',
-            '.git',
-            'bin',
-            'obj',
-          },
-        },
-      },
-    }
-  end,
-}

lua/custom/plugins/fugitive.lua

@@ -6,11 +6,17 @@ vim.keymap.set('n', '<leader>gF', '<cmd>Git fetch<cr>', { desc = '[G]it [F]etch'
 vim.keymap.set('n', '<leader>gP', '<cmd>Git push<cr>', { desc = '[G]it [P]ush' })
 -- Pull changes
 vim.keymap.set('n', '<leader>gp', '<cmd>Git pull<cr>', { desc = '[G]it [P]ull' })
+-- Open history graph
+vim.keymap.set('n', '<leader>gl', '<cmd>Flogsplit<cr><cmd>wincmd k<cr><cmd>q<cr>', { desc = '[G]it [L]og' })
 
 return {
   -- Git related plugins
   'tpope/vim-fugitive',
   dependencies = {
-    'tpope/vim-rhubarb',
+    {
+      'rbong/vim-flog',
+      lazy = true,
+      cmd = { 'Flogsplit' },
+    },
   },
 }

lua/custom/plugins/harpoon.lua

@@ -0,0 +1,48 @@
+return {
+  'ThePrimeagen/harpoon',
+  branch = 'harpoon2',
+  dependencies = {
+    'nvim-lua/plenary.nvim',
+    'nvim-telescope/telescope.nvim',
+  },
+  config = function()
+    local harpoon = require 'harpoon'
+    harpoon:setup {}
+
+    -- 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
+
+      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
+
+    -- Open harpoon list window
+    vim.keymap.set('n', '<leader>ho', function()
+      toggle_telescope(harpoon:list())
+    end, { desc = '[H]arpoon [Open]' })
+    -- Append to harpoon list
+    vim.keymap.set('n', '<leader>ha', function()
+      harpoon:list():append()
+    end, { desc = '[H]arpoon [A]ppend' })
+    -- Toggle previous & next buffers stored within Harpoon list
+    vim.keymap.set('n', '<C-S-P>', function()
+      harpoon:list():prev()
+    end)
+    vim.keymap.set('n', '<C-S-N>', function()
+      harpoon:list():next()
+    end)
+  end,
+}

lua/custom/plugins/markdown.lua

@@ -0,0 +1,10 @@
+-- Markdown preview plugin
+return {
+  'iamcco/markdown-preview.nvim',
+  cmd = { 'MarkdownPreviewToggle', 'MarkdownPreview', 'MarkdownPreviewStop' },
+  build = 'cd app; npm install',
+  init = function()
+    vim.g.mkdp_filetypes = { 'markdown' }
+  end,
+  ft = { 'markdown' },
+}

lua/custom/plugins/neoscroll.lua

@@ -0,0 +1,27 @@
+-- Smooth scroll plugin and keymaps
+return {
+  'karb94/neoscroll.nvim',
+  config = function()
+    require('neoscroll').setup {
+      hide_cursor = false,
+      easing_function = nil,
+      respect_scrolloff = true,
+    }
+
+    require('neoscroll.config').set_mappings {
+      -- Scroll normally
+      ['<C-u>'] = { 'scroll', { '-vim.wo.scroll', 'true', '50' } },
+      ['<C-d>'] = { 'scroll', { 'vim.wo.scroll', 'true', '50' } },
+      -- Scroll entire page height
+      ['<C-b>'] = { 'scroll', { '-vim.api.nvim_win_get_height(0)', 'true', '80' } },
+      ['<C-f>'] = { 'scroll', { 'vim.api.nvim_win_get_height(0)', 'true', '80' } },
+      -- Scroll 10% at a time
+      ['<C-y>'] = { 'scroll', { '-0.10', 'false', '25' } },
+      ['<C-e>'] = { 'scroll', { '0.10', 'false', '25' } },
+      -- Jump to top, bottom and center
+      ['zt'] = { 'zt', { '40' } },
+      ['zz'] = { 'zz', { '50' } },
+      ['zb'] = { 'zb', { '40' } },
+    }
+  end,
+}

lua/lazy-plugins.lua

@@ -16,61 +16,9 @@ require('lazy').setup({
   -- Discord RPC
   'andweeb/presence.nvim',
 
-  -- Practice games
-  'ThePrimeagen/vim-be-good',
-
   -- Processing-Java
   'sophacles/vim-processing',
 
-  -- Git graph viewer
-  {
-    'rbong/vim-flog',
-    lazy = true,
-    cmd = { 'Flog', 'Flogsplit', 'Floggit' },
-    dependencies = {
-      'tpope/vim-fugitive',
-    },
-  },
-
-  -- Markdown preview plugin
-  {
-    'iamcco/markdown-preview.nvim',
-    cmd = { 'MarkdownPreviewToggle', 'MarkdownPreview', 'MarkdownPreviewStop' },
-    build = 'cd app; npm install',
-    init = function()
-      vim.g.mkdp_filetypes = { 'markdown' }
-    end,
-    ft = { 'markdown' },
-  },
-
-  -- Smooth scroll plugin and keymaps
-  {
-    'karb94/neoscroll.nvim',
-    config = function()
-      require('neoscroll').setup {
-        hide_cursor = false,
-        easing_function = nil,
-        respect_scrolloff = true,
-      }
-
-      require('neoscroll.config').set_mappings {
-        -- Scroll normally
-        ['<C-u>'] = { 'scroll', { '-vim.wo.scroll', 'true', '50' } },
-        ['<C-d>'] = { 'scroll', { 'vim.wo.scroll', 'true', '50' } },
-        -- Scroll entire page height
-        ['<C-b>'] = { 'scroll', { '-vim.api.nvim_win_get_height(0)', 'true', '80' } },
-        ['<C-f>'] = { 'scroll', { 'vim.api.nvim_win_get_height(0)', 'true', '80' } },
-        -- Scroll 10% at a time
-        ['<C-y>'] = { 'scroll', { '-0.10', 'false', '25' } },
-        ['<C-e>'] = { 'scroll', { '0.10', 'false', '25' } },
-        -- Jump to top, bottom and center
-        ['zt'] = { 'zt', { '40' } },
-        ['zz'] = { 'zz', { '50' } },
-        ['zb'] = { 'zb', { '40' } },
-      }
-    end,
-  },
-
   -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
   'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically