oli/nvim
1
1
Fork 0
Code Issues Pull Requests 1 Releases 1 Wiki Activity

Added completion and some key mappings

Browse Source
This commit is contained in:
Oliver Hartmann 2021-09-09 00:13:06 +02:00
parent f4fe34a7aa
commit 1d0a458c8f
4 changed files with 222 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
init.lua
View File

@ -13,8 +13,12 @@ if fn.empty(fn.glob(install_path)) > 0 then
vim.cmd 'packadd packer.nvim'
end
vim.cmd [[packadd packer.nvim]]
vim.cmd 'autocmd BufWritePost plugins.lua PackerCompile' -- Auto compile when there are changes in plugins.lua
vim.cmd([[
augroup packer_user_config
autocmd!
autocmd BufWritePost plugins.lua source <afile> | PackerCompile
augroup end
]])
local utils = require('utils')
-- Install plugins
require('plugins')
@ -23,10 +27,10 @@ require('keymappings')
cmd 'colorscheme gruvbox-material' -- Put your favorite colorscheme here
cmd 'syntax enable'
cmd 'filetype plugin indent on'
--opt.noswapfile = true
-- opt.nobackup = true
opt.spelllang = 'en,de'
local indent = 4
utils.opt('o', 'swapfile', false)
utils.opt('o', 'backup', false)
utils.opt('o', 'spelllang', 'en,de')
local indent = 2
utils.opt('b', 'expandtab', true)
utils.opt('b', 'shiftwidth', indent)
utils.opt('b', 'smartindent', true)
@ -62,7 +66,15 @@ local ts = require 'nvim-treesitter.configs'
ts.setup {ensure_installed = 'maintained', highlight = {enable = true}}
-------------------- FZF -----------------------------------
utils.map('n', '<C-P>', ':FZF<CR>')
--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('n', '<C-S-p>', '<cmd>Telescope commands<cr>')
utils.map('n', '<leader>fb', '<cmd>Telescope buffers<cr>')
-------------------- LSP -----------------------------------
local lsp = require 'lspconfig'
@ -82,6 +94,84 @@ 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>')
-------------------- GITSIGNS ------------------------------
require('gitsigns').setup()
-- require('gitsigns').setup()
-------------------- LIGHTBULB -----------------------------
require('nvim-lightbulb').update_lightbulb()
-------------------- CMP -----------------------------------
require('cmp_plug')
-- local cmp = require'cmp'
-- cmp.setup({
-- snippet = {
-- expand = function(args)
-- vim.fn["vsnip#anonymous"](args.body)
-- end,
-- },
-- mapping = {
-- ['<C-y>'] = cmp.mapping.confirm({ select = true }),
-- },
-- sources = {
-- { name = '...' },
-- ...
-- }
-- })
-- local cmp = require 'cmp'
-- local types = require('cmp.types')
-- cmp.setup {
-- completion = {
-- autocomplete = {
-- types.cmp.TriggerEvent.TextChanged,
-- },
-- completeopt = 'menu,menuone,noselect',
-- keyword_pattern = [[\%(-\?\d\+\%(\.\d\+\)\?\|\h\w*\%(-\w*\)*\)]],
-- keyword_length = 1,
-- get_trigger_characters = function(trigger_characters)
-- return trigger_characters
-- end
-- },
-- snippet = {
-- expand = function(args)
-- require('luasnip').lsp_expand(args.body)
-- end,
-- },
-- mapping = {
-- ['<C-p>'] = cmp.mapping.select_prev_item(),
-- ['<C-n>'] = cmp.mapping.select_next_item(),
-- ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-- ['<C-f>'] = cmp.mapping.scroll_docs(4),
-- ['<C-Space>'] = cmp.mapping.complete(),
-- ['<C-e>'] = cmp.mapping.close(),
-- ['<CR>'] = cmp.mapping.confirm {
-- behavior = cmp.ConfirmBehavior.Replace,
-- select = true,
-- },
-- ['<Tab>'] = function(fallback)
-- if vim.fn.pumvisible() == 1 then
-- vim.fn.feedkeys(vim.api.nvim_replace_termcodes('<C-n>', true, true, true), 'n')
-- elseif luasnip.expand_or_jumpable() then
-- vim.fn.feedkeys(vim.api.nvim_replace_termcodes('<Plug>luasnip-expand-or-jump', true, true, true), '')
-- else
-- fallback()
-- end
-- end,
-- ['<S-Tab>'] = function(fallback)
-- if vim.fn.pumvisible() == 1 then
-- vim.fn.feedkeys(vim.api.nvim_replace_termcodes('<C-p>', true, true, true), 'n')
-- elseif luasnip.jumpable(-1) then
-- vim.fn.feedkeys(vim.api.nvim_replace_termcodes('<Plug>luasnip-jump-prev', true, true, true), '')
-- else
-- fallback()
-- end
-- end,
-- },
-- sources = {
-- { name = 'nvim_lsp' },
-- { name = 'luasnip' },
-- },
-- }
-------------------- NVIM-TREE -----------------------------
g.nvim_tree_auto_open = 1
-------------------- NVIM-COMMENT --------------------------
require('nvim_comment').setup()
require('nvim_comment').setup({line_mapping = '<C-#>', operator_mapping = '<C-#>'})
utils.map('n', '<A-#>', 'gcc')
utils.map('v', '<A-#>', 'gc')

93
lua/cmp_plug.lua Normal file
View File

