diff --git a/init.lua b/init.lua index b3d5a8d..3bb23b7 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', @@ -356,7 +382,7 @@ require('lazy').setup( lspconfig.pyright.setup{} lspconfig.csharp_ls.setup{} -- install with: "dotnet tool install --global csharp-ls" lspconfig.gdscript.setup{} - lspconfig.clangd.setup{} + --lspconfig.clangd.setup{} vim.keymap.set("n", "ca", vim.lsp.buf.code_action, { desc = "Perform code action" }) vim.keymap.set("n", "rn", vim.lsp.buf.rename, { desc = "Rename token under cursor" }) @@ -367,10 +393,6 @@ require('lazy').setup( require('snippy').setup({ enable_auto = true, mappings = { - -- is = { - -- [''] = 'expand_or_advance', - -- [''] = 'previous', - -- }, nx = { ['x'] = 'cut_text', }, @@ -448,6 +470,7 @@ require('lazy').setup( map('d', builtin.lsp_definitions) map('i', builtin.lsp_implementations) map('t', builtin.lsp_type_definitions) + map('s', builtin.lsp_document_symbols) map('e', builtin.diagnostics) end,