Compare commits

..

No commits in common. "828205efcec62b84e7ceeaba5b2c31c0e326a733" and "d54ba8d8c68faa432ddde1822ac840297652ba99" have entirely different histories.

3 changed files with 259 additions and 331 deletions

View File

@ -25,17 +25,14 @@ Here is a list of all external depencies you'll need:
- universal ctags, ctags won't work (note that arch's universal ctags package is named ctags...), for tagbar
- tree-sitter, for syntax coloration
- rust-analyzer and clangd as LSP servers
- rust-analyzer, as LSP server
On arch, you can just use the following command :
```
pacman -Syu ctags tree-sitter rust-analyzer clangd
pacman -Syu ctags tree-sitter rust-analyzer
```
Once the dependencies are installed, type `:checkhealth` to verify that everything is properly detected. You should, at most, see a warning about node and another about the clipboard.
For clangd to work properly, create a compile_flags.txt file at the root of the project and fill it
with the flags used for compilation (one per line). Cpu-specific flags may cause the analysis to
fail and should be ignored (e.g. mcpu, mthumb, ...)
### Syntax coloration

View File

@ -1,7 +1,4 @@
vim.o.textwidth = 80
vim.o.tabstop = 2
vim.o.shiftwidth = 2
vim.o.expandtab = true
-- remove white spaces at end of line

View File

