feat: add harpoon clear, wip harpoon maybe add

main
jaredgoldman 2024-04-09 10:34:07 -04:00
parent 1a36e16bf6
commit c41927eb3c
8 changed files with 362 additions and 248 deletions

View File

@ -1,32 +1,123 @@
{
"FTerm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" },
"LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" },
"catppuccin": { "branch": "main", "commit": "aebe43db9cb26e1c70fc5b2fd4158169c405e720" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"conform.nvim": { "branch": "master", "commit": "9d5ba06d6ee7418c674f498634617416d15b6239" },
"copilot.vim": { "branch": "release", "commit": "7097b09e52621a97d11f254e04de5e5a0f26e5f5" },
"dashboard-nvim": { "branch": "master", "commit": "681300934baf36f6184ca41f0b26aed22056d4ee" },
"harpoon": { "branch": "harpoon2", "commit": "da326d0438ac68dee9b6b62a734be940a8bd8405" },
"lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" },
"lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" },
"mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
"monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" },
"nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" },
"nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" },
"nvim-comment": { "branch": "main", "commit": "e9ac16ab056695cad6461173693069ec070d2b23" },
"nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" },
"nvim-lspconfig": { "branch": "master", "commit": "9619e53d3f99f0ca4ea3b88f5d97fce703131820" },
"nvim-tree.lua": { "branch": "master", "commit": "81eb8d519233c105f30dc0a278607e62b20502fd" },
"nvim-treesitter": { "branch": "master", "commit": "11a3584b81c3249d2b6279305aee1c7ad273985a" },
"nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
"nvim-web-devicons": { "branch": "master", "commit": "93ddac6966d5d3416f96df728d7b92e27aaa4452" },
"plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" },
"telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
"themery.nvim": { "branch": "main", "commit": "1005a58801276d29c4b1e11244cf7631250f9143" },
"vim-maximizer": { "branch": "master", "commit": "2e54952fe91e140a2e69f35f22131219fcd9c5f1" }
"FTerm.nvim": {
"branch": "master",
"commit": "d1320892cc2ebab472935242d9d992a2c9570180"
},
"LuaSnip": {
"branch": "master",
"commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d"
},
"catppuccin": {
"branch": "main",
"commit": "aebe43db9cb26e1c70fc5b2fd4158169c405e720"
},
"cmp-buffer": {
"branch": "main",
"commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa"
},
"cmp-cmdline": {
"branch": "main",
"commit": "d250c63aa13ead745e3a40f61fdd3470efde3923"
},
"cmp-nvim-lsp": {
"branch": "main",
"commit": "5af77f54de1b16c34b23cba810150689a3a90312"
},
"cmp-path": {
"branch": "main",
"commit": "91ff86cd9c29299a64f968ebb45846c485725f23"
},
"conform.nvim": {
"branch": "master",
"commit": "9d5ba06d6ee7418c674f498634617416d15b6239"
},
"copilot.vim": {
"branch": "release",
"commit": "7097b09e52621a97d11f254e04de5e5a0f26e5f5"
},
"dashboard-nvim": {
"branch": "master",
"commit": "681300934baf36f6184ca41f0b26aed22056d4ee"
},
"harpoon": {
"branch": "harpoon2",
"commit": "da326d0438ac68dee9b6b62a734be940a8bd8405"
},
"lazy.nvim": {
"branch": "main",
"commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8"
},
"lspkind.nvim": {
"branch": "master",
"commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf"
},
"lualine.nvim": {
"branch": "master",
"commit": "0a5a66803c7407767b799067986b4dc3036e1983"
},
"mason-lspconfig.nvim": {
"branch": "main",
"commit": "44509689b9bf3984d729cc264aacb31cb7f41668"
},
"mason.nvim": {
"branch": "main",
"commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10"
},
"monokai.nvim": {
"branch": "master",
"commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63"
},
"nvim-autopairs": {
"branch": "master",
"commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a"
},
"nvim-cmp": {
"branch": "main",
"commit": "ce16de5665c766f39c271705b17fff06f7bcb84f"
},
"nvim-comment": {
"branch": "main",
"commit": "e9ac16ab056695cad6461173693069ec070d2b23"
},
"nvim-dap": {
"branch": "master",
"commit": "405df1dcc2e395ab5173a9c3d00e03942c023074"
},
"nvim-lspconfig": {
"branch": "master",
"commit": "9619e53d3f99f0ca4ea3b88f5d97fce703131820"
},
"nvim-tree.lua": {
"branch": "master",
"commit": "81eb8d519233c105f30dc0a278607e62b20502fd"
},
"nvim-treesitter": {
"branch": "master",
"commit": "11a3584b81c3249d2b6279305aee1c7ad273985a"
},
"nvim-ts-autotag": {
"branch": "main",
"commit": "531f48334c422222aebc888fd36e7d109cb354cd"
},
"nvim-web-devicons": {
"branch": "master",
"commit": "93ddac6966d5d3416f96df728d7b92e27aaa4452"
},
"plenary.nvim": {
"branch": "master",
"commit": "8aad4396840be7fc42896e3011751b7609ca4119"
},
"telescope.nvim": {
"branch": "master",
"commit": "6312868392331c9c0f22725041f1ec2bef57c751"
},
"themery.nvim": {
"branch": "main",
"commit": "1005a58801276d29c4b1e11244cf7631250f9143"
},
"vim-maximizer": {
"branch": "master",
"commit": "2e54952fe91e140a2e69f35f22131219fcd9c5f1"
}
}

