more restructering

This commit is contained in:
Oliver Hartmann 2022-12-28 20:29:41 +01:00
parent ce61facff9
commit 4916c4eca2
7 changed files with 92 additions and 121 deletions

27
lua/plugins/aerial.lua Normal file
View File

@ -0,0 +1,27 @@
return {
'stevearc/aerial.nvim',
dependencies = {
'nvim-telescope/telescope.nvim'
},
config = function()
require('aerial').setup({
backends = { 'lsp', 'treesitter', 'markdown' },
layout = {
default_direction = "prefer_left"
},
filter_kind = false,
show_guides = true,
})
require('telescope').load_extension('aerial')
end,
cmd = 'AerialToggle',
keys = {
{
'<leader>s',
function ()
require('aerial').toggle()
end,
desc = 'Symbols outline',
}
}
}

View File

@ -29,40 +29,6 @@ return {
require('setup/my_gruvbox_flat')
end
},
{
'akinsho/toggleterm.nvim',
config = function()
require('setup/toggleterm')
end,
cmd = 'ToggleTerm',
keys = '<space>g'
},
{
'gbprod/yanky.nvim',
config = function()
require('setup/yanky')
end,
keys = {
{ '<c-n>' },
{ '<c-o>' }
},
dependencies = {
'nvim-telescope/telescope.nvim'
}
},
{
'stevearc/aerial.nvim',
dependencies = {
'nvim-telescope/telescope.nvim'
},
config = function()
require('setup/aerial')
end,
cmd = 'AerialToggle',
keys = {
{ '<leader>s' }
}
},
{
'ggandor/leap.nvim',
dependencies = { 'tpope/vim-repeat' },

18
lua/plugins/neoclip.lua Normal file
View File

@ -0,0 +1,18 @@
return {
"AckslD/nvim-neoclip.lua",
dependencies = {
{ 'kkharji/sqlite.lua', module = 'sqlite' },
-- { 'nvim-telescope/telescope.nvim' },
},
config = true,
keys = {
{
'[',
function ()
require('telescope').extensions.neoclip.default({initial_mode='normal'})
end,
desc = 'NeoClip'
}
},
event = 'VeryLazy'
}

View File

@ -0,0 +1,47 @@
return {
'akinsho/toggleterm.nvim',
config = function()
function _G.set_terminal_keymaps(term)
local opts = { noremap = true }
if (term.cmd ~= 'lazygit') then
vim.api.nvim_buf_set_keymap(term.bufnr, 't', '<esc>', [[<C-\><C-n>]], opts)
end
vim.api.nvim_buf_set_keymap(term.bufnr, 't', 'jk', [[<C-\><C-n>]], opts)
vim.api.nvim_buf_set_keymap(term.bufnr, 't', '<C-h>', [[<C-\><C-n><C-W>h]], opts)
vim.api.nvim_buf_set_keymap(term.bufnr, 't', '<C-j>', [[<C-\><C-n><C-W>j]], opts)
vim.api.nvim_buf_set_keymap(term.bufnr, 't', '<C-k>', [[<C-\><C-n><C-W>k]], opts)
vim.api.nvim_buf_set_keymap(term.bufnr, 't', '<C-l>', [[<C-\><C-n><C-W>l]], opts)
end
require('toggleterm').setup({
on_open = set_terminal_keymaps
})
local Terminal = require('toggleterm.terminal').Terminal
local lazygit = Terminal:new({
cmd = 'lazygit',
-- dir = vim.fn.getcwd(),
hidden = true,
direction = 'float',
on_open = function(term)
vim.api.nvim_buf_set_keymap(term.bufnr, "n", "q", "<cmd>close<CR>", { noremap = true, silent = true })
-- vim.api.nvim_buf_set_keymap(term.bufnr, 't', '<esc>', '<esc>', {noremap = true, silent = true})
end,
})
function _lazygit_toggle()
lazygit:toggle()
end
end,
cmd = 'ToggleTerm',
keys = {
{
'<Space>g',
function()
_lazygit_toggle()
end,
desc= 'Open lazygit',
}
}
}

View File

@ -1,18 +0,0 @@
require('aerial').setup({
backends = { 'lsp', 'treesitter', 'markdown' },
layout = {
default_direction = "prefer_left"
},
filter_kind = false,
show_guides = true,
})
require('telescope').load_extension('aerial')
require('legendary').keymaps(
{
{
'<leader>s',
':AerialToggle<CR>',
description = 'Symbols outline',
}
}
)

View File

@ -1,42 +0,0 @@
function _G.set_terminal_keymaps(term)
local opts = { noremap = true }
if (term.cmd ~= 'lazygit') then
vim.api.nvim_buf_set_keymap(term.bufnr, 't', '<esc>', [[<C-\><C-n>]], opts)
end
vim.api.nvim_buf_set_keymap(term.bufnr, 't', 'jk', [[<C-\><C-n>]], opts)
vim.api.nvim_buf_set_keymap(term.bufnr, 't', '<C-h>', [[<C-\><C-n><C-W>h]], opts)
vim.api.nvim_buf_set_keymap(term.bufnr, 't', '<C-j>', [[<C-\><C-n><C-W>j]], opts)
vim.api.nvim_buf_set_keymap(term.bufnr, 't', '<C-k>', [[<C-\><C-n><C-W>k]], opts)
vim.api.nvim_buf_set_keymap(term.bufnr, 't', '<C-l>', [[<C-\><C-n><C-W>l]], opts)
end
require('toggleterm').setup({
on_open = set_terminal_keymaps
})
local Terminal = require('toggleterm.terminal').Terminal
local lazygit = Terminal:new({
cmd = 'lazygit',
-- dir = vim.fn.getcwd(),
hidden = true,
direction = 'float',
on_open = function(term)
vim.api.nvim_buf_set_keymap(term.bufnr, "n", "q", "<cmd>close<CR>", { noremap = true, silent = true })
-- vim.api.nvim_buf_set_keymap(term.bufnr, 't', '<esc>', '<esc>', {noremap = true, silent = true})
end,
})
function _lazygit_toggle()
lazygit:toggle()
end
require('legendary').keymaps(
{
{
'<Space>g',
':lua _lazygit_toggle()<CR>',
description = 'Open lazygit',
}
}
)

View File

@ -1,27 +0,0 @@
require('yanky').setup()
vim.api.nvim_set_keymap('n', 'p', '<Plug>(YankyPutAfter)', {})
vim.api.nvim_set_keymap('n', 'P', '<Plug>(YankyPutBefore)', {})
vim.api.nvim_set_keymap('x', 'p', '<Plug>(YankyPutAfter)', {})
vim.api.nvim_set_keymap('x', 'P', '<Plug>(YankyPutBefore)', {})
vim.api.nvim_set_keymap('n', 'gp', '<Plug>(YankyGPutAfter)', {})
vim.api.nvim_set_keymap('n', 'gP', '<Plug>(YankyGPutBefore)', {})
vim.api.nvim_set_keymap('x', 'gp', '<Plug>(YankyGPutAfter)', {})
vim.api.nvim_set_keymap('x', 'gP', '<Plug>(YankyGPutBefore)', {})
vim.keymap.set("n", "<c-n>", "<Plug>(YankyCycleForward)", {})
vim.keymap.set("n", "<c-p>", "<Plug>(YankyCycleBackward)", {})
require("telescope").load_extension('yank_history')
require('legendary').keymaps(
{
{
'<c-n>',
'<Plug>(YankyCycleForward)',
description = 'Yanky cycle forward',
},
{
'<c-p>',
'<Plug>(YankyCycleBackward)',
description = 'Yanky cycle backward',
},
}
)