samsapti
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rewrite Neovim config in Lua

This commit is contained in:
Sam A. 2023-05-11 02:17:36 +02:00
parent 9e10f1956d
commit 01c2ad0ef5
Signed by: samsapti
GPG Key ID: CBBBE7371E81C4EA
3 changed files with 252 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install.sh
View File

@ -27,9 +27,9 @@ for pkg in "$@"; do
echo " -> Stowing $pkg"
# Symlink only the individual files instead of the entire directory
[ "$pkg" = "zsh" ] && ZSH=1 && mkdir -p "$HOME/.config/$pkg"
[ "$pkg" = "nvim" ] && NVIM=1 && mkdir -p "$HOME/.config/$pkg"
[ "$pkg" = "scripts" ] && DASH=1 && mkdir -p "$HOME/.local/bin"
[ "$pkg" = "nvim" ] && NVIM=1
[ "$pkg" = "zsh" ] && ZSH=1 && mkdir -p "$HOME/.config/$pkg"
LC_ALL="C" stow -t "$HOME" --ignore="README.md" "$pkg"
done

250
nvim/.config/nvim/init.lua Normal file
View File

@ -0,0 +1,250 @@
-- plugins
require('packer').startup(function(use)
use 'wbthomason/packer.nvim'
use 'ii14/onedark.nvim'
use {
'mengelbrecht/lightline-bufferline',
requires = {
'itchyny/lightline.vim'
}
}
use 'kyazdani42/nvim-web-devicons'
use 'sheerun/vim-polyglot'
use 'editorconfig/editorconfig-vim'
use {
'williamboman/mason-lspconfig.nvim',
requires = {
{
'williamboman/mason.nvim',
run = ':MasonUpdate'
},
'neovim/nvim-lspconfig'
}
}
use {
'hrsh7th/nvim-cmp',
requires = {
'hrsh7th/cmp-nvim-lsp',
'saadparwaiz1/cmp_luasnip',
'L3MON4D3/LuaSnip'
}
}
end)
-- basics
vim.opt.number = true
vim.opt.showmode = true
vim.opt.showtabline = 2
vim.opt.tabstop = 4
vim.opt.shiftwidth = 4
vim.opt.softtabstop = 0
vim.opt.expandtab = true
vim.opt.termguicolors = true
vim.opt.completeopt = { 'menu', 'menuone', 'noselect', 'noinsert' }
vim.cmd.syntax('on')
vim.cmd.colorscheme('onedark')
-- settings for specific filetypes
vim.api.nvim_create_autocmd('FileType', {
pattern = { 'html', 'css', 'scss', 'json', 'yaml', 'yaml.*' },
callback = function()
vim.opt_local.tabstop = 2
vim.opt_local.shiftwidth = 2
end
})
vim.api.nvim_create_autocmd({ 'BufNewFile', 'BufRead' }, {
pattern = { 'zsh*', '.zsh*', '*.zsh' },
callback = function()
vim.opt.filetype = 'sh'
end
})
-- appearance
vim.cmd.highlight({ 'Normal', 'guibg=NONE', 'ctermbg=NONE' })
vim.g.background = 'dark'
-- lightline config
vim.g.lightline = {
colorscheme = 'one',
tabline = {
left = { { 'buffers' } },
right = { { 'close' } }
},
component_expand = {
buffers = 'lightline#bufferline#buffers'
},
component_type = {
buffers = 'tabsel'
}
}
-- lightline-bufferline config
vim.g['lightline#bufferline#show_number'] = 2
vim.g['lightline#bufferline#shorten_path'] = 0
vim.g['lightline#bufferline#smart_path'] = 1
vim.g['lightline#bufferline#enable_devicons'] = 1
vim.g['lightline#bufferline#unnamed'] = '[No Name]'
vim.g['lightline#bufferline#icon_position'] = 'right'
-- autocompletion config
local cmp = require('cmp')
local luasnip = require('luasnip')
luasnip.config.setup {}
cmp.setup {
snippet = {
expand = function(args)
luasnip.lsp_expand(args.body)
end
},
mapping = {
['<C-d>'] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4),
['<C-Space>'] = cmp.mapping.complete(),
['<C-e>'] = cmp.mapping.abort(),
['<CR>'] = cmp.mapping.confirm {
behavior = cmp.ConfirmBehavior.Replace,
select = true,
},
['<Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif luasnip.expand_or_jumpable() then
luasnip.expand_or_jump()
else
fallback()
end
end, { 'i', 's' }),
['<S-Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif luasnip.jumpable(-1) then
luasnip.jump(-1)
else
fallback()
end
end, { 'i', 's' }),
},
sources = {
{ name = 'nvim_lsp' },
{ name = 'luasnip' },
},
}
cmp.setup.cmdline('/', {
sources = {
{ name = 'buffer' }
}
})
cmp.setup.cmdline(':', {
sources = cmp.config.sources({
{ name = 'path' }
},
{
{ name = 'cmdline' }
})
})
-- lsp config
require('mason').setup {}
require('mason-lspconfig').setup {
automatic_installation = true
}
local lsp = require('lspconfig')
local capabilities = require('cmp_nvim_lsp').default_capabilities()
lsp.ansiblels.setup {
capabilities = capabilities
}
lsp.bashls.setup {
capabilities = capabilities
}
lsp.clangd.setup {
capabilities = capabilities
}
lsp.dockerls.setup {
capabilities = capabilities
}
lsp.gopls.setup {
capabilities = capabilities
}
lsp.lua_ls.setup {
capabilities = capabilities,
settings = {
Lua = {
runtime = {
version = 'LuaJIT'
},
diagnostics = {
globals = { 'vim' }
},
workspace = {
library = vim.api.nvim_get_runtime_file('', true),
checkThirdParty = false
},
telemetry = {
enable = false
}
}
}
}
lsp.pylsp.setup {
capabilities = capabilities
}
lsp.vimls.setup {
capabilities = capabilities,
init_options = {
diagnostic = {
enable = false
},
isNeovim = true
}
}
lsp.yamlls.setup {
capabilities = capabilities,
settings = {
redhat = {
telemetry = {
enabled = false
}
},
yaml = {
keyOrdering = false
}
}
}
-- keyboard mappings
vim.g.mapleader = ';'
-- buffer navigation
vim.keymap.set('n', '<Leader>1', '<Plug>lightline#bufferline#go(1)')
vim.keymap.set('n', '<Leader>2', '<Plug>lightline#bufferline#go(2)')
vim.keymap.set('n', '<Leader>3', '<Plug>lightline#bufferline#go(3)')
vim.keymap.set('n', '<Leader>4', '<Plug>lightline#bufferline#go(4)')
vim.keymap.set('n', '<Leader>5', '<Plug>lightline#bufferline#go(5)')
vim.keymap.set('n', '<Leader>6', '<Plug>lightline#bufferline#go(6)')
vim.keymap.set('n', '<Leader>7', '<Plug>lightline#bufferline#go(7)')
vim.keymap.set('n', '<Leader>8', '<Plug>lightline#bufferline#go(8)')
vim.keymap.set('n', '<Leader>9', '<Plug>lightline#bufferline#go(9)')
vim.keymap.set('n', '<Leader>0', '<Plug>lightline#bufferline#go(10)')
-- buffer deletion
vim.keymap.set('n', '<Leader>d1', '<Plug>lightline#bufferline#delete(1)')
vim.keymap.set('n', '<Leader>d2', '<Plug>lightline#bufferline#delete(2)')
vim.keymap.set('n', '<Leader>d3', '<Plug>lightline#bufferline#delete(3)')
vim.keymap.set('n', '<Leader>d4', '<Plug>lightline#bufferline#delete(4)')
vim.keymap.set('n', '<Leader>d5', '<Plug>lightline#bufferline#delete(5)')
vim.keymap.set('n', '<Leader>d6', '<Plug>lightline#bufferline#delete(6)')
vim.keymap.set('n', '<Leader>d7', '<Plug>lightline#bufferline#delete(7)')
vim.keymap.set('n', '<Leader>d8', '<Plug>lightline#bufferline#delete(8)')
vim.keymap.set('n', '<Leader>d9', '<Plug>lightline#bufferline#delete(9)')
vim.keymap.set('n', '<Leader>d0', '<Plug>lightline#bufferline#delete(10)')
-- Navigating splits
vim.keymap.set('n', '<C-J>', '<C-W><C-J>')
vim.keymap.set('n', '<C-K>', '<C-W><C-K>')
vim.keymap.set('n', '<C-L>', '<C-W><C-L>')
vim.keymap.set('n', '<C-H>', '<C-W><C-H>')

