holm/LunarVim.LunarVim
1
0
Fork 0
mirror of https://github.com/LunarVim/LunarVim.git synced 2025-08-02 00:56:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

update for config

Browse source
This commit is contained in:
Chris 2021-03-27 03:01:24 -04:00
parent 127ff7231a
commit 4450d30d3e
5 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
init.lua
View file

@ -2,6 +2,7 @@
require('plugins') require('plugins')
require('nv-utils') require('nv-utils')
require('nv-globals') require('nv-globals')
require('config')
require('settings') require('settings')
require('keymappings') require('keymappings')
require('colorscheme') require('colorscheme')
@ -58,6 +59,5 @@ require('lsp.efm-general-ls')
require('lsp.virtual_text') require('lsp.virtual_text')
-- Source config last -- Source config last
require('config')
-- vim.lsp.callbacks["textDocument/publishDiagnostics"] = function() end -- vim.lsp.callbacks["textDocument/publishDiagnostics"] = function() end
-- vim.lsp.handlers["textDocument/publishDiagnostics"] = nil -- vim.lsp.handlers["textDocument/publishDiagnostics"] = nil

1
lua/config.lua
View file

@ -14,4 +14,5 @@ O.colorscheme = 'nvcode'
O.python.formatter = 'yapf' O.python.formatter = 'yapf'
O.python.linter = nil O.python.linter = nil
O.python.autoformat = false O.python.autoformat = false
O.python.virtual_text = false

12
lua/lsp/python-ls.lua
View file

@ -1,8 +1,12 @@
-- npm i -g pyright -- npm i -g pyright
-- local capabilities = vim.lsp.protocol.make_client_capabilities()
-- capabilities.textDocument.completion.completionItem.snippetSupport = true
require'lspconfig'.pyright.setup { require'lspconfig'.pyright.setup {
cmd = {DATA_PATH .. "/lspinstall/python/node_modules/.bin/pyright-langserver", "--stdio"}, cmd = {DATA_PATH .. "/lspinstall/python/node_modules/.bin/pyright-langserver", "--stdio"},
on_attach = require'lsp'.common_on_attach on_attach = require'lsp'.common_on_attach,
-- capabilities = capabilities handlers = {
["textDocument/publishDiagnostics"] = vim.lsp.with(
vim.lsp.diagnostic.on_publish_diagnostics, {
virtual_text = O.python.virtual_text
}
),
}
} }

14
lua/nv-globals.lua
View file

@ -2,13 +2,13 @@ O = {
auto_complete = true, auto_complete = true,
colorscheme = 'nvcode', colorscheme = 'nvcode',
python = {linter = nil, formatter = nil, autoformat = false}, python = {linter = '', formatter = '', autoformat = false, virtual_text=true},
javascript = {linter = nil, formatter = nil, autoformat = false}, javascript = {linter = '', formatter = '', autoformat = false, virtual_text=true},
javascriptreact = {linter = nil, formatter = nil, autoformat = false}, javascriptreact = {linter = '', formatter = '', autoformat = false, virtual_text=true},
lua = {formatter = nil, autoformat = false}, lua = {formatter = '', autoformat = false, virtual_text=true},
bash = {linter = nil, formatter = nil, autoformat = false}, bash = {linter = '', formatter = '', autoformat = false, virtual_text=true},
css = {formatter = nil, autoformat = false}, css = {formatter = '', autoformat = false, virtual_text=true},
json = {formatter = nil, autoformat = false}, json = {formatter = '', autoformat = false, virtual_text=true},
} }

1
vimscript/nv-whichkey/init.vim
View file

@ -21,6 +21,7 @@ autocmd! FileType which_key
autocmd FileType which_key set laststatus=0 noshowmode noruler autocmd FileType which_key set laststatus=0 noshowmode noruler
\| autocmd BufLeave <buffer> set laststatus=2 noshowmode ruler \| autocmd BufLeave <buffer> set laststatus=2 noshowmode ruler
let g:which_key_map['/'] = 'comment toggle'
let g:which_key_map[';'] = [ ':Dashboard' , 'home screen' ] let g:which_key_map[';'] = [ ':Dashboard' , 'home screen' ]
let g:which_key_map[','] = [ '<Plug>(emmet-expand-abbr)' , 'expand tags' ] let g:which_key_map[','] = [ '<Plug>(emmet-expand-abbr)' , 'expand tags' ]
let g:which_key_map['"'] = [ '<Plug>PeekupOpen' , 'registers' ] let g:which_key_map['"'] = [ '<Plug>PeekupOpen' , 'registers' ]