aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nvim/after/plugin/harpoon.lua10
-rw-r--r--nvim/lua/lemon/packer.lua137
-rw-r--r--nvim/lua/lemon/remap.lua2
-rw-r--r--nvim/plugin/packer_compiled.lua23
4 files changed, 94 insertions, 78 deletions
diff --git a/nvim/after/plugin/harpoon.lua b/nvim/after/plugin/harpoon.lua
new file mode 100644
index 0000000..4f57af5
--- /dev/null
+++ b/nvim/after/plugin/harpoon.lua
@@ -0,0 +1,10 @@
+local mark = require("harpoon.mark")
+local ui = require("harpoon.ui")
+
+vim.keymap.set("n", "<leader>a", mark.add_file)
+vim.keymap.set("n", "<leader>bh", ui.toggle_quick_menu)
+
+vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
+vim.keymap.set("n", "<C-t>", function() ui.nav_file(2) end)
+vim.keymap.set("n", "<C-n>", function() ui.nav_file(3) end)
+vim.keymap.set("n", "<C-s>", function() ui.nav_file(4) end)
diff --git a/nvim/lua/lemon/packer.lua b/nvim/lua/lemon/packer.lua
index 7ef669c..e12f00a 100644
--- a/nvim/lua/lemon/packer.lua
+++ b/nvim/lua/lemon/packer.lua
@@ -4,82 +4,83 @@
vim.cmd.packadd('packer.nvim')
return require('packer').startup(function(use)
- -- Packer can manage itself
- use 'wbthomason/packer.nvim'
+ -- Packer can manage itself
+ use 'wbthomason/packer.nvim'
+ use("theprimeagen/harpoon")
+ use {
+ 'nvim-telescope/telescope.nvim', tag = '0.1.0',
+ -- or , branch = '0.1.x',
+ requires = { {'nvim-lua/plenary.nvim'} }
+ }
- use {
- 'nvim-telescope/telescope.nvim', tag = '0.1.0',
- -- or , branch = '0.1.x',
- requires = { {'nvim-lua/plenary.nvim'} }
- }
+ use({
+ 'rose-pine/neovim',
+ as = 'rose-pine',
+ config = function()
+ vim.cmd('colorscheme rose-pine')
+ end
+ })
- use({
- 'rose-pine/neovim',
- as = 'rose-pine',
- config = function()
- vim.cmd('colorscheme rose-pine')
- end
- })
+ use({
+ "folke/trouble.nvim",
+ config = function()
+ require("trouble").setup {
+ icons = false,
+ -- your configuration comes here
+ -- or leave it empty to use the default settings
+ -- refer to the configuration section below
+ }
+ end
+ })
- use({
- "folke/trouble.nvim",
- config = function()
- require("trouble").setup {
- icons = false,
- -- your configuration comes here
- -- or leave it empty to use the default settings
- -- refer to the configuration section below
- }
- end
- })
+ use({"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"})
+ use("nvim-treesitter/playground")
+ use("mbbill/undotree")
+ use("tpope/vim-fugitive")
+ use("tpope/vim-commentary")
+ use("nvim-treesitter/nvim-treesitter-context");
+ use('mfussenegger/nvim-dap')
- use({"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"})
- use("mbbill/undotree")
- use("tpope/vim-fugitive")
- use("tpope/vim-commentary")
- use("nvim-treesitter/nvim-treesitter-context");
- use('mfussenegger/nvim-dap')
+ use {
+ 'VonHeikemen/lsp-zero.nvim',
+ branch = 'v1.x',
+ requires = {
+ -- LSP Support
+ {'neovim/nvim-lspconfig'},
+ {'williamboman/mason.nvim'},
+ {'williamboman/mason-lspconfig.nvim'},
- use {
- 'VonHeikemen/lsp-zero.nvim',
- branch = 'v1.x',
- requires = {
- -- LSP Support
- {'neovim/nvim-lspconfig'},
- {'williamboman/mason.nvim'},
- {'williamboman/mason-lspconfig.nvim'},
+ -- Autocompletion
+ {'hrsh7th/nvim-cmp'},
+ {'hrsh7th/cmp-buffer'},
+ {'hrsh7th/cmp-path'},
+ {'saadparwaiz1/cmp_luasnip'},
+ {'hrsh7th/cmp-nvim-lsp'},
+ {'hrsh7th/cmp-nvim-lua'},
- -- Autocompletion
- {'hrsh7th/nvim-cmp'},
- {'hrsh7th/cmp-buffer'},
- {'hrsh7th/cmp-path'},
- {'saadparwaiz1/cmp_luasnip'},
- {'hrsh7th/cmp-nvim-lsp'},
- {'hrsh7th/cmp-nvim-lua'},
+ -- Snippets
+ {'L3MON4D3/LuaSnip'},
+ {'rafamadriz/friendly-snippets'},
+ }
+ }
- -- Snippets
- {'L3MON4D3/LuaSnip'},
- {'rafamadriz/friendly-snippets'},
- }
- }
-
- use("folke/zen-mode.nvim")
- use("github/copilot.vim")
- use("eandrju/cellular-automaton.nvim")
- -- use("laytan/cloak.nvim")
- use("jlanzarotta/bufexplorer")
- use {
- "nvim-neotest/neotest",
- requires = {
- "nvim-neotest/neotest-python",
- "nvim-neotest/neotest-plenary",
- "folke/neodev.nvim",
- "nvim-lua/plenary.nvim",
- "nvim-treesitter/nvim-treesitter",
- "antoinemadec/FixCursorHold.nvim"
- }
- }
+ use("folke/zen-mode.nvim")
+ use("github/copilot.vim")
+ use("eandrju/cellular-automaton.nvim")
+ -- use("laytan/cloak.nvim")
+ use("jlanzarotta/bufexplorer")
+ use {
+ "nvim-neotest/neotest",
+ requires = {
+ "nvim-neotest/neotest-python",
+ "nvim-neotest/neotest-plenary",
+ "folke/neodev.nvim",
+ "nvim-lua/plenary.nvim",
+ "nvim-treesitter/nvim-treesitter",
+ "antoinemadec/FixCursorHold.nvim"
+ }
+ }
end)
diff --git a/nvim/lua/lemon/remap.lua b/nvim/lua/lemon/remap.lua
index 4151214..3999c8a 100644
--- a/nvim/lua/lemon/remap.lua
+++ b/nvim/lua/lemon/remap.lua
@@ -1,5 +1,5 @@
-vim.g.mapleader = ","
+vim.g.mapleader = " "
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
diff --git a/nvim/plugin/packer_compiled.lua b/nvim/plugin/packer_compiled.lua
index 430c1c4..a7447c4 100644
--- a/nvim/plugin/packer_compiled.lua
+++ b/nvim/plugin/packer_compiled.lua
@@ -129,6 +129,11 @@ _G.packer_plugins = {
path = "/home/lemon/.local/share/nvim/site/pack/packer/start/friendly-snippets",
url = "https://github.com/rafamadriz/friendly-snippets"
},
+ harpoon = {
+ loaded = true,
+ path = "/home/lemon/.local/share/nvim/site/pack/packer/start/harpoon",
+ url = "https://github.com/theprimeagen/harpoon"
+ },
["lsp-zero.nvim"] = {
loaded = true,
path = "/home/lemon/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim",
@@ -174,11 +179,6 @@ _G.packer_plugins = {
path = "/home/lemon/.local/share/nvim/site/pack/packer/start/nvim-dap",
url = "https://github.com/mfussenegger/nvim-dap"
},
- ["nvim-dap-python"] = {
- loaded = true,
- path = "/home/lemon/.local/share/nvim/site/pack/packer/start/nvim-dap-python",
- url = "https://github.com/mfussenegger/nvim-dap-python"
- },
["nvim-lspconfig"] = {
loaded = true,
path = "/home/lemon/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
@@ -199,6 +199,11 @@ _G.packer_plugins = {
path = "/home/lemon/.local/share/nvim/site/pack/packer/start/packer.nvim",
url = "https://github.com/wbthomason/packer.nvim"
},
+ playground = {
+ loaded = true,
+ path = "/home/lemon/.local/share/nvim/site/pack/packer/start/playground",
+ url = "https://github.com/nvim-treesitter/playground"
+ },
["plenary.nvim"] = {
loaded = true,
path = "/home/lemon/.local/share/nvim/site/pack/packer/start/plenary.nvim",
@@ -244,14 +249,14 @@ _G.packer_plugins = {
}
time([[Defining packer_plugins]], false)
--- Config for: trouble.nvim
-time([[Config for trouble.nvim]], true)
-try_loadstring("\27LJ\2\nC\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\nicons\1\nsetup\ftrouble\frequire\0", "config", "trouble.nvim")
-time([[Config for trouble.nvim]], false)
-- Config for: rose-pine
time([[Config for rose-pine]], true)
try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\26colorscheme rose-pine\bcmd\bvim\0", "config", "rose-pine")
time([[Config for rose-pine]], false)
+-- Config for: trouble.nvim
+time([[Config for trouble.nvim]], true)
+try_loadstring("\27LJ\2\nC\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\nicons\1\nsetup\ftrouble\frequire\0", "config", "trouble.nvim")
+time([[Config for trouble.nvim]], false)
_G._packer.inside_compile = false
if _G._packer.needs_bufread == true then