From d236deaa63486f920d0d47d60747add95009eac5 Mon Sep 17 00:00:00 2001 From: Daniil Tsivinsky Date: Tue, 16 Nov 2021 21:50:15 +0300 Subject: [PATCH] Move code other than requiring modules out of init.lua --- config/nvim/init.lua | 32 +------------------------------ config/nvim/lua/general.lua | 5 +++++ config/nvim/lua/plugins-setup.lua | 25 ++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 config/nvim/lua/plugins-setup.lua diff --git a/config/nvim/init.lua b/config/nvim/init.lua index a6aa964..a1a76d9 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,6 +1,7 @@ require("plugins") require("general") +require("plugins-setup") require("treesitter") require("file-tree") require("telescope-config") @@ -8,34 +9,3 @@ require("lsp") require("snippets") require("remaps") - --- Tabs -require("bufferline").setup() - --- Statusline -require("lualine").setup() - --- Git -require("gitsigns").setup({ - current_line_blame = true, - current_line_blame_opts = { - virt_text = true, - virt_text_pos = "eol", - delay = 500 - }, - keymaps = { - noremap = true, - ["n gs"] = 'lua require("gitsigns").stage_hunk()', - ["n gu"] = 'lua require("gitsigns").undo_stage_hunk()', - ["n gr"] = 'lua require("gitsigns").reset_hunk()' - } -}) - -require("nvim-autopairs").setup() - -require("colorizer").setup() - --- Automatically formatting buffer on save -vim.api.nvim_command("autocmd BufWritePre * lua vim.lsp.buf.formatting_sync()") - -vim.cmd('command! ToggleBackground lua require("utils").toggleBackground()') diff --git a/config/nvim/lua/general.lua b/config/nvim/lua/general.lua index e5ff7a7..69e162b 100644 --- a/config/nvim/lua/general.lua +++ b/config/nvim/lua/general.lua @@ -42,3 +42,8 @@ vim.api.nvim_exec([[ autocmd TextYankPost * silent! lua vim.highlight.on_yank{higroup="IncSearch", timeout=700} augroup end ]], false) + +-- Automatically formatting buffer on save +vim.api.nvim_command("autocmd BufWritePre * lua vim.lsp.buf.formatting_sync()") + +vim.cmd('command! ToggleBackground lua require("utils").toggleBackground()') diff --git a/config/nvim/lua/plugins-setup.lua b/config/nvim/lua/plugins-setup.lua new file mode 100644 index 0000000..56b0fd3 --- /dev/null +++ b/config/nvim/lua/plugins-setup.lua @@ -0,0 +1,25 @@ +-- Tabs +require("bufferline").setup() + +-- Statusline +require("lualine").setup() + +require("nvim-autopairs").setup() + +require("colorizer").setup() + +-- Git +require("gitsigns").setup({ + current_line_blame = true, + current_line_blame_opts = { + virt_text = true, + virt_text_pos = "eol", + delay = 500 + }, + keymaps = { + noremap = true, + ["n gs"] = 'lua require("gitsigns").stage_hunk()', + ["n gu"] = 'lua require("gitsigns").undo_stage_hunk()', + ["n gr"] = 'lua require("gitsigns").reset_hunk()' + } +})