This commit is contained in:
marekmichalski 2024-02-25 12:40:52 +01:00
parent 47500c80a7
commit cacd5e29c0
10 changed files with 88 additions and 57 deletions

View file

@ -1,3 +1,2 @@
require("custom.remap")
require("custom.set")

View file

@ -1,8 +0,0 @@
return {
{
'vim-fugitive',
keys = {
{'<leader>gs', vim.cmd.Git, desc = 'open git'}
}
}
}

View file

@ -1,8 +0,0 @@
return {
'lewis6991/gitsigns.nvim',
config = function()
require('gitsigns').setup()
vim.keymap.set('n', '<leader>gp', ':Gitsigns preview_hunk<CR>', {})
vim.keymap.set('n', '<leader>gb',':Gitsigns toggle_current_line_blame<CR>', {})
end
}

View file

@ -1,19 +0,0 @@
return {
{
"theprimeagen/harpoon",
branch = "harpoon2",
dependencies = { "nvim-lua/plenary.nvim" },
config = function()
require("harpoon"):setup()
end,
keys = {
{ "<leader>A", function() require("harpoon"):list():append() end, desc = "harpoon file", },
{ "<leader>a", function() local harpoon = require("harpoon") harpoon.ui:toggle_quick_menu(harpoon:list()) end, desc = "harpoon quick menu", },
{ "<leader>1", function() require("harpoon"):list():select(1) end, desc = "harpoon to file 1", },
{ "<leader>2", function() require("harpoon"):list():select(2) end, desc = "harpoon to file 2", },
{ "<leader>3", function() require("harpoon"):list():select(3) end, desc = "harpoon to file 3", },
{ "<leader>4", function() require("harpoon"):list():select(4) end, desc = "harpoon to file 4", },
{ "<leader>5", function() require("harpoon"):list():select(5) end, desc = "harpoon to file 5", },
},
},
}

View file

@ -0,0 +1,60 @@
return {
{
'windwp/nvim-autopairs',
event = "InsertEnter",
opts = {}
},
{ 'github/copilot.vim' },
{
'lewis6991/gitsigns.nvim',
config = function()
require('gitsigns').setup()
vim.keymap.set('n', '<leader>gp', ':Gitsigns preview_hunk<CR>', {})
vim.keymap.set('n', '<leader>gb', ':Gitsigns toggle_current_line_blame<CR>', {})
end
},
{
"theprimeagen/harpoon",
branch = "harpoon2",
dependencies = { "nvim-lua/plenary.nvim" },
config = function()
require("harpoon"):setup()
end,
keys = {
{ "<leader>A", function() require("harpoon"):list():append() end, desc = "harpoon file", },
{
"<leader>a",
function()
local harpoon = require("harpoon")
harpoon.ui:toggle_quick_menu(harpoon:list())
end,
desc = "harpoon quick menu",
},
{ "<leader>1", function() require("harpoon"):list():select(1) end, desc = "harpoon to file 1", },
{ "<leader>2", function() require("harpoon"):list():select(2) end, desc = "harpoon to file 2", },
{ "<leader>3", function() require("harpoon"):list():select(3) end, desc = "harpoon to file 3", },
{ "<leader>4", function() require("harpoon"):list():select(4) end, desc = "harpoon to file 4", },
{ "<leader>5", function() require("harpoon"):list():select(5) end, desc = "harpoon to file 5", },
},
},
{
"nvim-tree/nvim-tree.lua",
version = "*",
lazy = false,
dependencies = {
"nvim-tree/nvim-web-devicons",
},
config = function()
require("nvim-tree").setup {}
end,
keys = {
{ '<leader>pv', vim.cmd.NvimTreeToggle, desc = 'Toggle nvim-tree' }
}
},
{
'mbbill/undotree',
keys = {
{ '<leader>u', vim.cmd.UndotreeToggle, desc = 'toggle undotree' }
}
},
}

View file

@ -1,8 +0,0 @@
return {
{
'mbbill/undotree',
keys = {
{'<leader>u',vim.cmd.UndotreeToggle, desc = 'toggle undotree'}
}
}
}

View file

@ -1,5 +1,3 @@
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
@ -13,10 +11,10 @@ vim.keymap.set("n", "N", "Nzzzv")
vim.keymap.set("x", "<leader>p", [["_dP]])
-- next greatest remap ever : asbjornHaland
vim.keymap.set({"n", "v"}, "<leader>y", [["+y]])
vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
vim.keymap.set("n", "<leader>Y", [["+Y]])
vim.keymap.set({"n", "v"}, "<leader>d", [["_d]])
vim.keymap.set({ "n", "v" }, "<leader>d", [["_d]])
-- This is going to get me cancelled
vim.keymap.set("i", "<C-c>", "<Esc>")
@ -39,3 +37,4 @@ vim.keymap.set("n", "<leader>mr", "<cmd>CellularAutomaton make_it_rain<CR>");
vim.keymap.set("n", "<leader><leader>", function()
vim.cmd("so")
end)

View file

@ -46,9 +46,9 @@ return {
-- Tsserver usually works poorly. Sorry you work with bad languages
-- You can remove this line if you know what you're doing :)
if client.name == 'tsserver' then
return
end
-- if client.name == 'tsserver' then
-- return
-- end
-- Create an autocmd that will run *before* we save the buffer.
-- Run the formatting command for the LSP that has just attached.