From b879332a86edb5b666b0f0e88c884723f507398c Mon Sep 17 00:00:00 2001 From: Hippolyte Chauvin Date: Thu, 12 Oct 2023 23:07:32 +0200 Subject: [PATCH] =?UTF-8?q?Remaniement=20:=20=C3=A9puration=20de=20ma=20co?= =?UTF-8?q?nfiguration=20Neovim,=20pas=20encore=20fini?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/nvim/init.lua | 4 +- config/nvim/lua/core/lsp.lua | 2 - .../lua/core/plugin_config/catppuccin.lua | 6 - config/nvim/lua/core/plugin_config/cmp.lua | 53 -------- config/nvim/lua/core/plugin_config/init.lua | 5 - config/nvim/lua/core/plugin_config/mason.lua | 12 -- .../lua/core/plugin_config/rust-tools.lua | 13 -- .../lua/core/plugin_config/treesitter.lua | 16 --- config/nvim/lua/core/plugins.lua | 56 -------- config/nvim/plugin/packer_compiled.lua | 124 ------------------ 10 files changed, 1 insertion(+), 290 deletions(-) delete mode 100644 config/nvim/lua/core/lsp.lua delete mode 100644 config/nvim/lua/core/plugin_config/catppuccin.lua delete mode 100644 config/nvim/lua/core/plugin_config/cmp.lua delete mode 100644 config/nvim/lua/core/plugin_config/mason.lua delete mode 100644 config/nvim/lua/core/plugin_config/rust-tools.lua delete mode 100644 config/nvim/lua/core/plugin_config/treesitter.lua delete mode 100644 config/nvim/lua/core/plugins.lua delete mode 100644 config/nvim/plugin/packer_compiled.lua diff --git a/config/nvim/init.lua b/config/nvim/init.lua index d7e6b4a..822502b 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -2,9 +2,7 @@ vim.cmd [[ source ~/.vimrc ]] -- Modules +require('core.opts') require('core.keymaps') -require('core.plugins') require('core.style') -require('core.plugin_config') -require('core.lsp') diff --git a/config/nvim/lua/core/lsp.lua b/config/nvim/lua/core/lsp.lua deleted file mode 100644 index 422ae0d..0000000 --- a/config/nvim/lua/core/lsp.lua +++ /dev/null @@ -1,2 +0,0 @@ -require'lspconfig'.pyright.setup{} - diff --git a/config/nvim/lua/core/plugin_config/catppuccin.lua b/config/nvim/lua/core/plugin_config/catppuccin.lua deleted file mode 100644 index 65f4c4f..0000000 --- a/config/nvim/lua/core/plugin_config/catppuccin.lua +++ /dev/null @@ -1,6 +0,0 @@ --- Activer les couleurs du terminal -vim.o.termguicolors = true - --- Changer la palette de couleurs -vim.cmd [[ colorscheme catppuccin ]] - diff --git a/config/nvim/lua/core/plugin_config/cmp.lua b/config/nvim/lua/core/plugin_config/cmp.lua deleted file mode 100644 index f0b4629..0000000 --- a/config/nvim/lua/core/plugin_config/cmp.lua +++ /dev/null @@ -1,53 +0,0 @@ --- Completion Plugin Setup -local cmp = require'cmp' -cmp.setup({ - -- Enable LSP snippets - snippet = { - expand = function(args) - vim.fn["vsnip#anonymous"](args.body) - end, - }, - mapping = { - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.select_next_item(), - -- Add tab support - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.close(), - [''] = cmp.mapping.confirm({ - behavior = cmp.ConfirmBehavior.Insert, - select = true, - }) - }, - -- Installed sources: - sources = { - { name = 'path' }, -- file paths - { name = 'nvim_lsp', keyword_length = 3 }, -- from language server - { name = 'nvim_lsp_signature_help'}, -- display function signatures with current parameter emphasized - { name = 'nvim_lua', keyword_length = 2}, -- complete neovim's Lua runtime API such vim.lsp.* - { name = 'buffer', keyword_length = 2 }, -- source current buffer - { name = 'vsnip', keyword_length = 2 }, -- nvim-cmp source for vim-vsnip - { name = 'calc'}, -- source for math calculation - }, - window = { - completion = cmp.config.window.bordered(), - documentation = cmp.config.window.bordered(), - }, - formatting = { - fields = {'menu', 'abbr', 'kind'}, - format = function(entry, item) - local menu_icon ={ - nvim_lsp = 'λ', - vsnip = '⋗', - buffer = 'Ω', - path = '🖫', - } - item.menu = menu_icon[entry.source.name] - return item - end, - }, -}) - diff --git a/config/nvim/lua/core/plugin_config/init.lua b/config/nvim/lua/core/plugin_config/init.lua index c0bbe54..1981dd7 100644 --- a/config/nvim/lua/core/plugin_config/init.lua +++ b/config/nvim/lua/core/plugin_config/init.lua @@ -1,8 +1,3 @@ require("core.plugin_config.lualine") require("core.plugin_config.nvim-tree") -require("core.plugin_config.catppuccin") -require("core.plugin_config.mason") -require("core.plugin_config.cmp") -require("core.plugin_config.rust-tools") -require("core.plugin_config.treesitter") diff --git a/config/nvim/lua/core/plugin_config/mason.lua b/config/nvim/lua/core/plugin_config/mason.lua deleted file mode 100644 index 1d14c35..0000000 --- a/config/nvim/lua/core/plugin_config/mason.lua +++ /dev/null @@ -1,12 +0,0 @@ --- Mason Setup -require("mason").setup({ - ui = { - icons = { - package_installed = "", - package_pending = "", - package_uninstalled = "", - }, - } -}) -require("mason-lspconfig").setup() - diff --git a/config/nvim/lua/core/plugin_config/rust-tools.lua b/config/nvim/lua/core/plugin_config/rust-tools.lua deleted file mode 100644 index 9fcff10..0000000 --- a/config/nvim/lua/core/plugin_config/rust-tools.lua +++ /dev/null @@ -1,13 +0,0 @@ -local rt = require("rust-tools") - -rt.setup({ - server = { - on_attach = function(_, bufnr) - -- Hover actions - vim.keymap.set("n", "", rt.hover_actions.hover_actions, { buffer = bufnr }) - -- Code action groups - vim.keymap.set("n", "a", rt.code_action_group.code_action_group, { buffer = bufnr }) - end, - }, -}) - diff --git a/config/nvim/lua/core/plugin_config/treesitter.lua b/config/nvim/lua/core/plugin_config/treesitter.lua deleted file mode 100644 index 1c54191..0000000 --- a/config/nvim/lua/core/plugin_config/treesitter.lua +++ /dev/null @@ -1,16 +0,0 @@ --- Treesitter Plugin Setup -require('nvim-treesitter.configs').setup { - ensure_installed = { "lua", "rust", "toml" }, - auto_install = true, - highlight = { - enable = true, - additional_vim_regex_highlighting=false, - }, - ident = { enable = true }, - rainbow = { - enable = true, - extended_mode = true, - max_file_lines = nil, - } -} - diff --git a/config/nvim/lua/core/plugins.lua b/config/nvim/lua/core/plugins.lua deleted file mode 100644 index 256af8f..0000000 --- a/config/nvim/lua/core/plugins.lua +++ /dev/null @@ -1,56 +0,0 @@ -local ensure_packer = function() - local fn = vim.fn - local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim' - if fn.empty(fn.glob(install_path)) > 0 then - fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path}) - vim.cmd [[packadd packer.nvim]] - return true - end - return false -end - -local packer_bootstrap = ensure_packer() - -return require('packer').startup(function(use) - use 'wbthomason/packer.nvim' - use { "catppuccin/nvim", as = "catppuccin" } - use { - 'nvim-tree/nvim-tree.lua', - requires = { - 'nvim-tree/nvim-web-devicons', - }, - config = function() - require("nvim-tree").setup {} - end - } - use { - 'nvim-lualine/lualine.nvim', - requires = { 'nvim-tree/nvim-web-devicons', opt = true } - } - -- use 'feline-nvim/feline.nvim' - use 'williamboman/mason.nvim' - use 'williamboman/mason-lspconfig.nvim' - use 'simrat39/rust-tools.nvim' - - -- Completion framework: - use 'hrsh7th/nvim-cmp' - - -- LSP completion source: - use 'hrsh7th/cmp-nvim-lsp' - - -- Useful completion sources: - use 'hrsh7th/cmp-nvim-lua' - use 'hrsh7th/cmp-nvim-lsp-signature-help' - use 'hrsh7th/cmp-vsnip' - use 'hrsh7th/cmp-path' - use 'hrsh7th/cmp-buffer' - use 'hrsh7th/vim-vsnip' - - use 'nvim-treesitter/nvim-treesitter' - - -- Synchroniser les paquetages si c'est la première exécution - if packer_bootstrap then - require('packer').sync() - end -end) - diff --git a/config/nvim/plugin/packer_compiled.lua b/config/nvim/plugin/packer_compiled.lua deleted file mode 100644 index b5c58df..0000000 --- a/config/nvim/plugin/packer_compiled.lua +++ /dev/null @@ -1,124 +0,0 @@ --- Automatically generated packer.nvim plugin loader code - -if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then - vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') - return -end - -vim.api.nvim_command('packadd packer.nvim') - -local no_errors, error_msg = pcall(function() - -_G._packer = _G._packer or {} -_G._packer.inside_compile = true - -local time -local profile_info -local should_profile = false -if should_profile then - local hrtime = vim.loop.hrtime - profile_info = {} - time = function(chunk, start) - if start then - profile_info[chunk] = hrtime() - else - profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 - end - end -else - time = function(chunk, start) end -end - -local function save_profiles(threshold) - local sorted_times = {} - for chunk_name, time_taken in pairs(profile_info) do - sorted_times[#sorted_times + 1] = {chunk_name, time_taken} - end - table.sort(sorted_times, function(a, b) return a[2] > b[2] end) - local results = {} - for i, elem in ipairs(sorted_times) do - if not threshold or threshold and elem[2] > threshold then - results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' - end - end - if threshold then - table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') - end - - _G._packer.profile_output = results -end - -time([[Luarocks path setup]], true) -local package_path_str = "/home/ahurac/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/ahurac/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/ahurac/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/ahurac/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/ahurac/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" -if not string.find(package.path, package_path_str, 1, true) then - package.path = package.path .. ';' .. package_path_str -end - -if not string.find(package.cpath, install_cpath_pattern, 1, true) then - package.cpath = package.cpath .. ';' .. install_cpath_pattern -end - -time([[Luarocks path setup]], false) -time([[try_loadstring definition]], true) -local function try_loadstring(s, component, name) - local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) - if not success then - vim.schedule(function() - vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) - end) - end - return result -end - -time([[try_loadstring definition]], false) -time([[Defining packer_plugins]], true) -_G.packer_plugins = { - catppuccin = { - loaded = true, - path = "/home/ahurac/.local/share/nvim/site/pack/packer/start/catppuccin", - url = "https://github.com/catppuccin/nvim" - }, - ["lualine.nvim"] = { - loaded = true, - path = "/home/ahurac/.local/share/nvim/site/pack/packer/start/lualine.nvim", - url = "https://github.com/nvim-lualine/lualine.nvim" - }, - ["nvim-tree.lua"] = { - config = { "\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14nvim-tree\frequire\0" }, - loaded = true, - path = "/home/ahurac/.local/share/nvim/site/pack/packer/start/nvim-tree.lua", - url = "https://github.com/nvim-tree/nvim-tree.lua" - }, - ["nvim-web-devicons"] = { - loaded = true, - path = "/home/ahurac/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", - url = "https://github.com/nvim-tree/nvim-web-devicons" - }, - ["packer.nvim"] = { - loaded = true, - path = "/home/ahurac/.local/share/nvim/site/pack/packer/start/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - } -} - -time([[Defining packer_plugins]], false) --- Config for: nvim-tree.lua -time([[Config for nvim-tree.lua]], true) -try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14nvim-tree\frequire\0", "config", "nvim-tree.lua") -time([[Config for nvim-tree.lua]], false) - -_G._packer.inside_compile = false -if _G._packer.needs_bufread == true then - vim.cmd("doautocmd BufRead") -end -_G._packer.needs_bufread = false - -if should_profile then save_profiles() end - -end) - -if not no_errors then - error_msg = error_msg:gsub('"', '\\"') - vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') -end