diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/colorscheme.lua | 3 | ||||
| -rw-r--r-- | lua/config.lua | 7 | ||||
| -rw-r--r-- | lua/lsp/js-ts-ls.lua | 3 | ||||
| -rw-r--r-- | lua/nv-utils/init.lua | 1 |
4 files changed, 12 insertions, 2 deletions
diff --git a/lua/colorscheme.lua b/lua/colorscheme.lua index 143c0492..52db4d50 100644 --- a/lua/colorscheme.lua +++ b/lua/colorscheme.lua @@ -1,2 +1,3 @@ -vim.cmd('colorscheme nvcode') vim.cmd('let g:nvcode_termcolors=256') + +vim.cmd('colorscheme '..COLORSCHEME) diff --git a/lua/config.lua b/lua/config.lua index 43c48995..0fe195c2 100644 --- a/lua/config.lua +++ b/lua/config.lua @@ -2,13 +2,20 @@ AUTO_COMPLETE=true -- make list of languages AUTO_FORMAT=true +COLORSCHEME='nvcode' + -- ideas --[[ +nv.lint.python='flake8' nv.format.python='black' nv.format.python='yapf' nv.format.python='autopep8' +nv.format.tsserver='prettier' +nv.format.tsserver='eslint' ]] + + diff --git a/lua/lsp/js-ts-ls.lua b/lua/lsp/js-ts-ls.lua index b6e74825..c10039bd 100644 --- a/lua/lsp/js-ts-ls.lua +++ b/lua/lsp/js-ts-ls.lua @@ -7,10 +7,13 @@ -- require'completion'.on_attach(client) -- require'illuminate'.on_attach(client) -- end + require'lspconfig'.tsserver.setup { cmd = {DATA_PATH .. "/lspinstall/typescript/node_modules/.bin/typescript-language-server", "--stdio"}, + filetypes = { "javascript", "javascriptreact", "javascript.jsx", "typescript", "typescriptreact", "typescript.tsx" }, on_attach = require'lsp'.tsserver_on_attach, -- This makes sure tsserver is not used for formatting (I prefer prettier) -- on_attach = require'lsp'.common_on_attach, + root_dir = require('lspconfig/util').root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git"), settings = {documentFormatting = false} } diff --git a/lua/nv-utils/init.lua b/lua/nv-utils/init.lua index fd11f643..237eafc6 100644 --- a/lua/nv-utils/init.lua +++ b/lua/nv-utils/init.lua @@ -30,7 +30,6 @@ nv_utils.define_augroups({ {'BufNewFile', '*', 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o'}, {'FileType', 'java', 'luafile ~/.config/nvim/lua/lsp/java-ls.lua'}, {'FileType', 'java', 'nnoremap ca <Cmd>lua require(\'jdtls\').code_action()<CR>'}, - {'FileType', 'java', 'nnoremap ca <Cmd>lua require(\'jdtls\').code_action()<CR>'}, {'FileType', 'markdown', 'setlocal wrap'}, {'FileType', 'markdown', 'setlocal spell'}, {'BufWinEnter', '.sol', 'setlocal filetype=solidity'}, |