Some refactoring
This commit is contained in:
Oliver Hartmann
parent
9f804b8d0c
commit
fa4c72d08e
45
init.lua
45
init.lua
@ -56,10 +56,6 @@ utils.opt('o', 'showmatch', true)
|
||||
|
||||
-------------------- AUTOCOMMANDS --------------------------
|
||||
require("autocommands")
|
||||
-------------------- MAPPINGS ------------------------------
|
||||
-- <Tab> to navigate the completion menu
|
||||
utils.map('i', '<S-Tab>', 'pumvisible() ? "\\<C-p>" : "\\<Tab>"', {expr = true})
|
||||
utils.map('i', '<Tab>', 'pumvisible() ? "\\<C-n>" : "\\<Tab>"', {expr = true})
|
||||
-------------------- TREE-SITTER ---------------------------
|
||||
local ts = require 'nvim-treesitter.configs'
|
||||
ts.setup {ensure_installed = 'maintained', highlight = {enable = true}}
|
||||
@ -67,46 +63,7 @@ ts.setup {ensure_installed = 'maintained', highlight = {enable = true}}
|
||||
-------------------- FZF -----------------------------------
|
||||
--utils.map('n', '<C-P>', ':FZF<CR>')
|
||||
-------------------- TELESCOPE -----------------------------
|
||||
utils.map('n', '<leader>f', '<cmd>Telescope find_files<cr>')
|
||||
utils.map('n', '<C-p>', '<cmd>Telescope find_files<cr>')
|
||||
utils.map('n', '<leader>g', '<cmd>Telescope git_files<cr>')
|
||||
utils.map('n', '<leader>o', '<cmd>Telescope oldfiles<cr>')
|
||||
utils.map('n', '<leader>h', '<cmd>Telescope command_history<cr>')
|
||||
utils.map('v', '<leader>h', '<cmd>Telescope command_history<cr>')
|
||||
utils.map('n', '<C-S-p>', '<cmd>Telescope commands<cr>')
|
||||
utils.map('n', '<leader>b', '<cmd>Telescope buffers<cr>')
|
||||
utils.map('n', '<space>r', '<cmd>Telescope lsp_references<cr>')
|
||||
utils.map('n', '<C-S-o>', '<cmd>Telescope lsp_document_symbols<cr>')
|
||||
utils.map('n', '<A-m>', '<cmd>Telescope lsp_document_symbols<cr>')
|
||||
utils.map('n', '<space>v', '<cmd>Telescope lsp_document_diagnostics<cr>')
|
||||
local actions = require('telescope.actions')
|
||||
require('telescope').setup{
|
||||
defaults = {
|
||||
mappings = {
|
||||
i = {
|
||||
["<cr>"] = actions.select_tab,
|
||||
["<C-b>"] = actions.select_default,
|
||||
}
|
||||
},
|
||||
},
|
||||
pickers = {
|
||||
-- Your special builtin config goes in here
|
||||
buffers = {
|
||||
sort_lastused = true,
|
||||
previewer = false,
|
||||
theme = "dropdown",
|
||||
mappings = {
|
||||
i = {
|
||||
["<c-w>"] = actions.delete_buffer,
|
||||
["<cr>"] = actions.select_default,
|
||||
},
|
||||
n = {
|
||||
["<c-w>"] = actions.delete_buffer,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
require('my_telescope')
|
||||
-------------------- LSP -----------------------------------
|
||||
require('mylsp')
|
||||
|
||||
|
||||
@ -60,3 +60,21 @@ utils.map('v', 'ü', "y:let @/='<C-R>=escape(@\",'/\\')<CR>'<CR>:set hls<CR>", {
|
||||
|
||||
-- Close Buffer
|
||||
utils.map('n', '<C-w>', ':bd<CR>')
|
||||
|
||||
-- <Tab> to navigate the completion menu
|
||||
utils.map('i', '<S-Tab>', 'pumvisible() ? "\\<C-p>" : "\\<Tab>"', {expr = true})
|
||||
utils.map('i', '<Tab>', 'pumvisible() ? "\\<C-n>" : "\\<Tab>"', {expr = true})
|
||||
|
||||
-- Telescope
|
||||
utils.map('n', '<leader>f', '<cmd>Telescope find_files<cr>')
|
||||
utils.map('n', '<C-p>', '<cmd>Telescope find_files<cr>')
|
||||
utils.map('n', '<leader>g', '<cmd>Telescope git_files<cr>')
|
||||
utils.map('n', '<leader>o', '<cmd>Telescope oldfiles<cr>')
|
||||
utils.map('n', '<leader>h', '<cmd>Telescope command_history<cr>')
|
||||
utils.map('v', '<leader>h', '<cmd>Telescope command_history<cr>')
|
||||
utils.map('n', '<C-S-p>', '<cmd>Telescope commands<cr>')
|
||||
utils.map('n', '<leader>b', '<cmd>Telescope buffers<cr>')
|
||||
utils.map('n', '<space>r', '<cmd>Telescope lsp_references<cr>')
|
||||
utils.map('n', '<C-S-o>', '<cmd>Telescope lsp_document_symbols<cr>')
|
||||
utils.map('n', '<A-m>', '<cmd>Telescope lsp_document_symbols<cr>')
|
||||
utils.map('n', '<space>v', '<cmd>Telescope lsp_document_diagnostics<cr>')
|
||||
|
||||
28
lua/my_telescope.lua
Normal file
28
lua/my_telescope.lua
Normal file
@ -0,0 +1,28 @@
|
||||
local actions = require('telescope.actions')
|
||||
require('telescope').setup{
|
||||
defaults = {
|
||||
mappings = {
|
||||
i = {
|
||||
["<cr>"] = actions.select_tab,
|
||||
["<C-b>"] = actions.select_default,
|
||||
}
|
||||
},
|
||||
},
|
||||
pickers = {
|
||||
-- Your special builtin config goes in here
|
||||
buffers = {
|
||||
sort_lastused = true,
|
||||
previewer = false,
|
||||
theme = "dropdown",
|
||||
mappings = {
|
||||
i = {
|
||||
["<c-w>"] = actions.delete_buffer,
|
||||
["<cr>"] = actions.select_default,
|
||||
},
|
||||
n = {
|
||||
["<c-w>"] = actions.delete_buffer,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -35,29 +35,32 @@ local on_attach = function(client, bufnr)
|
||||
|
||||
-- Mappings.
|
||||
local opts = { noremap=true, silent=true }
|
||||
utils.map('n', '<space>,', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>')
|
||||
utils.map('n', '<space>;', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>')
|
||||
utils.map('n', '<space>a', '<cmd>Telescope lsp_code_actions<CR>')
|
||||
utils.map('n', '<space>d', '<cmd>lua vim.lsp.buf.definition()<CR>')
|
||||
utils.map('n', '<space>e', '<cmd>lua vim.lsp.buf.declaration()<CR>')
|
||||
utils.map('n', '<space>h', '<cmd>lua vim.lsp.buf.hover()<CR>')
|
||||
utils.map('n', '<space>c', '<cmd>lua vim.lsp.buf.outgoing_calls()<CR>')
|
||||
utils.map('n', '<space>C', '<cmd>lua vim.lsp.buf.incoming_calls()<CR>')
|
||||
utils.map('n', '<space>m', '<cmd>lua vim.lsp.buf.rename()<CR>')
|
||||
-- utils.map('n', '<space>r', '<cmd>lua vim.lsp.buf.references()<CR>')
|
||||
utils.map('n', '<space>s', '<cmd>lua vim.lsp.buf.document_symbol()<CR>')
|
||||
utils.map('n', '<C-t>', '<cmd>Telescope lsp_dynamic_workspace_symbols<CR>')
|
||||
utils.map('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>')
|
||||
utils.map('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>')
|
||||
|
||||
utils.map('n', '<A-o>', ':ClangdSwitchSourceHeader<CR>')
|
||||
utils.map('n', '<space>,', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
|
||||
utils.map('n', '<space>;', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
|
||||
utils.map('n', '<space>a', '<cmd>Telescope lsp_code_actions<CR>', opts)
|
||||
utils.map('n', '<space>d', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||
utils.map('n', '<space>e', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
||||
utils.map('n', '<space>h', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
||||
utils.map('n', '<space>c', '<cmd>lua vim.lsp.buf.outgoing_calls()<, optsCR>')
|
||||
utils.map('n', '<space>C', '<cmd>lua vim.lsp.buf.incoming_calls()<CR>', opts)
|
||||
utils.map('n', '<space>m', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
||||
-- utils.map('n', '<space>r', '<cmd>lua vim.lsp.buf.references()<CR, opts>')
|
||||
utils.map('n', '<space>s', '<cmd>lua vim.lsp.buf.document_symbol()<CR>', opts)
|
||||
utils.map('n', '<C-t>', '<cmd>Telescope lsp_dynamic_workspace_symbols<CR>', opts)
|
||||
utils.map('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
|
||||
utils.map('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
|
||||
utils.map('n', '<space>r', '<cmd>Telescope lsp_references<cr>')
|
||||
utils.map('n', '<C-S-o>', '<cmd>Telescope lsp_document_symbols<cr>')
|
||||
utils.map('n', '<A-m>', '<cmd>Telescope lsp_document_symbols<cr>')
|
||||
utils.map('n', '<space>v', '<cmd>Telescope lsp_document_diagnostics<cr>')
|
||||
utils.map('n', '<A-o>', ':ClangdSwitchSourceHeader<CR>', opts)
|
||||
|
||||
-- Set some keybinds conditional on server capabilities
|
||||
if client.resolved_capabilities.document_formatting then
|
||||
utils.map('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>')
|
||||
utils.map('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
|
||||
end
|
||||
if client.resolved_capabilities.document_range_formatting then
|
||||
utils.map('v', '<space>f', '<cmd>lua vim.lsp.buf.range_formatting()<CR>')
|
||||
utils.map('v', '<space>f', '<cmd>lua vim.lsp.buf.range_formatting()<CR>', opts)
|
||||
end
|
||||
|
||||
-- Set autocommands conditional on server_capabilities
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user