diff --git a/nvim/init.vim b/nvim/init.vim index c75c181..5ca797d 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -1,16 +1,21 @@ +" Basic settings set shiftwidth=8 set tabstop=8 set number set signcolumn=yes:1 colorscheme slate +" Change diagnostic keys let mapleader = "," nnoremap n :lua vim.diagnostic.goto_next() nnoremap p :lua vim.diagnostic.goto_prev() nnoremap e :lua vim.diagnostic.open_float() inoremap +" Vim plug call plug#begin() + +" LSP stuff Plug 'neovim/nvim-lspconfig' Plug 'hrsh7th/cmp-nvim-lsp' Plug 'hrsh7th/cmp-buffer' @@ -18,6 +23,7 @@ Plug 'hrsh7th/cmp-path' Plug 'hrsh7th/cmp-cmdline' Plug 'hrsh7th/nvim-cmp' +" Snippets engine Plug 'SirVer/ultisnips' Plug 'quangnguyen30192/cmp-nvim-ultisnips' @@ -28,6 +34,7 @@ let g:UltiSnipsJumpBackwardTrigger = '' let g:UltiSnipsEditSplit="vertical" let g:UltiSnipsSnippetDirectories=["/home/furtest/files/scripts/config_files/nvim/ultisnips"] +" Vimtex for live compilation Plug 'lervag/vimtex' let g:tex_flavor='latex' @@ -39,10 +46,12 @@ let g:vimtex_quickfix_mode=0 set conceallevel=1 let g:tex_conceal='abdmg' +" Preview markdown (TODO check interference with vimwiki) Plug 'iamcco/markdown-preview.nvim' Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} +" Vimwiki for the notes Plug 'vimwiki/vimwiki' let g:vimwiki_list = [ {'path': '~/files/notes', 'syntax': 'markdown', 'ext': 'md'}, {'path': '~/files/autre/cles_facile', 'syntax': 'markdown', 'ext': 'md'} ] @@ -53,8 +62,6 @@ set foldlevelstart=1 Plug 'folke/snacks.nvim' -Plug 'rebelot/heirline.nvim' - " Debuging stuff Plug 'mfussenegger/nvim-dap' Plug 'rcarriga/nvim-dap-ui' @@ -63,6 +70,7 @@ Plug 'theHamsta/nvim-dap-virtual-text' call plug#end() +" Include the other config files lua require('nvim-cmp') lua require('config') diff --git a/nvim/lua/config.lua b/nvim/lua/config.lua index 9fd70f2..2e8deca 100644 --- a/nvim/lua/config.lua +++ b/nvim/lua/config.lua @@ -1,3 +1,6 @@ +-- Usefull from other plugins +require("snacks").setup() + vim.diagnostic.config({ virtual_text = false, signs = true, @@ -25,6 +28,7 @@ require'nvim-treesitter'.setup { }, } +-- Use an indent of 4 for these files vim.api.nvim_create_autocmd("FileType", { pattern = { "tex", "scilab", "html", "js", "javascript" }, callback = function() @@ -34,17 +38,7 @@ vim.api.nvim_create_autocmd("FileType", { end }) --- require('lualine').setup() - -require("snacks").setup() - --- require("noice").setup() - --- require("heirline") - - - --- nvim-dap config +-- nvim-dap config (python lsp) local dap = require('dap') dap.adapters.python = {