diff --git a/nvim/init.vim b/nvim/init.vim index b564f90..c9dbb6b 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -1,6 +1,5 @@ set shiftwidth=8 set tabstop=8 -"set expandtab=false set number set signcolumn=yes:1 colorscheme slate @@ -10,10 +9,7 @@ nnoremap n :lua vim.diagnostic.goto_next() nnoremap p :lua vim.diagnostic.goto_prev() nnoremap e :lua vim.diagnostic.open_float() -" vim-plug config call plug#begin() -" Plug 'williamboman/mason.nvim' -" Plug 'williamboman/mason-lspconfig.nvim' Plug 'neovim/nvim-lspconfig' Plug 'hrsh7th/cmp-nvim-lsp' Plug 'hrsh7th/cmp-buffer' @@ -56,8 +52,5 @@ set foldlevelstart=1 call plug#end() -" Source nvim-cmp config lua require('nvim-cmp') -" lua require("mason").setup() -" lua require("mason-lspconfig").setup() lua require('config') diff --git a/nvim/lua/config.lua b/nvim/lua/config.lua index 251ffa0..1a33579 100644 --- a/nvim/lua/config.lua +++ b/nvim/lua/config.lua @@ -23,16 +23,6 @@ require'nvim-treesitter.configs'.setup { }, } - ---vim.api.nvim_create_autocmd("BufEnter", { --- pattern = "*", --- callback = function() --- vim.bo.tabstop = 8 --- vim.bo.shiftwidth = 8 --- vim.bo.expandtab = false --- end ---}) - vim.api.nvim_create_autocmd("FileType", { pattern = { "tex", "scilab" }, callback = function() diff --git a/nvim/lua/nvim-cmp.lua b/nvim/lua/nvim-cmp.lua index ba6039e..8fe818a 100644 --- a/nvim/lua/nvim-cmp.lua +++ b/nvim/lua/nvim-cmp.lua @@ -1,4 +1,3 @@ - -- Set up nvim-cmp. local cmp = require'cmp' cmp.setup({ @@ -26,7 +25,6 @@ cmp.setup({ }) --- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore). cmp.setup.cmdline({ '/', '?' }, { mapping = cmp.mapping.preset.cmdline(), sources = { @@ -34,7 +32,6 @@ cmp.setup.cmdline({ '/', '?' }, { } }) --- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). cmp.setup.cmdline(':', { mapping = cmp.mapping.preset.cmdline(), sources = cmp.config.sources({