diff --git a/init.lua b/init.lua index bf1f625..06c3a22 100644 --- a/init.lua +++ b/init.lua @@ -9,34 +9,8 @@ require('my_plugins') require('my_keymappings') require('my_options') require("my_autocommands") --------------------- LUALINE ------------------------------- -require('lualine').setup { - options = {theme = 'gruvbox-material'}, - sections = {lualine_c = {'getcwd', {'filename', path = 1, file_status = true}}}, - inactive_sections = {lualine_c = {'getcwd', {'filename', path = 1, file_status = true}}} -} --------------------- PROJECT ------------------------------- -require("project_nvim").setup { - silent_chdir = true, -} -require('telescope').load_extension('projects') -utils.map('n', 'p', 'Telescope projects') --------------------- AUTOPAIRS ----------------------------- -require('nvim-autopairs').setup{} -------------------- TERMINAL ------------------------------ require('nvim-terminal').setup({ toggle_keymap = 'z', }) --------------------- INDENT-BLANKLINE ---------------------- -opt.listchars:append("eol:↴") --- opt.listchars:append("space: ") -opt.listchars:append("trail: ") -opt.listchars:append("tab:→ ") - -require("indent_blankline").setup { - show_end_of_line = true, - use_treesitter = true, - show_current_context = true, - context_patterns = {'class', 'function', 'method', 'block', '^if', '^for', '^while'}, -} diff --git a/lua/my_plugins.lua b/lua/my_plugins.lua index 4d3bdbc..feda6a7 100644 --- a/lua/my_plugins.lua +++ b/lua/my_plugins.lua @@ -45,7 +45,10 @@ return require('packer').startup(function() }) use {'sainnhe/gruvbox-material'} use {'ellisonleao/gruvbox.nvim'} - use {'lukas-reineke/indent-blankline.nvim'} + use { + 'lukas-reineke/indent-blankline.nvim', + config = get_setup("indent_blankline") + } use {'nvim-lua/plenary.nvim'} use { 'lewis6991/gitsigns.nvim', @@ -88,11 +91,18 @@ return require('packer').startup(function() } use { 'hoob3rt/lualine.nvim', - requires = {'kyazdani42/nvim-web-devicons', opt = true} + requires = {'kyazdani42/nvim-web-devicons', opt = true}, + config = get_setup("lualine") + } + use { + 'ahmedkhalf/project.nvim', + config = get_setup("project") } - use {'ahmedkhalf/project.nvim'} use {'p00f/nvim-ts-rainbow'} - use {'windwp/nvim-autopairs'} + use { + 'windwp/nvim-autopairs', + config = get_setup("nvim-autopairs") + } use {'ray-x/lsp_signature.nvim'} use {'s1n7ax/nvim-terminal'} use { diff --git a/lua/setup/indent_blankline.lua b/lua/setup/indent_blankline.lua new file mode 100644 index 0000000..42ad533 --- /dev/null +++ b/lua/setup/indent_blankline.lua @@ -0,0 +1,12 @@ +local opt = vim.opt -- to set options +opt.listchars:append("eol:↴") +-- opt.listchars:append("space: ") +opt.listchars:append("trail: ") +opt.listchars:append("tab:→ ") + +require("indent_blankline").setup { + show_end_of_line = true, + use_treesitter = true, + show_current_context = true, + context_patterns = {'class', 'function', 'method', 'block', '^if', '^for', '^while'}, +} diff --git a/lua/setup/lualine.lua b/lua/setup/lualine.lua new file mode 100644 index 0000000..4d7fd78 --- /dev/null +++ b/lua/setup/lualine.lua @@ -0,0 +1,5 @@ +require('lualine').setup { + options = {theme = 'gruvbox-material'}, + sections = {lualine_c = {'getcwd', {'filename', path = 1, file_status = true}}}, + inactive_sections = {lualine_c = {'getcwd', {'filename', path = 1, file_status = true}}} +} diff --git a/lua/setup/nvim-autopair.lua b/lua/setup/nvim-autopair.lua new file mode 100644 index 0000000..5b9c03c --- /dev/null +++ b/lua/setup/nvim-autopair.lua @@ -0,0 +1 @@ +require('nvim-autopairs').setup{} diff --git a/lua/setup/project.lua b/lua/setup/project.lua new file mode 100644 index 0000000..f8abf0b --- /dev/null +++ b/lua/setup/project.lua @@ -0,0 +1,5 @@ +require("project_nvim").setup { + silent_chdir = true, +} +require('telescope').load_extension('projects') +utils.map('n', 'p', 'Telescope projects')