From 8946e447a6d49fb6bb22d0be903a6a7cc47c7ea6 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 1 Apr 2022 23:20:34 +0200 Subject: [PATCH] Adding harpoon --- nvim/nvim/config/new/lua/plugins.lua | 7 ++++-- nvim/nvim/config/new/lua/settings.lua | 7 ++++++ nvim/nvim/config/new/lua/windows/harpoon.lua | 22 +++++++++++++++++++ nvim/nvim/config/new/lua/windows/init.lua | 1 + .../nvim/config/new/lua/windows/which-key.lua | 7 ++++++ 5 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 nvim/nvim/config/new/lua/windows/harpoon.lua diff --git a/nvim/nvim/config/new/lua/plugins.lua b/nvim/nvim/config/new/lua/plugins.lua index f0b95b8..f8dcfd6 100644 --- a/nvim/nvim/config/new/lua/plugins.lua +++ b/nvim/nvim/config/new/lua/plugins.lua @@ -44,15 +44,18 @@ return packer.startup(function(use) use "tpope/vim-surround" - use{ "tpope/vim-unimpaired", config = function() vim.g.nremap = { ["[u"] = "", ["]u"] = "" } end } + use { "tpope/vim-unimpaired", config = function() vim.g.nremap = { ["[u"] = "", ["]u"] = "" } end } use "tpope/vim-speeddating" use "tpope/vim-repeat" use "tpope/vim-sleuth" - use "ggandor/lightspeed.nvim" use "nishigori/increment-activator" use { "airblade/vim-rooter", config = function() vim.g.rooter_manual_only = 1 end } use { "Pocco81/AutoSave.nvim", config = function() require "autosave".setup() end } + + use "ggandor/lightspeed.nvim" + use "ThePrimeagen/harpoon" + use "folke/tokyonight.nvim" diff --git a/nvim/nvim/config/new/lua/settings.lua b/nvim/nvim/config/new/lua/settings.lua index 2b0653a..f8b5236 100644 --- a/nvim/nvim/config/new/lua/settings.lua +++ b/nvim/nvim/config/new/lua/settings.lua @@ -62,7 +62,14 @@ keymap("i", "", "", opts) keymap("i", "", "", opts) keymap("i", "", "", opts) +keymap("c", "", "", opts) keymap("i", "", "", opts) -- Keymap for CTRL-BACKSPACE on some termial emulators. +keymap("c", "", "", opts) + +keymap("n", "y", '"+y', opts) +keymap("x", "y", '"+y', opts) +keymap("n", "Y", '"+Y', opts) +keymap("x", "Y", '"+Y', opts) vim.cmd [[ augroup highlight_yank diff --git a/nvim/nvim/config/new/lua/windows/harpoon.lua b/nvim/nvim/config/new/lua/windows/harpoon.lua new file mode 100644 index 0000000..22512aa --- /dev/null +++ b/nvim/nvim/config/new/lua/windows/harpoon.lua @@ -0,0 +1,22 @@ +local ok, harpoon = pcall(require, "harpoon") +if not ok then + return +end + +harpoon.setup({ + mark_branch = true, +}) + +local wk = require "which-key" +wk.register({ + [""] = { 'lua require("harpoon.ui").nav_file(1)', "Navigate to harpoon 1" }, + [""] = { 'lua require("harpoon.ui").nav_file(2)', "Navigate to harpoon 2" }, + [""] = { 'lua require("harpoon.ui").nav_file(3)', "Navigate to harpoon 3" }, + [""] = { 'lua require("harpoon.ui").nav_file(4)', "Navigate to harpoon 4" }, +}) +wk.register({ + a = { 'lua require("harpoon.mark").add_file()', "Mark file" }, + h = { 'lua require("harpoon.ui").toggle_quick_menu()', "Harpoon menu" }, +}, { + prefix = "" +}) diff --git a/nvim/nvim/config/new/lua/windows/init.lua b/nvim/nvim/config/new/lua/windows/init.lua index b911fb4..08a0a73 100644 --- a/nvim/nvim/config/new/lua/windows/init.lua +++ b/nvim/nvim/config/new/lua/windows/init.lua @@ -5,4 +5,5 @@ require "windows.trouble" require "windows.scrollbar" require "windows.colorcolumn" require "windows.tree" +require "windows.harpoon" diff --git a/nvim/nvim/config/new/lua/windows/which-key.lua b/nvim/nvim/config/new/lua/windows/which-key.lua index caf4816..cde46fa 100644 --- a/nvim/nvim/config/new/lua/windows/which-key.lua +++ b/nvim/nvim/config/new/lua/windows/which-key.lua @@ -30,3 +30,10 @@ wk.register({ noremap = false, }) +wk.register({ + y = { "Yank to system clipboard" }, + Y = { "Yank line to system clipboard" }, +}, { + prefix = "" +}) +