tidy slightly

master
george 3 months ago
parent b942e70822
commit 2bfaa76ec5

@ -22,17 +22,17 @@ set scrolloff=8
set hidden set hidden
set signcolumn=yes set signcolumn=yes
set colorcolumn=110 set colorcolumn=110
set list set list
autocmd BufWritePost *.tex !echo | pdflatex % >/dev/null autocmd BufWritePost *.tex !echo | pdflatex % >/dev/null
call plug#begin("~/.nvim/plugged") call plug#begin("~/.nvim/plugged")
Plug 'rust-lang/rust.vim' Plug 'rust-lang/rust.vim'
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
Plug 'neovim/nvim-lspconfig' Plug 'neovim/nvim-lspconfig'
Plug 'mbbill/undotree' Plug 'mbbill/undotree'
Plug 'sbdchd/neoformat' Plug 'sbdchd/neoformat'
Plug 'gruvbox-community/gruvbox'
Plug 'folke/tokyonight.nvim', { 'branch': 'main' } Plug 'folke/tokyonight.nvim', { 'branch': 'main' }
Plug 'nvim-lua/plenary.nvim' Plug 'nvim-lua/plenary.nvim'
Plug 'nvim-telescope/telescope.nvim' Plug 'nvim-telescope/telescope.nvim'
@ -42,21 +42,17 @@ Plug 'darrikonn/vim-gofmt', { 'do': ':GoUpdateBinaries' }
"Plug 'fatih/vim-go' "Plug 'fatih/vim-go'
Plug 'preservim/nerdtree' Plug 'preservim/nerdtree'
Plug 'udalov/kotlin-vim' Plug 'udalov/kotlin-vim'
Plug 'hrsh7th/cmp-nvim-lsp' Plug 'hrsh7th/cmp-nvim-lsp'
Plug 'hrsh7th/cmp-buffer' Plug 'hrsh7th/cmp-buffer'
Plug 'hrsh7th/nvim-cmp' Plug 'hrsh7th/nvim-cmp'
Plug 'L3MON4D3/LuaSnip' Plug 'L3MON4D3/LuaSnip'
Plug 'EdenEast/nightfox.nvim' Plug 'EdenEast/nightfox.nvim'
Plug 'itchyny/lightline.vim' Plug 'itchyny/lightline.vim'
"EEEEEEEEEEEEEEEEEEEEEEEEEEEee
Plug 'ThePrimeagen/vim-be-good'
Plug 'tpope/vim-fugitive' Plug 'tpope/vim-fugitive'
Plug 'simrat39/rust-tools.nvim' Plug 'simrat39/rust-tools.nvim'
call plug#end() call plug#end()
"colorscheme gruvbox
colorscheme tokyonight colorscheme tokyonight
let mapleader = " " let mapleader = " "
@ -65,15 +61,10 @@ nnoremap <C-p> :lua require ('telescope.builtin').git_files()<CR>
nnoremap <C-f> :lua require ('telescope.builtin').find_files()<CR> nnoremap <C-f> :lua require ('telescope.builtin').find_files()<CR>
nnoremap <leader>f :lua require('telescope.builtin').live_grep()<CR> nnoremap <leader>f :lua require('telescope.builtin').live_grep()<CR>
nnoremap <leader><tab> :lua require('telescope.builtin').buffers()<CR> nnoremap <leader><tab> :lua require('telescope.builtin').buffers()<CR>
"nnoremap <leader><tab> :b<space>
nnoremap <leader>y "+y nnoremap <leader>y "+y
lua require("init")
nnoremap gd :lua vim.lsp.buf.definition()<CR> nnoremap gd :lua vim.lsp.buf.definition()<CR>
nnoremap K :lua vim.lsp.buf.hover()<CR> nnoremap K :lua vim.lsp.buf.hover()<CR>
nnoremap L :lua vim.diagnostic.open_float()<CR> nnoremap L :lua vim.diagnostic.open_float()<CR>
"autocmd BufWritePost *.go GoImports
nnoremap <C-n> :NERDTreeToggle<CR> nnoremap <C-n> :NERDTreeToggle<CR>
lua require("init")

@ -34,9 +34,10 @@ local cmp = require("cmp")
local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities()) local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
require("lspconfig").tsserver.setup({}) require("lspconfig").ts_ls.setup({})
require("lspconfig").clangd.setup({}) require("lspconfig").clangd.setup({})
require("lspconfig").gopls.setup({ require("lspconfig").gopls.setup({
cmd = { "gopls", "serve" }, cmd = { "gopls", "serve" },
settings = { settings = {
@ -57,7 +58,6 @@ require("lspconfig").rust_analyzer.setup({
['rust-analyzer'] = { ['rust-analyzer'] = {
checkOnSave = { checkOnSave = {
allFeatures = true, allFeatures = true,
overrideCommand = { overrideCommand = {
'cargo', 'clippy', '--workspace', '--message-format=json', 'cargo', 'clippy', '--workspace', '--message-format=json',
'--all-targets', '--all-features' '--all-targets', '--all-features'
@ -67,7 +67,6 @@ require("lspconfig").rust_analyzer.setup({
} }
}) })
require('lspconfig').kotlin_language_server.setup({ require('lspconfig').kotlin_language_server.setup({
cmd = { "kotlin-language-server" }, cmd = { "kotlin-language-server" },
filetypes = { "kotlin"} , filetypes = { "kotlin"} ,
@ -92,9 +91,13 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
vim.lsp.diagnostic.on_publish_diagnostics, { vim.lsp.diagnostic.on_publish_diagnostics, {
update_in_insert = true, update_in_insert = true,
} }
) )
require'lspconfig'.cmake.setup{}
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true
--require'lspconfig'.basedpyright.setup{} require'lspconfig'.html.setup {
require'lspconfig'.cmake.setup{} capabilities = capabilities,
}

Loading…
Cancel
Save