@ -6,336 +6,270 @@ local has_words_before = function()
end
local feedkey = function(key, mode)
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true),
mode, true)
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true)
end
-- LSP keybindings
local lsp_on_attach = function(_, bufnr)
local nmap = function(keys, func, desc)
if desc then
desc = 'LSP: ' .. desc
end
-- plugins definition
local function manage_plugins()
vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
end
local plugins = {
["https://github.com/faerryn/plogins.nvim.git"] = {},
["https://github.com/tpope/vim-sensible.git"] = {},
["https://github.com/kevinhwang91/rnvimr.git"] = {
packadd_hook = function()
vim.api.nvim_set_keymap('n', '<leader>f', ":RnvimrToggle<cr>", {})
vim.g.rnvimr_action = {
['<C-t>'] = "NvimEdit tabedit",
['<C-x>'] = "NvimEdit split",
['<C-w>'] = "NvimEdit vsplit",
}
end
},
["https://github.com/ojroques/nvim-hardline.git"] = {
packadd_hook = function()
require('hardline').setup()
end
},
["https://github.com/EdenEast/nightfox.nvim.git"] = {
packadd_hook = function()
require('nightfox').setup({
options = {
modules = {
gitgutter = true,
}
},
palettes = {
nightfox = {
bg0 = '#121212',
bg1 = '#161616',
bg2 = '#222222',
bg3 = '#282828',
bg4 = '#404040',
sel0 = "#2a2a2a",
sel1 = "#525253",
}
},
specs = {
nightfox = {
syntax = {
func = "red",
}
}
},
})
-- Define standard LSP shortcuts
nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
-- these actions are now handled by Telescope
-- nmap('gd', vim.lsp.buf.definition, '[G]oto [d]efinition')
-- nmap('gr', vim.lsp.buf.references, '[G]oto [R]eferences')
-- nmap('gc', vim.lsp.buf.outgoing_calls, '[G]oto Outgoing [C]alls')
-- nmap('gt', vim.lsp.buf.type_definition, '[G]oto [T]ype definition')
-- See `:help K` for why this keymap
nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
vim.o.termguicolors = true
vim.cmd("colorscheme nightfox")
end
},
-- Create a command `:Format` local to the LSP buffer
vim.api.nvim_buf_create_user_command(bufnr, 'Format',
vim.lsp.buf.format or vim.lsp.buf.formatting,
{ desc = 'Format current buffer with LSP' })
-- Auto-completion
["https://github.com/hrsh7th/cmp-nvim-lsp.git"] = {},
["https://github.com/hrsh7th/cmp-buffer.git"] = {},
["https://github.com/hrsh7th/cmp-path.git"] = {},
["https://github.com/hrsh7th/cmp-cmdline.git"] = {},
["https://github.com/hrsh7th/cmp-vsnip.git"] = {},
["https://github.com/hrsh7th/vim-vsnip.git"] = {},
["https://github.com/hrsh7th/nvim-cmp.git"] = {
packadd_after = {
["https://github.com/hrsh7th/cmp-nvim-lsp.git"] = true,
["https://github.com/hrsh7th/cmp-buffer.git"] = true,
["https://github.com/hrsh7th/cmp-path.git"] = true,
["https://github.com/hrsh7th/cmp-cmdline.git"] = true,
["https://github.com/hrsh7th/cmp-vsnip.git"] = true,
["https://github.com/hrsh7th/vim-vsnip.git"] = true,
},
packadd_hook = function()
vim.o.completeopt = "menu,menuone,noselect"
local cmp = require("cmp")
cmp.setup({
snippet = {
-- snippet engine is required
expand = function(args)
vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
end,
},
window = {
-- completion = cmp.config.window.bordered(),
-- documentation = cmp.config.window.bordered(),
},
mapping = cmp.mapping.preset.insert({
--['<C-b>'] = cmp.mapping.scroll_docs(-4),
--['<C-f>'] = cmp.mapping.scroll_docs(4),
--['<C-Space>'] = cmp.mapping.complete(),
['<C-e>'] = cmp.mapping.abort(),
['<CR>'] = cmp.mapping.confirm({ select = true }),
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif vim.fn["vsnip#available"](1) == 1 then
feedkey("<Plug>(vsnip-expand-or-jump)", "")
elseif has_words_before() then
cmp.complete()
else
-- The fallback function sends a already mapped key.
-- In this case, it's probably `<Tab>`.
fallback()
end
end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function()
if cmp.visible() then
cmp.select_prev_item()
elseif vim.fn["vsnip#jumpable"](-1) == 1 then
feedkey("<Plug>(vsnip-jump-prev)", "")
end
end, { "i", "s" }),
}),
sources = cmp.config.sources({
{ name = 'nvim_lsp' },
{ name = 'vsnip' },
}, {
{ name = 'buffer' },
})
})
-- Set configuration for specific filetype.
cmp.setup.filetype('gitcommit', {
sources = cmp.config.sources({
{ name = 'cmp_git' },
}, {
{ name = 'buffer' },
})
})
-- Use buffer source for `/` and `?`
cmp.setup.cmdline({ '/', '?' }, {
mapping = cmp.mapping.preset.cmdline(),
sources = {
{ name = 'buffer' }
}
})
-- Use cmdline & path source for ':'
cmp.setup.cmdline(':', {
mapping = cmp.mapping.preset.cmdline(),
sources = cmp.config.sources({
{ name = 'path' }
}, {
{ name = 'cmdline' }
})
})
end
},
-- LSP configuration
["https://github.com/neovim/nvim-lspconfig.git"] = {},
["https://github.com/simrat39/rust-tools.nvim.git"] = {
packadd_after = {
["https://github.com/neovim/nvim-lspconfig.git"] = true,
["https://github.com/hrsh7th/nvim-cmp.git"] = true,
},
packadd_hook = function()
local rt = require("rust-tools")
local capabilities = require("cmp_nvim_lsp").default_capabilities()
rt.setup({
server = {
capabilities = capabilities,
on_attach = function(_, bufnr)
-- Hover actions
vim.keymap.set("n", "<C-space>",
rt.hover_actions.hover_actions, { buffer = bufnr })
---- Code action groups
vim.keymap.set("n", "<Leader>a",
rt.code_action_group.code_action_group, { buffer = bufnr })
end,
},
})
end
},
-- LSP alternative
["https://github.com/preservim/tagbar.git" ] = {
packadd_hook = function()
vim.api.nvim_set_keymap('n', '<leader>t', ":TagbarToggle<cr>", {})
end
},
-- Git integration
["https://github.com/tpope/vim-fugitive.git"] = {},
["https://github.com/airblade/vim-gitgutter.git"] = {
packadd_after = { ["https://github.com/EdenEast/nightfox.nvim.git"] = true },
packadd_hook = function()
-- put sign in number column to avoid screen-shifting
vim.cmd('set signcolumn=number')
end
},
["https://github.com/nvim-lua/plenary.nvim.git"] = {},
["https://github.com/sindrets/diffview.nvim.git"] = {
packadd_after = { ["https://github.com/nvim-lua/plenary.nvim.git"] = true },
packadd_hook = function()
vim.api.nvim_set_keymap('n', '<leader>g', ":DiffviewOpen", {})
end
},
-- Syntax highlight
["https://github.com/nvim-treesitter/nvim-treesitter.git"] = {
packadd_hook = function()
local conf = require("nvim-treesitter.configs")
conf.setup {
-- only enable tested parsers
ensure_installed = { "c", "cpp", "lua", "rust" },
-- Install parsers synchronously (only applied to `ensure_installed`)
sync_install = false,
-- Automatically install missing parsers when entering buffer
auto_install = false,
-- List of parsers to ignore installing (for "all")
ignore_install = {},
highlight = {
-- `false` will disable the whole extension
enable = true,
-- list of language that will be disabled
disable = {},
-- disable slow treesitter highlight for large files
disable = function(lang, buf)
local max_filesize = 100 * 1024 -- 100 KB
local ok, stats =
pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
if ok and stats and stats.size > max_filesize then
return true
end
end,
-- run `:h syntax` and tree-sitter at the same time.
additional_vim_regex_highlighting = false,
}
}
end
},
}
local manager = require("plogins").manage(plugins)
vim.api.nvim_create_user_command("PloginsUpgrade",
manager.upgrade, {})
vim.api.nvim_create_user_command("PloginsAutoremove",
manager.autoremove, {})
end
plugins = {
{ "tpope/vim-sensible", lazy = false },
{
"EdenEast/nightfox.nvim",
lazy = false,
dependencies = {
{ "airblade/vim-gitgutter" },
},
init = function()
require('nightfox').setup({
options = {
modules = { gitgutter = true }
},
palettes = {
nightfox = {
bg0 = '#121212',
bg1 = '#161616',
bg2 = '#222222',
bg3 = '#282828',
bg4 = '#404040',
sel0 = "#2a2a2a",
sel1 = "#525253",
}
},
specs = {
nightfox = {
syntax = { func = "red" }
}
},
})
local plogins_source = "https://github.com/faerryn/plogins.nvim.git"
local plogins_name = plogins_source:gsub("/", "%%")
local plogins_dir = ("%s/site/pack/plogins/opt/%s"):format((vim.fn.stdpath("data")),
plogins_name)
vim.o.termguicolors = true
vim.cmd("colorscheme nightfox")
end,
},
{
"ojroques/nvim-hardline",
lazy = false,
init = function()
require('hardline').setup()
end,
},
{
"kevinhwang91/rnvimr",
lazy = false,
init = function()
vim.api.nvim_set_keymap('n', '<leader>f', ":RnvimrToggle<cr>", {})
vim.g.rnvimr_action = {
['<C-t>'] = "NvimEdit tabedit",
['<C-x>'] = "NvimEdit split",
['<C-v>'] = "NvimEdit vsplit",
}
end,
},
{
"hrsh7th/nvim-cmp",
lazy = false,
dependencies = {
{ "hrsh7th/cmp-nvim-lsp" },
{ "hrsh7th/cmp-buffer" },
{ "hrsh7th/cmp-path" },
{ "hrsh7th/cmp-cmdline" },
{ "hrsh7th/cmp-nvim-lsp-signature-help" },
{ "hrsh7th/cmp-vsnip" },
{ "hrsh7th/vim-vsnip" },
},
init = function()
vim.o.completeopt = "menu,menuone,noselect"
local cmp = require("cmp")
cmp.setup({
snippet = {
-- snippet engine is required
expand = function(args)
vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
end,
},
window = {
-- completion = cmp.config.window.bordered(),
-- documentation = cmp.config.window.bordered(),
},
mapping = cmp.mapping.preset.insert({
--['<C-b>'] = cmp.mapping.scroll_docs(-4),
--['<C-f>'] = cmp.mapping.scroll_docs(4),
--['<C-Space>'] = cmp.mapping.complete(),
['<C-e>'] = cmp.mapping.abort(),
['<CR>'] = cmp.mapping.confirm({ select = true }),
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif vim.fn["vsnip#available"](1) == 1 then
feedkey("<Plug>(vsnip-expand-or-jump)", "")
elseif has_words_before() then
cmp.complete()
else
-- The fallback function sends a already mapped key.
-- In this case, it's probably `<Tab>`.
fallback()
end
end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function()
if cmp.visible() then
cmp.select_prev_item()
elseif vim.fn["vsnip#jumpable"](-1) == 1 then
feedkey("<Plug>(vsnip-jump-prev)", "")
end
end, { "i", "s" }),
}),
sources = cmp.config.sources({
{ name = 'nvim_lsp' },
{ name = 'nvim_lsp_signature_help' },
{ name = 'vsnip' },
}, {
{ name = 'buffer' },
})
})
-- Set configuration for specific filetype.
cmp.setup.filetype('gitcommit', {
sources = cmp.config.sources({
{ name = 'cmp_git' },
}, {
{ name = 'buffer' },
})
})
-- Use buffer source for `/` and `?`
cmp.setup.cmdline({ '/', '?' }, {
mapping = cmp.mapping.preset.cmdline(),
sources = {
{ name = 'buffer' }
}
})
-- Use cmdline & path source for ':'
cmp.setup.cmdline(':', {
mapping = cmp.mapping.preset.cmdline(),
sources = cmp.config.sources({
{ name = 'path' }
}, {
{ name = 'cmdline' }
})
})
end,
},
{
"neovim/nvim-lspconfig",
lazy = false,
dependencies = "hrsh7th/nvim-cmp",
init = function()
local capabilities = require("cmp_nvim_lsp").default_capabilities()
local lsp_config = require("lspconfig")
local servers = { "clangd", "rust_analyzer", "pylsp" }
for _, lsp in ipairs(servers) do
lsp_config[lsp].setup {
capabilities = capabilities,
on_attach = lsp_on_attach,
}
end
end,
},
{
"nvim-telescope/telescope.nvim",
tag = "0.1.2",
lazy = false,
dependencies = {
{ "nvim-lua/plenary.nvim" },
{ "ludovicchabant/vim-gutentags" },
{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
},
init = function()
require("telescope").setup{
defaults = {
-- Default configuration for telescope goes here:
-- config_key = value,
mappings = {
i = {
-- map actions.which_key to <C-h> (default: <C-/>)
-- actions.which_key shows the mappings for your picker,
-- e.g. git_{create, delete, ...}_branch for the git_branches picker
["<C-h>"] = "which_key"
}
}
},
pickers = {
-- Default configuration for builtin pickers goes here:
-- picker_name = {
-- picker_config_key = value,
-- ...
-- }
-- Now the picker_config_key will be applied every time you call this
-- builtin picker
},
extensions = {
fzf = {
fuzzy = true, -- false will only do exact matching
override_generic_sorter = true, -- override the generic sorter
override_file_sorter = true, -- override the file sorter
case_mode = "smart_case", -- or "ignore_case" or "respect_case"
-- the default case_mode is "smart_case"
},
}
}
require("telescope").load_extension("fzf")
vim.api.nvim_set_keymap('n', 'tf',
":Telescope find_files<cr>", {})
vim.api.nvim_set_keymap('n', 'tg',
":Telescope live_grep<cr>", {})
vim.api.nvim_set_keymap('n', 'ts',
":Telescope grep_string<cr>", {})
vim.api.nvim_set_keymap('n', 'tt',
":Telescope current_buffer_tags<cr>", {})
vim.api.nvim_set_keymap('n', 'tc',
":Telescope git_commits<cr>", {})
vim.api.nvim_set_keymap('n', 'ta',
":Telescope git_status<cr>", {})
vim.api.nvim_set_keymap('n', 'td',
":Telescope lsp_definitions<cr>", {})
vim.api.nvim_set_keymap('n', 'tr',
":Telescope lsp_references<cr>", {})
vim.api.nvim_set_keymap('n', 'tl',
":Telescope lsp_document_symbols<cr>", {})
vim.api.nvim_set_keymap('n', 'te',
":Telescope diagnostics<cr>", {})
end,
},
{
"airblade/vim-gitgutter",
lazy = false,
dependencies = {
{ "tpope/vim-fugitive" },
},
init = function()
-- put sign in number column to avoid screen-shifting
vim.cmd('set signcolumn=number')
end,
},
{
"sindrets/diffview.nvim",
lazy = false,
dependencies = {
{ "nvim-lua/plenary.nvim" },
},
init = function()
vim.api.nvim_set_keymap('n', '<leader>g', ":DiffviewOpen", {})
end,
},
{
"nvim-treesitter/nvim-treesitter",
lazy = false,
init = function()
local conf = require("nvim-treesitter.configs")
conf.setup {
-- only enable tested parsers
ensure_installed = { "c", "cpp", "lua", "rust" },
-- Install parsers synchronously (only applied to `ensure_installed`)
sync_install = false,
-- Automatically install missing parsers when entering buffer
auto_install = false,
-- List of parsers to ignore installing (for "all")
ignore_install = {},
highlight = {
-- `false` will disable the whole extension
enable = true,
-- list of language that will be disabled
disable = {},
-- disable slow treesitter highlight for large files
disable = function(lang, buf)
local max_filesize = 200 * 1024 -- 200 KB
local ok, stats =
pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
if ok and stats and stats.size > max_filesize then
return true
end
end,
-- run `:h syntax` and tree-sitter at the same time.
additional_vim_regex_highlighting = false,
}
}
end,
},
{ "ARM9/arm-syntax-vim", lazy = false },
}
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not vim.loop.fs_stat(lazypath) then
vim.fn.system({
"git",
"clone",
"--filter=blob:none",
"https://github.com/folke/lazy.nvim.git",
"--branch=stable", -- latest stable release
lazypath,
})
if not vim.loop.fs_stat(plogins_dir) then
vim.loop.spawn("git",
{ args = { "clone", "--depth", "1", plogins_source, plogins_dir } },
function(code, signal)
vim.defer_fn(function()
vim.cmd(("packadd %s"):format(vim.fn.fnameescape(plogins_name)))
manage_plugins()
end, 0)
end)
else
vim.cmd(("packadd %s"):format(vim.fn.fnameescape(plogins_name)))
manage_plugins()
end
vim.opt.rtp:prepend(lazypath)
require("lazy").setup(plugins, opts)