From 698b10980c9428b8462b709f7df5d0d68eb8547f Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Sat, 15 Apr 2023 00:12:40 +0200
Subject: [PATCH] Neovim - general cleaning.

---
 nvim/init.lua | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/nvim/init.lua b/nvim/init.lua
index d194901..1d38546 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -13,7 +13,7 @@ end
 vim.opt.rtp:prepend(lazypath)
 
 -- define plugins
-require("lazy").setup {
+require("lazy").setup({
   "bitc/vim-bad-whitespace",
   "lewis6991/gitsigns.nvim",
   "numToStr/Comment.nvim",
@@ -24,12 +24,12 @@ require("lazy").setup {
   { "nvim-telescope/telescope.nvim",
     dependencies = { 'nvim-lua/plenary.nvim' }
   }
-}
+})
 
-require("monokai").setup{}
-require("Comment").setup{}
-require("colorizer").setup{}
-require("gitsigns").setup {
+-- start & setup plugins
+-- colorscheme has to be first
+require("monokai").setup()
+require("gitsigns").setup({
   signs = {
     add = { text = "▎" },
     change = { text = "▎" },
@@ -38,8 +38,10 @@ require("gitsigns").setup {
     changedelete = { text = "▎" },
     untracked = { text = "▎" },
   },
-}
-require("lualine").setup {
+})
+require("Comment").setup()
+require("colorizer").setup()
+require("lualine").setup({
   options = {
     component_separators = '',
     icons_enabled = false,
@@ -54,12 +56,12 @@ require("lualine").setup {
     lualine_y = { "progress" },
     lualine_z = { "location" },
   },
-}
-require("nvim-treesitter.configs").setup {
+})
+require("nvim-treesitter.configs").setup({
     build = ":TSUpdate",
     ensure_installed = { "bash", "python", "terraform", "vim", "yaml" },
     highlight = { enable = true },
-}
+})
 
 -- modify colorcheme
 vim.api.nvim_set_hl(0, "Normal", { bg = NONE })
@@ -97,16 +99,17 @@ vim.opt.softtabstop = 2
 
 -- configure mappings
 vim.g.mapleader = " "
-vim.keymap.set('n', "<esc><cr>", "<esc>:wq!<cr>", { silent = true })
-vim.keymap.set('n', "<leader>c", ":execute 'set colorcolumn=' . (&colorcolumn == '' ? '80,120' : '')<cr>", { silent = true })
-vim.keymap.set('n', "<leader>n", ":set nonumber!<cr>:Gitsigns toggle_signs<cr>", { silent = true })
-vim.keymap.set('n', "<leader>s", ":set spell!<cr>", { silent = true })
-vim.keymap.set('n', "<tab>", "<C-w>w", { silent = true })
-vim.keymap.set('i', "<C-a>", "<esc>I", { silent = true })
-vim.keymap.set('i', "<C-e>", "<esc>A", { silent = true })
-vim.keymap.set('n', '<leader>ff', require("telescope.builtin").find_files, {})
-vim.keymap.set('n', '<leader>fg', require("telescope.builtin").live_grep, {})
+vim.keymap.set("i", "<C-a>", "<esc>I", { silent = true })
+vim.keymap.set("i", "<C-e>", "<esc>A", { silent = true })
+vim.keymap.set("n", "<esc><cr>", "<esc>:wq!<cr>", { silent = true })
+vim.keymap.set("n", "<leader>c", ':execute "set colorcolumn=" . (&colorcolumn == "" ? "80,120" : "")<cr>', { silent = true })
+vim.keymap.set("n", "<leader>ff", require("telescope.builtin").find_files, {})
+vim.keymap.set("n", "<leader>fg", require("telescope.builtin").live_grep, {})
+vim.keymap.set("n", "<leader>n", ":set nonumber!<cr>:Gitsigns toggle_signs<cr>", { silent = true })
+vim.keymap.set("n", "<leader>s", ":set spell!<cr>", { silent = true })
+vim.keymap.set("n", "<tab>", "<C-w>w", { silent = true })
 
+-- autocmd
 vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, {
   pattern = {"*.gotmpl"},
   callback = function() vim.bo.filetype = "yaml" end,