From e9cf99cf8e5cbe99a0f81e01c4afe73f3beb428b Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 16 Sep 2021 09:15:00 +0200 Subject: [PATCH] Feat: plugins (not configured) and lualine --- nvim/.config/nvim/init.lua | 4 ++ nvim/.config/nvim/init.vim | 18 --------- nvim/.config/nvim/lua/mappings.lua | 8 ++-- nvim/.config/nvim/lua/plugins.lua | 65 ++++++++++++++++++++++++++++++ nvim/.config/nvim/lua/settings.lua | 2 +- 5 files changed, 74 insertions(+), 23 deletions(-) delete mode 100644 nvim/.config/nvim/init.vim create mode 100644 nvim/.config/nvim/lua/plugins.lua diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index ae1697b..18b0952 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -1 +1,5 @@ +require('plugins') require('settings') +require('mappings') + +-- require('lualine') diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim deleted file mode 100644 index 48aff03..0000000 --- a/nvim/.config/nvim/init.vim +++ /dev/null @@ -1,18 +0,0 @@ -source $HOME/.config/nvim/plugins/plugins.vim -source $HOME/.config/nvim/general/settings.vim -source $HOME/.config/nvim/general/mappings.vim -" source $HOME/.config/nvim/general/completion.vim - -source $HOME/.config/nvim/plugins/lightline.vim -source $HOME/.config/nvim/plugins/nvim-comp.vim -source $HOME/.config/nvim/plugins/vimtex.vim - -lua <', '>gv', {}) map('i', '', 'u[s1z=`]au', default_opts) -- Find files using Telescope command-line sugar. -map('n', 'e', 'Telescope find_files') -map('n', 'g', 'Telescope live_grep') -map('n', 'b', 'Telescope buffers') -map('n', 'h', 'Telescope help_tags') +map('n', 'e', 'Telescope find_files', {}) +map('n', 'g', 'Telescope live_grep', {}) +map('n', 'b', 'Telescope buffers', {}) +map('n', 'h', 'Telescope help_tags', {}) diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua new file mode 100644 index 0000000..afcf8cb --- /dev/null +++ b/nvim/.config/nvim/lua/plugins.lua @@ -0,0 +1,65 @@ +return require('packer').startup(function() + use 'morhetz/gruvbox' + + -- Status line + use { + 'hoob3rt/lualine.nvim', + config = function () + require('lualine').setup{ + options = { + icons_enabled = true, + theme = 'gruvbox', + component_separators = {'', ''}, + section_separators = {'', ''}, + disabled_filetypes = {} + }, + sections = { + lualine_a = {'mode'}, + lualine_b = {'branch'}, + lualine_c = {'filename'}, + lualine_x = { + { 'diagnostics', sources = {"nvim_lsp"}, symbols = {error = ' ', warn = ' ', info = ' ', hint = ' '} }, + 'encoding', + 'filetype' + }, + lualine_y = {'progress'}, + lualine_z = {'location'} + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = {'filename'}, + lualine_x = {'location'}, + lualine_y = {}, + lualine_z = {} + }, + tabline = {}, + extensions = {} + } + end + } + + use 'tpope/vim-fugitive' + use 'mhinz/vim-signify' + + use 'tpope/vim-surround' + use 'tpope/vim-repeat' + + use 'neovim/nvim-lspconfig' + use 'hrsh7th/nvim-compe' + use 'hrsh7th/vim-vsnip' + use 'hrsh7th/vim-vsnip-integ' + use 'rafamadriz/friendly-snippets' + + use 'nvim-lua/popup.nvim' + use 'nvim-lua/plenary.nvim' + use 'nvim-telescope/telescope.nvim' + + use 'lervag/vimtex' + + -- Highlight on Yank + use 'machakann/vim-highlightedyank' + -- Autoclose parenthesis + use 'jiangmiao/auto-pairs' + +end) diff --git a/nvim/.config/nvim/lua/settings.lua b/nvim/.config/nvim/lua/settings.lua index 232480f..655ca43 100644 --- a/nvim/.config/nvim/lua/settings.lua +++ b/nvim/.config/nvim/lua/settings.lua @@ -49,4 +49,4 @@ exec([[ augroup end ]], false) - +cmd('colorscheme gruvbox')