@ -0,0 +1,93 @@
local cmp = require('cmp')
local t = function(str)
return vim.api.nvim_replace_termcodes(str, true, true, true)
end
local check_back_space = function()
local col = vim.fn.col(".") - 1
return col == 0 or vim.fn.getline("."):sub(col, col):match("%s") ~= nil
end
cmp.setup {
formatting = {
format = function(entry, vim_item)
-- fancy icons and a name of kind
vim_item.kind = require("lspkind").presets.default[vim_item.kind] ..
" " .. vim_item.kind
-- set a name for each source
vim_item.menu = ({
buffer = "[Buffer]",
nvim_lsp = "[LSP]",
ultisnips = "[UltiSnips]",
nvim_lua = "[Lua]",
cmp_tabnine = "[TabNine]",
look = "[Look]",
path = "[Path]",
spell = "[Spell]",
calc = "[Calc]",
emoji = "[Emoji]"
})[entry.source.name]
return vim_item
end
},
mapping = {
['<C-p>'] = cmp.mapping.select_prev_item(),
['<C-n>'] = cmp.mapping.select_next_item(),
['<C-d>'] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4),
['<C-Space>'] = cmp.mapping.complete(),
['<C-e>'] = cmp.mapping.close(),
['<CR>'] = cmp.mapping.confirm({
behavior = cmp.ConfirmBehavior.Insert,
select = true
}),
["<Tab>"] = cmp.mapping(function(fallback)
if vim.fn.pumvisible() == 1 then
if vim.fn["UltiSnips#CanExpandSnippet"]() == 1 or
vim.fn["UltiSnips#CanJumpForwards"]() == 1 then
return vim.fn.feedkeys(t(
"<C-R>=UltiSnips#ExpandSnippetOrJump()<CR>"))
end
vim.fn.feedkeys(t("<C-n>"), "n")
elseif check_back_space() then
vim.fn.feedkeys(t("<tab>"), "n")
else
fallback()
end
end, {"i", "s"}),
["<S-Tab>"] = cmp.mapping(function(fallback)
if vim.fn.pumvisible() == 1 then
vim.fn.feedkeys(t("<C-p>"), "n")
else
fallback()
end
end, {"i", "s"})
},
snippet = {expand = function(args) vim.fn["UltiSnips#Anon"](args.body) end},
sources = {
{name = 'buffer'}, {name = 'nvim_lsp'}, {name = "ultisnips"},
{name = "nvim_lua"}, {name = "look"}, {name = "path"},
{name = 'cmp_tabnine'}, {name = "calc"}, {name = "spell"},
{name = "emoji"}
},
completion = {completeopt = 'menu,menuone,noinsert'}
}
-- Autopairs
--require("nvim-autopairs.completion.cmp").setup({
-- map_cr = true,
-- map_complete = true,
-- auto_select = true
--})
-- TabNine
--local tabnine = require('cmp_tabnine.config')
--tabnine:setup({max_lines = 1000, max_num_results = 20, sort = true})
-- Database completion
vim.api.nvim_exec([[
autocmd FileType sql,mysql,plsql lua require('cmp').setup.buffer({ sources = {{ name = 'vim-dadbod-completion' }} })
]], false)

18
lua/keymappings.lua
View File

@ -11,6 +11,20 @@ utils.map('v', '<leader>y', '"+y')
utils.map('n', '<leader>Y', '"+yg_')
utils.map('n', '<leader>y', '"+y')
utils.map('n', '<leader>yy', '"+yy')
-- Tabs and Split
utils.map('n', 'F2', ':tabnew .<CR>')
-- Tabs
utils.map('n', '<F2>', ':tabnew .<CR>')
utils.map('i', '<F2>', '<Esc>:tabnew .<CR>')
utils.map('n', '<S-Right>', 'gt')
utils.map('n', '<S-Left>', 'gT')
-- Split movement
utils.map('n', '<A-Up>', ':wincmd k<CR>')
utils.map('n', '<A-Down>', ':wincmd j<CR>')
utils.map('n', '<A-Left>', ':wincmd h<CR>')
utils.map('n', '<A-Right>', ':wincmd l<CR>')
-- Open a new vertical split window with Ctrl - F2
utils.map('n', '<C-F2>', '<Esc>:vsplit .<CR>')
utils.map('i', '<C-F2>', '<Esc>:vsplit .<CR>')
-- Open a new horizontal split window with Shift - F2
utils.map('n', '<S-F2>', '<Esc>:split .<CR>')
utils.map('i', '<S-F2>', '<Esc>:split .<CR>')

15
lua/plugins.lua
View File

@ -13,4 +13,19 @@ return require('packer').startup(function()
use {'nvim-lua/plenary.nvim'}
use {'lewis6991/gitsigns.nvim'}
use {'kosayoda/nvim-lightbulb'}
use {
'kyazdani42/nvim-tree.lua',
requires = 'kyazdani42/nvim-web-devicons'
}
use {'terrortylor/nvim-comment'}
use {
'hrsh7th/nvim-cmp',
requires = {
'hrsh7th/cmp-buffer', 'hrsh7th/cmp-nvim-lsp',
'quangnguyen30192/cmp-nvim-ultisnips', 'hrsh7th/cmp-nvim-lua',
'octaltree/cmp-look', 'hrsh7th/cmp-path', 'hrsh7th/cmp-calc',
'f3fora/cmp-spell', 'hrsh7th/cmp-emoji'
}
}
use {'onsails/lspkind-nvim'}
end)