diff --git a/config/nvim/.config/nvim/init.lua b/config/nvim/.config/nvim/init.lua index 3a4f9ca..674afcf 100644 --- a/config/nvim/.config/nvim/init.lua +++ b/config/nvim/.config/nvim/init.lua @@ -9,6 +9,5 @@ require('keymaps') -- package manager (packer.nvim) require('plugins') - +-- plugin configurations require('plugin-config') - diff --git a/config/nvim/.config/nvim/lua/plugin-config/lsp.lua b/config/nvim/.config/nvim/lua/plugin-config/lsp.lua index 0ed9953..a90e646 100644 --- a/config/nvim/.config/nvim/lua/plugin-config/lsp.lua +++ b/config/nvim/.config/nvim/lua/plugin-config/lsp.lua @@ -13,21 +13,16 @@ local on_attach = function(_, bufnr) vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc }) end - nmap('rn', vim.lsp.buf.rename, '[R]e[n]ame') nmap('ca', vim.lsp.buf.code_action, '[C]ode [A]ction') nmap('D', vim.lsp.buf.type_definition, 'Type [D]efinition') nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition') nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') - nmap('gI', vim.lsp.buf.implementation, '[G]oto [I]mplementation') - - -- nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') - -- nmap('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') - -- nmap('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') - + nmap('gi', vim.lsp.buf.implementation, '[G]oto [I]mplementation') nmap('K', vim.lsp.buf.hover, 'Hover Documentation') nmap('', vim.lsp.buf.signature_help, 'Signature Documentation') nmap('wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder') nmap('wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder') + nmap('rn', vim.lsp.buf.rename, '[R]e[n]ame') nmap('wl', function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end, '[W]orkspace [L]ist Folders') diff --git a/config/nvim/.config/nvim/lua/settings.lua b/config/nvim/.config/nvim/lua/settings.lua index fe3f76d..c0904c2 100644 --- a/config/nvim/.config/nvim/lua/settings.lua +++ b/config/nvim/.config/nvim/lua/settings.lua @@ -2,10 +2,6 @@ -- general settings -- --- vim cmds -vim.cmd('syntax enable') -vim.cmd('filetype plugin indent on') - -- encoding/format vim.opt.encoding = 'utf-8' vim.opt.fileformats = 'unix,dos,mac' @@ -50,3 +46,7 @@ vim.opt.termguicolors = true vim.opt.number = true vim.opt.wrap = true vim.opt.listchars = {eol = '↲', tab = '▸ ', trail = '·'} + +-- vim cmds +vim.cmd('syntax enable') +vim.cmd('filetype plugin indent on')