From 12527d71ea8b0921b910afa6bcd5fc6adf9649eb Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 2 Aug 2022 05:07:11 -0400 Subject: start using lua :) --- .config/nvim/init.lua | 23 +++++++++++ .config/nvim/init.vim | 60 --------------------------- .config/nvim/init.vim.bak | 60 +++++++++++++++++++++++++++ .config/nvim/lua/getchoo/lsp.lua | 80 ++++++++++++++++++++++++++++++++++++ .config/nvim/lua/getchoo/plugins.lua | 55 +++++++++++++++++++++++++ 5 files changed, 218 insertions(+), 60 deletions(-) create mode 100644 .config/nvim/init.lua delete mode 100644 .config/nvim/init.vim create mode 100644 .config/nvim/init.vim.bak create mode 100644 .config/nvim/lua/getchoo/lsp.lua create mode 100644 .config/nvim/lua/getchoo/plugins.lua (limited to '.config/nvim') diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua new file mode 100644 index 0000000..78cac9a --- /dev/null +++ b/.config/nvim/init.lua @@ -0,0 +1,23 @@ +-- +-- getchoo's neovim config (but in lua :p) +-- + +local fn = vim.fn +local cmd = vim.cmd +local opt = vim.opt + +require('getchoo.plugins') +require('getchoo.lsp') + +-- options +opt.tabstop = 2 +opt.shiftwidth = 2 +opt.expandtab = true +opt.smartindent = true +opt.wrap = false +opt.termguicolors = true + +-- apperance +cmd[[syntax on]] +cmd[[filetype plugin indent on]] +cmd[[colorscheme nord]] diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim deleted file mode 100644 index ed3883e..0000000 --- a/.config/nvim/init.vim +++ /dev/null @@ -1,60 +0,0 @@ -" -" getchoo's neovim config -" - -set nocompatible - -set runtimepath+=/home/seth/.local/share/dein/repos/github.com/Shougo/dein.vim -call dein#begin('~/.local/share/dein') - -call dein#add('~/.local/share/dein/repos/github.com/Shougo/dein.vim') -call dein#add('wsdjeg/dein-ui.vim') -call dein#add('itchyny/lightline.vim') -call dein#add('joshdick/onedark.vim') -call dein#add('arcticicestudio/nord-vim') -call dein#add('rose-pine/neovim', {'name': 'rose-pine'}) -call dein#add('neoclide/coc.nvim', { 'merged': 0, 'rev': 'release' }) - -call dein#end() - -" coc settings -"" use for trigger completion and navigate to the next complete item -function! s:check_back_space() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~ '\s' -endfunction - -"" for lightline.vim -function! CocCurrentFunction() - return get(b:, 'coc_current_function', '') -endfunction - -inoremap - \ pumvisible() ? "\" : - \ check_back_space() ? "\" : - \ coc#refresh() - -inoremap pumvisible() ? "\" : "\" - -" options -set tabstop=2 -set shiftwidth=2 -set expandtab -set smartindent - -" apperance -syntax on -filetype plugin indent on -set termguicolors -colorscheme nord -let g:lightline = { - \ 'colorscheme': 'nord', - \ 'active': { - \ 'left': [ [ 'mode', 'paste' ], - \ [ 'cocstatus', 'currentfunction', 'readonly', 'filename', 'modified' ] ] - \ }, - \ 'component_function': { - \ 'cocstatus': 'coc#status', - \ 'currentfunction': 'CocCurrentFunction' - \ }, - \ } diff --git a/.config/nvim/init.vim.bak b/.config/nvim/init.vim.bak new file mode 100644 index 0000000..ed3883e --- /dev/null +++ b/.config/nvim/init.vim.bak @@ -0,0 +1,60 @@ +" +" getchoo's neovim config +" + +set nocompatible + +set runtimepath+=/home/seth/.local/share/dein/repos/github.com/Shougo/dein.vim +call dein#begin('~/.local/share/dein') + +call dein#add('~/.local/share/dein/repos/github.com/Shougo/dein.vim') +call dein#add('wsdjeg/dein-ui.vim') +call dein#add('itchyny/lightline.vim') +call dein#add('joshdick/onedark.vim') +call dein#add('arcticicestudio/nord-vim') +call dein#add('rose-pine/neovim', {'name': 'rose-pine'}) +call dein#add('neoclide/coc.nvim', { 'merged': 0, 'rev': 'release' }) + +call dein#end() + +" coc settings +"" use for trigger completion and navigate to the next complete item +function! s:check_back_space() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~ '\s' +endfunction + +"" for lightline.vim +function! CocCurrentFunction() + return get(b:, 'coc_current_function', '') +endfunction + +inoremap + \ pumvisible() ? "\" : + \ check_back_space() ? "\" : + \ coc#refresh() + +inoremap pumvisible() ? "\" : "\" + +" options +set tabstop=2 +set shiftwidth=2 +set expandtab +set smartindent + +" apperance +syntax on +filetype plugin indent on +set termguicolors +colorscheme nord +let g:lightline = { + \ 'colorscheme': 'nord', + \ 'active': { + \ 'left': [ [ 'mode', 'paste' ], + \ [ 'cocstatus', 'currentfunction', 'readonly', 'filename', 'modified' ] ] + \ }, + \ 'component_function': { + \ 'cocstatus': 'coc#status', + \ 'currentfunction': 'CocCurrentFunction' + \ }, + \ } diff --git a/.config/nvim/lua/getchoo/lsp.lua b/.config/nvim/lua/getchoo/lsp.lua new file mode 100644 index 0000000..7bd16ce --- /dev/null +++ b/.config/nvim/lua/getchoo/lsp.lua @@ -0,0 +1,80 @@ +-- +-- lsp settings using nvim-lspconfig & coq-nvim +-- + +local fn = vim.fn +local cmd = vim.cmd +local opt = vim.opt + + +vim.g.coq_settings = { auto_start = 'shut-up' } + +--- Mappings. +--- See `:help vim.diagnostic.*` for documentation on any of the below functions +local opts = { noremap=true, silent=true } +vim.keymap.set('n', 'e', vim.diagnostic.open_float, opts) +vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) +vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) +vim.keymap.set('n', 'q', vim.diagnostic.setloclist, opts) + +--- Use an on_attach function to only map the following keys +--- after the language server attaches to the current buffer +local on_attach = function(client, bufnr) + ---- Enable completion triggered by + vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + ---- Mappings. + ---- See `:help vim.lsp.*` for documentation on any of the below functions + local bufopts = { noremap=true, silent=true, buffer=bufnr } + vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) + vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) + vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) + vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) + vim.keymap.set('n', 'wl', function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, bufopts) + vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) + vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) + vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) + vim.keymap.set('n', 'f', vim.lsp.buf.formatting, bufopts) +end + +local servers = { 'rust_analyzer', 'pyright', 'bashls' } +for _, lsp in ipairs(servers) do + require('lspconfig')[lsp].setup(require('coq').lsp_ensure_capabilities({ + on_attach = on_attatch, + flags = lsp_flags + })) +end + +require('lspconfig')['sumneko_lua'].setup(require('coq').lsp_ensure_capabilities({ + on_attatch = on_attatch, + flags = lsp_flags, + settings = { + Lua = { + runtime = { + version = 'LuaJIT', + }, + diagnostics = { + globals = {'vim'}, + }, + workspace = { + library = vim.api.nvim_get_runtime_file("", true), + } + }, + }, +})) + +require('lint').linters_by_ft = { + python = {'flake8',} +} + +vim.api.nvim_create_autocmd({ "BufWritePost" }, { + callback = function() + require('lint').try_lint() + end, +}) diff --git a/.config/nvim/lua/getchoo/plugins.lua b/.config/nvim/lua/getchoo/plugins.lua new file mode 100644 index 0000000..756a983 --- /dev/null +++ b/.config/nvim/lua/getchoo/plugins.lua @@ -0,0 +1,55 @@ +-- +-- plugins for neovim +-- + +local fn = vim.fn +local cmd = vim.cmd +local opt = vim.opt + + +local packer_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim' + +if fn.empty(fn.glob(packer_path)) > 0 then + packer_bootstrap = fn.system({ + 'git', + 'clone', + '--depth', '1', + 'https://github.com/wbthomason/packer.nvim', + packer_path + }) + cmd [[packadd packer.nvim]] +end + +require('packer').startup(function(use) + use 'wbthomason/packer.nvim' + use { + 'nvim-treesitter/nvim-treesitter', + run = function() require('nvim-treesitter.install').update({ with_sync = true }) end, + } + use 'neovim/nvim-lspconfig' + use { 'ms-jpq/coq_nvim', run = 'python3 -m coq deps' } + use 'ms-jpq/coq.artifacts' + use 'ms-jpq/coq.thirdparty' + use 'mfussenegger/nvim-lint' + use { + 'nvim-lualine/lualine.nvim', + requires = { 'kyazdani42/nvim-web-devicons', opt = true } + } + use 'arcticicestudio/nord-vim' + use {'rose-pine/neovim', as = 'rose-pine'} + + if packer_bootstrap then + require('packer').sync() + end +end) + +require('nvim-treesitter.configs').setup { + auto_install = true +} + +require('lualine').setup { + options = { + theme = 'nord' + }, + extensions = {'nvim-tree'} +} -- cgit v1.2.3