diff --git a/init.lua b/init.lua index f548708..62fa03a 100644 --- a/init.lua +++ b/init.lua @@ -19,19 +19,40 @@ vim.opt.scrolloff = 8 vim.api.nvim_set_option("clipboard", "unnamedplus") do - local navigation_move_to_panel_left = '' - local navigation_move_to_panel_down = '' - local navigation_move_to_panel_up = '' - local navigation_move_to_panel_right = '' + local move_left = '' + local move_down = '' + local move_up = '' + local move_right = '' + + vim.api.nvim_set_keymap('n', move_left, 'wincmd h', {silent = true}) + vim.api.nvim_set_keymap('n', move_down, 'wincmd j', {silent = true}) + vim.api.nvim_set_keymap('n', move_up, 'wincmd k', {silent = true}) + vim.api.nvim_set_keymap('n', move_right, 'wincmd l', {silent = true}) + + vim.api.nvim_set_keymap('t', move_left, 'wincmd h', {silent = true}) + vim.api.nvim_set_keymap('t', move_down, 'wincmd j', {silent = true}) + vim.api.nvim_set_keymap('t', move_up, 'wincmd k', {silent = true}) + vim.api.nvim_set_keymap('t', move_right, 'wincmd l', {silent = true}) +end + +do -- building, errors and folder navigation + ---comment + ---@param key string + ---@param command string + local function map(key, command) + local prefix = '' + vim.api.nvim_set_keymap('n', prefix .. key, ''..command..'', {silent = true}) + end + + map('co', 'copen') + map('cc', 'cclose') + map('cf', 'cfirst') + map('cl', 'clast') + map('cn', 'cnext') + map('cp', 'cprevious') + map('cd', 'cd %:p:h') + map('m', 'make') - vim.api.nvim_set_keymap('n', navigation_move_to_panel_left, 'wincmd h', {silent = true}) - vim.api.nvim_set_keymap('n', navigation_move_to_panel_down, 'wincmd j', {silent = true}) - vim.api.nvim_set_keymap('n', navigation_move_to_panel_up, 'wincmd k', {silent = true}) - vim.api.nvim_set_keymap('n', navigation_move_to_panel_right, 'wincmd l', {silent = true}) - vim.api.nvim_set_keymap('t', navigation_move_to_panel_left, 'wincmd h', {silent = true}) - vim.api.nvim_set_keymap('t', navigation_move_to_panel_down, 'wincmd j', {silent = true}) - vim.api.nvim_set_keymap('t', navigation_move_to_panel_up, 'wincmd k', {silent = true}) - vim.api.nvim_set_keymap('t', navigation_move_to_panel_right, 'wincmd l', {silent = true}) end vim.api.nvim_set_keymap('t', '', '', {silent = true}) @@ -327,6 +348,11 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) +--=> This package requires additional configuration for use in editors. Install package +-- 'user-setup', or manually: +-- * for Vim, add this line to ~/.vimrc: +-- set rtp^="/home/ivarfatland/.opam/default/share/ocp-indent/vim" + require('lazy').setup( { { 'neovim/nvim-lspconfig', @@ -420,10 +446,6 @@ require('lazy').setup( require('snippy').setup({ enable_auto = true, mappings = { - -- is = { - -- [''] = 'expand_or_advance', - -- [''] = 'previous', - -- }, nx = { ['x'] = 'cut_text', }, @@ -520,11 +542,12 @@ require('lazy').setup( map('t', cswrapper(builtin.lsp_type_definitions, omnisharp_extended.telescope_lsp_type_definitions)) map('i', cswrapper(builtin.lsp_implementations, omnisharp_extended.telescope_lsp_implementations)) - --map('r', omnisharp_extended.lsp_references) - --map('d', omnisharp_extended.lsp_definitions) - --map('t', omnisharp_extended.lsp_type_definitions) - --map('i', omnisharp_extended.lsp_impelentations) + -- map('r', builtin.lsp_references) + -- map('d', builtin.lsp_definitions) + -- map('t', builtin.lsp_type_definitions) + -- map('i', builtin.lsp_implementations) + map('s', builtin.lsp_document_symbols) map('e', builtin.diagnostics) end,