feat: add harpoon

main
jaredgoldman 2024-04-07 17:27:43 -04:00
parent 75abeb74f7
commit 34dfe4f69c
7 changed files with 58 additions and 27 deletions

View File

@ -1,13 +1,14 @@
require("colorscheme")
require("options")
require("plugins")
require("config.telescope")
require("keymaps")
require("lsp")
require("colorscheme")
require("config.telescope")
require("config.comment")
require("config.mason")
require("config.nvim-tree")
require("config.comment")
require("config.themery")
require("config.theme")
require("config.lualine")
require("config.fterm")
require("config.harpoon")
require("keymaps")

View File

@ -6,6 +6,8 @@
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"copilot.vim": { "branch": "release", "commit": "49e0348bfb913fae63ca5ddb987a8bccd193da86" },
"harpoon": { "branch": "harpoon2", "commit": "da326d0438ac68dee9b6b62a734be940a8bd8405" },
"lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" },
"lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },

View File

@ -1,3 +1,11 @@
require("FTerm").setup({
local api = vim.api
local fterm = require("FTerm")
fterm.setup({
blend = 25
})
-- Commands
api.nvim_create_user_command('FTermToggle', fterm.toggle, { bang = true })
api.nvim_create_user_command('FTermClose', fterm.close, { bang = true })

View File

@ -0,0 +1,8 @@
local api = vim.api
local harpoon = require("harpoon")
harpoon.setup({})
api.nvim_create_user_command('HarpoonAdd', function() harpoon:list():add() end, { bang = true })
api.nvim_create_user_command('HarpoonUI', function() harpoon.ui:toggle_quick_menu(harpoon:list()) end, { bang = true })
api.nvim_create_user_command('HarpoonTogglePrev', function() harpoon:list():prev() end, { bang = true })
api.nvim_create_user_command('HarpoonToggleNext', function() harpoon:list():next() end, { bang = true })

View File

@ -10,31 +10,34 @@ api.nvim_create_user_command('FTermClose', fterm.close, { bang = true })
local mappings = {
n = {
-- highlighting
["<leader>nh"] = ":nohl<CR>",
["<leader>nh"] = ":nohl<CR>",
-- move between buffers
["<c-h>"] = "<C-w>h",
["<c-j>"] = "<C-w>j",
["<c-k>"] = "<C-w>k",
["<c-l>"] = "<C-w>l",
["<c-h>"] = "<C-w>h",
["<c-j>"] = "<C-w>j",
["<c-k>"] = "<C-w>k",
["<c-l>"] = "<C-w>l",
-- open and close buggers
["<leader>sv"] = "<C-w>s",
["<leader>sh"] = "<C-w>v",
["<leader>se"] = "<C-w>=",
["<leader>sx"] = ":close<CR>",
["<leader>sv"] = "<C-w>s",
["<leader>sh"] = "<C-w>v",
["<leader>se"] = "<C-w>=",
["<leader>sx"] = ":close<CR>",
-- nvim-tree
["<leader>e"] = ":NvimTreeToggle<CR>",
["<leader>cf"] = ":NvimTreeCollapse<CR>",
["<leader>e"] = ":NvimTreeToggle<CR>",
["<leader>cf"] = ":NvimTreeCollapse<CR>",
-- LSP
["<leader>ls"] = ":lspstop<CR>",
["<leader>lo"] = ":lspstart<CR>",
["<leader>ls"] = ":lspstop<CR>",
["<leader>lo"] = ":lspstart<CR>",
-- Telescope
["<leader>ff"] = "<cmd>Telescope find_files<CR>",
["<leader>fw"] = "<cmd>Telescope live_grep<CR>",
["<leader>fc"] = "<cmd>Telescope grep_string<CR>",
["<leader>th"] = "<cmd>Themery<CR>",
["<leader>sm"] = ":MaximizerToggle<CR>",
["<leader>ff"] = "<cmd>Telescope find_files<CR>",
["<leader>fw"] = "<cmd>Telescope live_grep<CR>",
["<leader>fc"] = "<cmd>Telescope grep_string<CR>",
["<leader>th"] = "<cmd>Themery<CR>",
["<leader>sm"] = ":MaximizerToggle<CR>",
-- FTerm
["<leader>h"] = "<cmd>FTermToggle<CR>"
["<leader>h"] = "<cmd>FTermToggle<CR>",
-- Harpoon
["<leader>a"] = "<cmd>HarpoonAdd<CR>",
["<C-e>"] = "<cmd>HarpoonUI<CR>"
},
x = {
["<A-j>"] = ":move '>+1<CR>gv-gv",

View File

@ -58,5 +58,11 @@ require("lazy").setup({
dependencies = { 'nvim-tree/nvim-web-devicons' }
},
'numToStr/FTerm.nvim',
'github/copilot.vim'
'github/copilot.vim',
"nvim-lua/plenary.nvim",
{
"ThePrimeagen/harpoon",
branch = "harpoon2",
requires = { { "nvim-lua/plenary.nvim" } }
}
})

View File

@ -4,6 +4,9 @@
- telescope x
- theming x
- tabfluline x
- terminal
- rice
- terminal x
- harpoon
- extended history
- extended history x
- auto-pairs
- lua vim linting