up

4 files changed, 15 insertions, 15 deletions

diff --git a/.config/nvim/after/plugin/harpoon.lua b/.config/nvim/after/plugin/harpoon.lua
deleted file mode 100644
index 3048fc7..0000000
--- a/.config/nvim/after/plugin/harpoon.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-local mark = require('harpoon.mark')
-local ui = require('harpoon.ui')
-vim.keymap.set('n', '<M-1>', function() ui.nav_file(1) end)
-vim.keymap.set('n', '<M-2>', function() ui.nav_file(2) end)
-vim.keymap.set('n', '<M-3>', function() ui.nav_file(3) end)
-vim.keymap.set('n', '<M-4>', function() ui.nav_file(4) end)
diff --git a/.config/nvim/after/plugin/whichkey.lua b/.config/nvim/after/plugin/whichkey.lua
index 35f8078..6c32396 100644
--- a/.config/nvim/after/plugin/whichkey.lua
+++ b/.config/nvim/after/plugin/whichkey.lua
@@ -1,19 +1,25 @@
-local ma = require('harpoon.mark')
-local ui = require('harpoon.ui')
+local harpoon = require('harpoon')
+harpoon:setup()
+
+vim.keymap.set('n', '<M-1>', function() harpoon:list():select(1) end)
+vim.keymap.set('n', '<M-2>', function() harpoon:list():select(2) end)
+vim.keymap.set('n', '<M-3>', function() harpoon:list():select(3) end)
+vim.keymap.set('n', '<M-4>', function() harpoon:list():select(4) end)
+
 local ts = require('telescope.builtin')
 require('telescope').load_extension('harpoon')
 local wk = require('which-key')
 wk.register({
 	a = {
 		name = 'harpoon',
-		a = { ma.add_file, 'add file', noremap = true, silent = true },
-		e = { ':Telescope harpoon marks<CR>', 'harpoon marks', noremap = true, silent = true },
-		f = { ':Telescope harpoon marks<CR>', 'harpoon marks', noremap = true, silent = true },
+		a = { function() harpoon:list():append() end, 'add file', noremap = true, silent = true },
+		e = { function() harpoon.ui:toggle_quick_menu(harpoon:list()) end, 'harpoon ui', noremap = true, silent = true },
+		f = { ':Telescope harpoon marks<CR>', 'harpoon telescope ui', noremap = true, silent = true },
 	},
 	b = { ':Buffers<CR>', 'buffers', noremap = true, silent = true },
 	c = { name = '+nerd-commenter' },
 	d = { ':bd<CR>', 'close buffer', noremap = true, silent = true },
-	D = { 'ddk:put = strftime(\' * %c\')<CR>', 'insert date', noremap = true, silent = true },
+	D = { '"-ddk:put = strftime(\' * %c\')<CR>', 'insert date', noremap = true, silent = true },
 	e = { ':Telescope find_files<CR>', 'find files', noremap = true, silent = true },
 	G = { ':FloatermNew lazygit<CR>', 'lazygit', noremap = true, silent = true },
 	h = { ':Startify<CR>', 'startify', noremap = true, silent = true },
diff --git a/.config/nvim/lua/bindings.lua b/.config/nvim/lua/bindings.lua
index 53ad03b..ef46c71 100644
--- a/.config/nvim/lua/bindings.lua
+++ b/.config/nvim/lua/bindings.lua
@@ -15,7 +15,7 @@ vim.keymap.set('n', '<C-q>', '<C-w>q', { noremap = true, silent = false })
 vim.keymap.set('n', '*', '*zz', { noremap = true, silent = false })
 vim.keymap.set('i', '<C-j>', 'pumvisible() ? "<C-n>" : "<C-j>"', { expr = true })
 vim.keymap.set('i', '<C-k>', 'pumvisible() ? "<C-p>" : "<C-k>"', { expr = true })
-vim.keymap.set('i', '<cr>',  'pumvisible() ? asyncomplete#close_popup() : "\\<cr>"', { expr = true })
+vim.keymap.set('i', '<CR>',  'pumvisible() ? asyncomplete#close_popup() : "\\<cr>"', { expr = true })
 vim.g.floaterm_keymap_toggle = '<F1>'
 vim.g.floaterm_keymap_prev =   '<F11>'
 vim.g.floaterm_keymap_next =   '<F12>'
diff --git a/.config/nvim/lua/plug.lua b/.config/nvim/lua/plug.lua
index 48311c8..82143a9 100644
--- a/.config/nvim/lua/plug.lua
+++ b/.config/nvim/lua/plug.lua
@@ -10,6 +10,7 @@ Plug('jceb/vim-orgmode')
 Plug('jiangmiao/auto-pairs')
 -- Plug('junegunn/fzf')
 -- Plug('junegunn/fzf.vim')
+-- Plug('voldikss/fzf-floaterm')
 Plug('folke/which-key.nvim')
 Plug('mbbill/undotree')
 Plug('mhinz/vim-signify')
@@ -37,12 +38,11 @@ Plug('vifm/vifm.vim')
 Plug('nvim-lualine/lualine.nvim')
 Plug('folke/trouble.nvim')
 Plug('vim-scripts/grep.vim')
-Plug('voldikss/fzf-floaterm')
 Plug('voldikss/vim-floaterm')
 Plug('chrisbra/csv.vim')
 Plug('nvim-telescope/telescope.nvim')
 Plug('nvim-lua/plenary.nvim')
-Plug('ThePrimeagen/harpoon')
+Plug('ThePrimeagen/harpoon', {['branch'] = 'harpoon2'})
 Plug('HiPhish/rainbow-delimiters.nvim')
 Plug('nvim-treesitter/nvim-treesitter', {['do'] = ':TSUpdate'})
 --  Uncomment these if you want to manage LSP servers from neovim