Compare commits
3 commits
aa98e13e44
...
4c4efe9191
Author | SHA1 | Date | |
---|---|---|---|
4c4efe9191 | |||
0d2ac08fc7 | |||
6715c05519 |
5 changed files with 10 additions and 3 deletions
|
@ -1,7 +1,7 @@
|
||||||
|
require 'pluginmanager'
|
||||||
require 'autocmd'
|
require 'autocmd'
|
||||||
require 'keybinds'
|
require 'keybinds'
|
||||||
require 'settings'
|
require 'settings'
|
||||||
require 'pluginmanager'
|
|
||||||
|
|
||||||
-- Plugin configurations
|
-- Plugin configurations
|
||||||
require 'pluginconf.airline'
|
require 'pluginconf.airline'
|
||||||
|
|
|
@ -2,3 +2,6 @@ local cmd = vim.cmd
|
||||||
|
|
||||||
-- Remap exit terminal mode to esc
|
-- Remap exit terminal mode to esc
|
||||||
cmd('au TermOpen * tnoremap <buffer> <Esc> <c-\\><c-n>')
|
cmd('au TermOpen * tnoremap <buffer> <Esc> <c-\\><c-n>')
|
||||||
|
|
||||||
|
-- Fix YAML indentation
|
||||||
|
cmd('au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab')
|
||||||
|
|
|
@ -12,8 +12,11 @@ map('n', '<C-f>', '<cmd>Files<CR>')
|
||||||
map('n', '<C-g>', '<cmd>Rg<CR>')
|
map('n', '<C-g>', '<cmd>Rg<CR>')
|
||||||
|
|
||||||
-- Completion
|
-- Completion
|
||||||
|
-- Navigate completions with tab and shift tab
|
||||||
map('i', '<S-Tab>', 'pumvisible() ? "\\<C-p>" : "\\<Tab>"', {expr = true})
|
map('i', '<S-Tab>', 'pumvisible() ? "\\<C-p>" : "\\<Tab>"', {expr = true})
|
||||||
map('i', '<Tab>', 'pumvisible() ? "\\<C-n>" : "\\<Tab>"', {expr = true})
|
map('i', '<Tab>', 'pumvisible() ? "\\<C-n>" : "\\<Tab>"', {expr = true})
|
||||||
|
-- Trigger completion
|
||||||
|
map('i', '<C-SPACE>', '<Plug>(completion_trigger)', {silent = true, expr = true})
|
||||||
|
|
||||||
-- Navigate between buffers
|
-- Navigate between buffers
|
||||||
map('n', '<C-N>', ':bn<CR>', {silent = true})
|
map('n', '<C-N>', ':bn<CR>', {silent = true})
|
||||||
|
|
|
@ -4,10 +4,9 @@ require'lspconfig'.rust_analyzer.setup {
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Lua
|
-- Lua
|
||||||
local sumneko_binary = '/usr/bin/lua-language-server'
|
|
||||||
require'lspconfig'.sumneko_lua.setup {
|
require'lspconfig'.sumneko_lua.setup {
|
||||||
on_attach = require'completion'.on_attach,
|
on_attach = require'completion'.on_attach,
|
||||||
cmd = {sumneko_binary},
|
cmd = {'/usr/bin/lua-language-server'},
|
||||||
settings = {
|
settings = {
|
||||||
Lua = {
|
Lua = {
|
||||||
runtime = {
|
runtime = {
|
||||||
|
|
|
@ -13,6 +13,7 @@ end
|
||||||
|
|
||||||
-- Configure packer
|
-- Configure packer
|
||||||
cmd 'packadd packer.nvim'
|
cmd 'packadd packer.nvim'
|
||||||
|
local use = require('packer').use
|
||||||
require('packer').startup(function()
|
require('packer').startup(function()
|
||||||
|
|
||||||
-- The plugin manager itself
|
-- The plugin manager itself
|
||||||
|
@ -45,6 +46,7 @@ require('packer').startup(function()
|
||||||
|
|
||||||
-- Formatter plugin
|
-- Formatter plugin
|
||||||
use 'sbdchd/neoformat'
|
use 'sbdchd/neoformat'
|
||||||
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
-- Install plugins if packer was not installed
|
-- Install plugins if packer was not installed
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue