Compare commits

..

No commits in common. "e6e0b7d9f86aabfe28bbe2ddd79667a6fabd709a" and "653e869e1c013cbdc7a7913bac100340a8c24cfa" have entirely different histories.

6 changed files with 15 additions and 22 deletions

View File

@ -65,5 +65,3 @@ colorscheme zenburn
" Avoid showing message extra message when using completion " Avoid showing message extra message when using completion
set shortmess+=c set shortmess+=c
let g:indentLine_setConceal = 0

View File

@ -5,7 +5,6 @@ source $HOME/.config/nvim/general/mappings.vim
source $HOME/.config/nvim/plugins/lightline.vim source $HOME/.config/nvim/plugins/lightline.vim
source $HOME/.config/nvim/plugins/nvim-comp.vim source $HOME/.config/nvim/plugins/nvim-comp.vim
source $HOME/.config/nvim/plugins/vimtex.vim
lua <<EOF lua <<EOF
require("lsp") require("lsp")

View File

@ -27,10 +27,10 @@ require'compe'.setup {
calc = false; calc = false;
vsnip = true; vsnip = true;
nvim_lsp = true; nvim_lsp = true;
nvim_lua = false; nvim_lua = true;
spell = true; spell = true;
tags = true; tags = true;
snippets_nvim = false; snippets_nvim = true;
treesitter = true; treesitter = true;
}; };
} }

View File

@ -19,28 +19,28 @@ local on_attach = function(client, bufnr)
-- show documentation -- show documentation
buf_set_keymap('n', 'K', '<Cmd>lua vim.lsp.buf.hover()<CR>', opts) buf_set_keymap('n', 'K', '<Cmd>lua vim.lsp.buf.hover()<CR>', opts)
-- Rename -- Rename
buf_set_keymap('n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts) buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-- je sais pas ce c'est que ces workspaces -- je sais pas ce c'est que ces workspaces
buf_set_keymap('n', '<leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts) buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
buf_set_keymap('n', '<leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts) buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
buf_set_keymap('n', '<leader>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts) buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
-- ?? -- ??
buf_set_keymap('n', '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts) buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
-- Details on diagnostics -- Details on diagnostics
buf_set_keymap('n', '<leader>d', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts) buf_set_keymap('n', '<space>d', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
-- Cycle over diagnostics -- Cycle over diagnostics
buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts) buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts) buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
-- Get diagnostic on local list -- Get diagnostic on local list
buf_set_keymap('n', '<leader>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts) buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
buf_set_keymap("n", "<leader>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts) buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
buf_set_keymap('n', 'gD', '<Cmd>lua vim.lsp.buf.declaration()<CR>', opts) buf_set_keymap('n', 'gD', '<Cmd>lua vim.lsp.buf.declaration()<CR>', opts)
buf_set_keymap('n', 'gd', '<Cmd>lua vim.lsp.buf.definition()<CR>', opts) buf_set_keymap('n', 'gd', '<Cmd>lua vim.lsp.buf.definition()<CR>', opts)
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts) buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts) buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
buf_set_keymap('n', '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts) buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
end end
-- Use a loop to conveniently call 'setup' on multiple servers and -- Use a loop to conveniently call 'setup' on multiple servers and

View File

@ -35,12 +35,7 @@ call plug#begin('~/.config/nvim/autoload/plugged')
Plug 'nvim-lua/plenary.nvim' Plug 'nvim-lua/plenary.nvim'
Plug 'nvim-telescope/telescope.nvim' Plug 'nvim-telescope/telescope.nvim'
Plug 'lervag/vimtex' "Plug 'lervag/vimtex'
" Highlight on Yank
Plug 'machakann/vim-highlightedyank'
" Autoclose parenthesis
Plug 'cohama/lexima.vim'
" Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} " Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}

View File

@ -1,6 +1,6 @@
session_name: enseignement session_name: enseignement
start_directory: ~/Cours/Current/Contenus/ start_directory: ~/Cours/2020-2021/Contenus/
shell_command_before: source config.sh shell_command_before: source config.fish
windows: windows:
- window_name: Editor - window_name: Editor
@ -14,5 +14,6 @@ windows:
- blank - blank
- vifm . . - vifm . .
- window_name: Notes - window_name: Notes
focus: true
panes: panes:
- cd ../Notes - cd ../Notes