218
nvim/.config/nvim/init.vim
View File

@ -1,218 +0,0 @@
"
" ~/.config/nvim/init.vim
"
""" PLUGINS
call plug#begin(stdpath('data') . '/plugged')
Plug 'ii14/onedark.nvim'
Plug 'itchyny/lightline.vim'
Plug 'mengelbrecht/lightline-bufferline'
Plug 'kyazdani42/nvim-web-devicons'
Plug 'sheerun/vim-polyglot'
Plug 'neovim/nvim-lspconfig'
Plug 'williamboman/nvim-lsp-installer'
Plug 'hrsh7th/cmp-nvim-lsp'
Plug 'hrsh7th/cmp-buffer'
Plug 'hrsh7th/cmp-path'
Plug 'hrsh7th/cmp-cmdline'
Plug 'hrsh7th/nvim-cmp'
Plug 'hrsh7th/cmp-vsnip'
Plug 'hrsh7th/vim-vsnip'
Plug 'editorconfig/editorconfig-vim'
call plug#end()
""" LSP SETTINGS
lua << EOF
local lsp_installer = require("nvim-lsp-installer")
-- Register a handler that will be called for all installed servers.
-- Alternatively, you may also register handlers on specific server instances instead (see example below).
lsp_installer.on_server_ready(function(server)
local opts = {}
-- (optional) Customize the options passed to the server
-- if server.name == "tsserver" then
-- opts.root_dir = function() ... end
-- end
-- This setup() function is exactly the same as lspconfig's setup function.
-- Refer to https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
server:setup(opts)
end)
-- Setup nvim-cmp.
local has_words_before = function()
local line, col = unpack(vim.api.nvim_win_get_cursor(0))
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
end
local feedkey = function(key, mode)
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true)
end
local cmp = require'cmp'
cmp.setup({
snippet = {
-- REQUIRED - you must specify a snippet engine
expand = function(args)
vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
-- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
-- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
-- require'snippy'.expand_snippet(args.body) -- For `snippy` users.
end,
},
mapping = {
['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
['<C-e>'] = cmp.mapping({
i = cmp.mapping.abort(),
c = cmp.mapping.close(),
}),
['<CR>'] = cmp.mapping.confirm({ select = true }),
['<Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif vim.fn["vsnip#available"](1) == 1 then
feedkey("<Plug>(vsnip-expand-or-jump)", "")
elseif has_words_before() then
cmp.complete()
else
fallback() -- The fallback function sends a already mapped key. In this case, it's probably `<Tab>`.
end
end, { "i", "s" }),
['<S-Tab>'] = cmp.mapping(function()
if cmp.visible() then
cmp.select_prev_item()
elseif vim.fn["vsnip#jumpable"](-1) == 1 then
feedkey("<Plug>(vsnip-jump-prev)", "")
end
end, { "i", "s" }),
},
sources = cmp.config.sources({
{ name = 'nvim_lsp' },
{ name = 'vsnip' }, -- For vsnip users.
-- { name = 'luasnip' }, -- For luasnip users.
-- { name = 'ultisnips' }, -- For ultisnips users.
-- { name = 'snippy' }, -- For snippy users.
}, {
{ name = 'buffer' },
})
})
-- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
cmp.setup.cmdline('/', {
sources = {
{ name = 'buffer' }
}
})
-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
cmp.setup.cmdline(':', {
sources = cmp.config.sources({
{ name = 'path' }
}, {
{ name = 'cmdline' }
})
})
EOF
""" BASIC SETTINGS
set number
set noshowmode
set showtabline=2
set tabstop=4
set shiftwidth=4
set softtabstop=0
set expandtab
syntax on
colorscheme onedark
" Settings for specific filetypes
autocmd FileType html setlocal tabstop=2 shiftwidth=2
autocmd FileType css setlocal tabstop=2 shiftwidth=2
autocmd FileType scss setlocal tabstop=2 shiftwidth=2
autocmd FileType svelte setlocal tabstop=2 shiftwidth=2
autocmd FileType vue setlocal tabstop=2 shiftwidth=2
autocmd FileType json setlocal tabstop=2 shiftwidth=2
autocmd FileType yaml* setlocal tabstop=2 shiftwidth=2
autocmd BufNewFile,BufRead zsh*,.zsh*,*.zsh set filetype=sh
""" APPEARANCE
"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux.
"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support
"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.)
if (has("nvim"))
"For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
let $NVIM_TUI_ENABLE_TRUE_COLOR=1
endif
"For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
"Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
" < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
if (has("termguicolors"))
set termguicolors
endif
" Set dark, transparent background, should default to dark, but it's there just in case
hi Normal guibg=NONE ctermbg=NONE
let background = 'dark'
" lightline config
let g:lightline = {}
let g:lightline.colorscheme = 'one'
let g:lightline.tabline = { 'left': [ [ 'buffers' ] ], 'right': [ [ 'close' ] ] }
let g:lightline.component_expand = { 'buffers': 'lightline#bufferline#buffers' }
let g:lightline.component_type = { 'buffers': 'tabsel' }
" lightline-bufferline config
let g:lightline#bufferline#show_number = 2
let g:lightline#bufferline#shorten_path = 0
let g:lightline#bufferline#smart_path = 1
let g:lightline#bufferline#enable_devicons = 1
let g:lightline#bufferline#unnamed = '[No Name]'
let g:lightline#bufferline#icon_position = 'right'
""" KEYBOARD MAPPINGS
" Leader key
let mapleader=';'
" Navigating buffers
nmap <Leader>1 <Plug>lightline#bufferline#go(1)
nmap <Leader>2 <Plug>lightline#bufferline#go(2)
nmap <Leader>3 <Plug>lightline#bufferline#go(3)
nmap <Leader>4 <Plug>lightline#bufferline#go(4)
nmap <Leader>5 <Plug>lightline#bufferline#go(5)
nmap <Leader>6 <Plug>lightline#bufferline#go(6)
nmap <Leader>7 <Plug>lightline#bufferline#go(7)
nmap <Leader>8 <Plug>lightline#bufferline#go(8)
nmap <Leader>9 <Plug>lightline#bufferline#go(9)
nmap <Leader>0 <Plug>lightline#bufferline#go(10)
" Deleting buffers
nmap <Leader>d1 <Plug>lightline#bufferline#delete(1)
nmap <Leader>d2 <Plug>lightline#bufferline#delete(2)
nmap <Leader>d3 <Plug>lightline#bufferline#delete(3)
nmap <Leader>d4 <Plug>lightline#bufferline#delete(4)
nmap <Leader>d5 <Plug>lightline#bufferline#delete(5)
nmap <Leader>d6 <Plug>lightline#bufferline#delete(6)
nmap <Leader>d7 <Plug>lightline#bufferline#delete(7)
nmap <Leader>d8 <Plug>lightline#bufferline#delete(8)
nmap <Leader>d9 <Plug>lightline#bufferline#delete(9)
nmap <Leader>d0 <Plug>lightline#bufferline#delete(10)
" Navigating splits
nnoremap <C-J> <C-W><C-J>
nnoremap <C-K> <C-W><C-K>
nnoremap <C-L> <C-W><C-L>
nnoremap <C-H> <C-W><C-H>