View File

@ -4,6 +4,7 @@ require("conform").setup({
python = { "isort", "black" },
javascript = { { "prettierd", "prettier" } },
json = { { "prettierd", "prettier" } },
markdown = { { "marksman", "prettierd", "prettier" } },
},
})

View File

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

View File

@ -1,11 +1,6 @@
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('HarpoonTogglePrev', function() harpoon:list():prev() end, { bang = true })
api.nvim_create_user_command('HarpoonToggleNext', function() harpoon:list():next() end, { bang = true })
-- basic telescope configuration
local conf = require("telescope.config").values
local function toggle_telescope(harpoon_files)
@ -14,14 +9,41 @@ local function toggle_telescope(harpoon_files)
table.insert(file_paths, item.value)
end
require("telescope.pickers").new({}, {
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()
})
:find()
end
api.nvim_create_user_command('HarpoonUI', function() toggle_telescope(harpoon:list()) end, { bang = true })
local function maybe_remove_add()
local bufnr = api.nvim_get_current_buf()
local mark = harpoon:mark(bufnr)
if mark then
harpoon:list():add()
else
harpoon:list():remove()
end
end
-- Commands
api.nvim_create_user_command("HarpoonClear", function()
harpoon:list():clear()
end, { bang = true })
api.nvim_create_user_command("HarpoonToggleFile", function()
maybe_remove_add()
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 })
api.nvim_create_user_command("HarpoonUI", function()
toggle_telescope(harpoon:list())
end, { bang = true })

View File

@ -1,24 +1,25 @@
-- Mason
require('mason').setup({
require("mason").setup({
ui = {
icons = {
package_installed = "",
package_pending = "",
package_uninstalled = ""
}
}
})
-- A list of servers to automatically install if they're not already installed
require('mason-lspconfig').setup({
ensure_installed = {
'cssls',
'cssmodules_ls',
'graphql',
'html',
'intelephense',
'tailwindcss',
'tsserver',
'jsonls',
'lua_ls',
package_uninstalled = "",
},
},
})
-- A list of servers to automatically install if they're not already installed
require("mason-lspconfig").setup({
ensure_installed = {
"cssls",
"cssmodules_ls",
"graphql",
"html",
"intelephense",
"tailwindcss",
"tsserver",
"jsonls",
"lua_ls",
"marksman",
},
})

View File

@ -8,7 +8,4 @@ require("nvim-tree").setup({
renderer = {
group_empty = true,
},
filters = {
dotfiles = true,
},
})

View File

@ -16,8 +16,8 @@ local mappings = {
["<leader>se"] = "<C-w>=",
["<leader>sx"] = ":close<CR>",
-- nvim-tree
["<leader>e"] = ":NvimTreeToggle<CR>",
["<leader>cf"] = ":NvimTreeCollapse<CR>",
["<leader>e"] = ":NvimTreeFindFileToggle<CR>",
["<leader>cf"] = ":NvimTreeCollapseKeepBuffers<CR>",
-- LSP
["<leader>ls"] = ":lspstop<CR>",
["<leader>lo"] = ":lspstart<CR>",
@ -32,6 +32,7 @@ local mappings = {
-- Harpoon
["<leader>a"] = "<cmd>HarpoonAdd<CR>",
["<C-e>"] = "<cmd>HarpoonUI<CR>",
["<leader>c"] = "<cmd>HarpoonClear<CR>",
-- Formating
["<leader>fm"] = "<cmd>Format<CR>",
},
@ -42,9 +43,10 @@ local mappings = {
i = {
["<C-Space>"] = { 'copilot#Accept("<CR>")', expr = true },
["<A-l>"] = "<esc>",
["C-BS"] = "<cmd>HarpoonRemove<CR>"
},
t = {
["A-l"] = "<cmd>FTermClose<CR>",
["C-h"] = "<C-\\><C-n>:FTermClose<CR>",
},
}

View File

@ -143,4 +143,5 @@ require("lazy").setup({
"stevearc/conform.nvim",
opts = {},
},
"f-person/git-blame.nvim",
})