From 4cba0df0be298b2a1c0235368b97ef47e7aca05d Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 2 Nov 2022 13:40:30 +0000
Subject: [PATCH] Change shiftwidth to 4, fix indentation in lua files. Disable
 TS in help pages (0.8 bug)

---
 init.lua                                 |   1 +
 lua/config_lsp.lua                       | 226 +++++++++++-----------
 lua/config_plugins/config_aerial.lua     |  20 +-
 lua/config_plugins/config_gitsigns.lua   |  38 ++--
 lua/config_plugins/config_lualine.lua    |  18 +-
 lua/config_plugins/config_nightfox.lua   |  24 +--
 lua/config_plugins/config_nvim-tree.lua  |  10 +-
 lua/config_plugins/config_sniprun.lua    |  10 +-
 lua/config_plugins/config_telescope.lua  |  10 +-
 lua/config_plugins/config_toggleterm.lua |  20 +-
 lua/config_plugins/config_treesitter.lua |   1 +
 lua/keymaps.lua                          |   6 +-
 lua/plugins.lua                          | 227 ++++++++++++-----------
 13 files changed, 307 insertions(+), 304 deletions(-)

diff --git a/init.lua b/init.lua
index 78c9ea86..7285ecd9 100644
--- a/init.lua
+++ b/init.lua
@@ -12,6 +12,7 @@ vim.opt.updatetime=500
 vim.opt.mouse="nv"
 vim.opt.termguicolors=true
 
+vim.opt.shiftwidth=4
 vim.opt.number=true
 vim.opt.relativenumber=true
 vim.opt.listchars = { trail = '.', tab = '>_' }
diff --git a/lua/config_lsp.lua b/lua/config_lsp.lua
index e2a45160..9bfea8c2 100644
--- a/lua/config_lsp.lua
+++ b/lua/config_lsp.lua
@@ -9,159 +9,159 @@ vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, opts)
 -- Use an on_attach function to only map the following keys
 -- after the language server attaches to the current buffer
 local on_attach = function(client, bufnr)
-  -- Enable completion triggered by <c-x><c-o>
-  vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+    -- Enable completion triggered by <c-x><c-o>
+    vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
 
-  -- Mappings.
-  -- See `:help vim.lsp.*` for documentation on any of the below functions
-  local bufopts = { noremap=true, silent=true, buffer=bufnr }
-  vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
-  vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
-  vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
-  vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
-  -- vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
-  vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, bufopts)
-  vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
-  vim.keymap.set('n', '<leader>wl', function()
-    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-  end, bufopts)
-  vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, bufopts)
-  vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, bufopts)
-  vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, bufopts)
-  vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
-  vim.keymap.set('n', '<leader>i', vim.lsp.buf.formatting, bufopts)
-  -- Enable aerial support
-  require("aerial").on_attach(client, bufnr)
+    -- Mappings.
+    -- See `:help vim.lsp.*` for documentation on any of the below functions
+    local bufopts = { noremap=true, silent=true, buffer=bufnr }
+    vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
+    vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
+    vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
+    vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
+    -- vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
+    vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, bufopts)
+    vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
+    vim.keymap.set('n', '<leader>wl', function()
+        print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+    end, bufopts)
+    vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, bufopts)
+    vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, bufopts)
+    vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, bufopts)
+    vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
+    vim.keymap.set('n', '<leader>i', vim.lsp.buf.formatting, bufopts)
+    -- Enable aerial support
+    require("aerial").on_attach(client, bufnr)
 end
 
 local lsp_flags = {
-  -- This is the default in Nvim 0.7+
-  debounce_text_changes = 150,
+    -- This is the default in Nvim 0.7+
+    debounce_text_changes = 150,
 }
 
-  -- Setup nvim-cmp.
+-- Setup nvim-cmp.
 local cmp = require'cmp'
 
 cmp.setup({
-  snippet = {
-    -- REQUIRED - you must specify a snippet engine
-    expand = function(args)
-      vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
-      -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
-      -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
-      -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
-    end,
-  },
-  window = {
-    -- completion = cmp.config.window.bordered(),
-    -- documentation = cmp.config.window.bordered(),
-  },
-  mapping = cmp.mapping.preset.insert({
-    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-    ['<C-f>'] = cmp.mapping.scroll_docs(4),
-    ['<C-Space>'] = cmp.mapping.complete(),
-    ['<C-e>'] = cmp.mapping.abort(),
-    ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-  }),
-  sources = cmp.config.sources({
-    { name = 'nvim_lsp' },
-    { name = 'vsnip' }, -- For vsnip users.
-    -- { name = 'luasnip' }, -- For luasnip users.
-    -- { name = 'ultisnips' }, -- For ultisnips users.
-    -- { name = 'snippy' }, -- For snippy users.
-  }, {
-    { name = 'buffer' },
-  })
+    snippet = {
+        -- REQUIRED - you must specify a snippet engine
+        expand = function(args)
+            vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+            -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+            -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
+            -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
+        end,
+    },
+    window = {
+        -- completion = cmp.config.window.bordered(),
+        -- documentation = cmp.config.window.bordered(),
+    },
+    mapping = cmp.mapping.preset.insert({
+        ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+        ['<C-f>'] = cmp.mapping.scroll_docs(4),
+        ['<C-Space>'] = cmp.mapping.complete(),
+        ['<C-e>'] = cmp.mapping.abort(),
+        ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+    }),
+    sources = cmp.config.sources({
+        { name = 'nvim_lsp' },
+        { name = 'vsnip' }, -- For vsnip users.
+        -- { name = 'luasnip' }, -- For luasnip users.
+        -- { name = 'ultisnips' }, -- For ultisnips users.
+        -- { name = 'snippy' }, -- For snippy users.
+    }, {
+        { name = 'buffer' },
+    })
 })
 
 -- Set configuration for specific filetype.
 cmp.setup.filetype('gitcommit', {
-  sources = cmp.config.sources({
-    { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
-  }, {
-    { name = 'buffer' },
-  })
+    sources = cmp.config.sources({
+        { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
+    }, {
+        { name = 'buffer' },
+    })
 })
 
 -- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
 cmp.setup.cmdline('/', {
-  mapping = cmp.mapping.preset.cmdline(),
-  sources = {
-    { name = 'buffer' }
-  }
+    mapping = cmp.mapping.preset.cmdline(),
+    sources = {
+        { name = 'buffer' }
+    }
 })
 
 -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
 cmp.setup.cmdline(':', {
-  mapping = cmp.mapping.preset.cmdline(),
-  sources = cmp.config.sources({
-    { name = 'path' }
-  }, {
-    { name = 'cmdline' }
-  })
+    mapping = cmp.mapping.preset.cmdline(),
+    sources = cmp.config.sources({
+        { name = 'path' }
+    }, {
+        { name = 'cmdline' }
+    })
 })
 
 -- Setup lspconfig.
 local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
 
 local function file_exists(name)
-       local f=io.open(name,"r")
-       if f~=nil then io.close(f) return true else return false end
+    local f=io.open(name,"r")
+    if f~=nil then io.close(f) return true else return false end
 end
 
 local pyright_file = os.getenv( "HOME" ).."/.pyenv/versions/neovim3/bin/pyright-langserver"
 local pylsp_file = os.getenv( "HOME" ).."/.pyenv/versions/neovim3/bin/pylsp"
 
 if file_exists(pyright_file) then
-        require('lspconfig')['pyright'].setup{
-                cmd = {pyright_file, "--stdio"},
-                on_attach = on_attach,
-                flags = lsp_flags,
-                capabilities = capabilities,
-        }
+    require('lspconfig')['pyright'].setup{
+        cmd = {pyright_file, "--stdio"},
+        on_attach = on_attach,
+        flags = lsp_flags,
+        capabilities = capabilities,
+    }
 elseif file_exists(pylsp_file) then
-        require('lspconfig')['pylsp'].setup{
-            cmd = {pylsp_file},
-            on_attach = on_attach,
-            flags = lsp_flags,
-            settings = {
-                pylsp = {
-                    plugins = {
-                        pycodestyle = {maxLineLength = 88},
-                        flake8 = {maxLineLength = 88}
-                    }
+    require('lspconfig')['pylsp'].setup{
+        cmd = {pylsp_file},
+        on_attach = on_attach,
+        flags = lsp_flags,
+        settings = {
+            pylsp = {
+                plugins = {
+                    pycodestyle = {maxLineLength = 88},
+                    flake8 = {maxLineLength = 88}
                 }
-            },
-            capabilities = capabilities
-        }
+            }
+        },
+        capabilities = capabilities
+    }
 end
 
 require('lspconfig')['fortls'].setup{
-        cmd = {os.getenv( "HOME" ).."/.pyenv/versions/neovim3/bin/fortls"},
-        on_attach = on_attach,
-        flags = lsp_flags,
-        capabilities = capabilities
+    cmd = {os.getenv( "HOME" ).."/.pyenv/versions/neovim3/bin/fortls"},
+    on_attach = on_attach,
+    flags = lsp_flags,
+    capabilities = capabilities
 }
 
 require('lspconfig')['sumneko_lua'].setup {
-  settings = {
-    Lua = {
-      runtime = {
-        -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
-        version = 'LuaJIT',
-      },
-      diagnostics = {
-        -- Get the language server to recognize the `vim` global
-        globals = {'vim'},
-      },
-      workspace = {
-        -- Make the server aware of Neovim runtime files
-        library = vim.api.nvim_get_runtime_file("", true),
-      },
-      -- Do not send telemetry data containing a randomized but unique identifier
-      telemetry = {
-        enable = false,
-      },
+    settings = {
+        Lua = {
+            runtime = {
+                -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
+                version = 'LuaJIT',
+            },
+            diagnostics = {
+                -- Get the language server to recognize the `vim` global
+                globals = {'vim'},
+            },
+            workspace = {
+                -- Make the server aware of Neovim runtime files
+                library = vim.api.nvim_get_runtime_file("", true),
+            },
+            -- Do not send telemetry data containing a randomized but unique identifier
+            telemetry = {
+                enable = false,
+            },
+        },
     },
-  },
 }
diff --git a/lua/config_plugins/config_aerial.lua b/lua/config_plugins/config_aerial.lua
index f031c1c7..a3253b54 100644
--- a/lua/config_plugins/config_aerial.lua
+++ b/lua/config_plugins/config_aerial.lua
@@ -1,13 +1,13 @@
 require('aerial').setup{
-        on_attach = function(bufnr)
-                -- Toggle the aerial window with <leader>a
-                vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>k', '<cmd>AerialToggle!<CR>', {})
-                -- Jump forwards/backwards with '{' and '}'
-                vim.api.nvim_buf_set_keymap(bufnr, 'n', '{', '<cmd>AerialPrev<CR>', {})
-                vim.api.nvim_buf_set_keymap(bufnr, 'n', '}', '<cmd>AerialNext<CR>', {})
-                -- Jump up the tree with '[[' or ']]'
-                vim.api.nvim_buf_set_keymap(bufnr, 'n', '[[', '<cmd>AerialPrevUp<CR>', {})
-                vim.api.nvim_buf_set_keymap(bufnr, 'n', ']]', '<cmd>AerialNextUp<CR>', {})
-        end,
+    on_attach = function(bufnr)
+        -- Toggle the aerial window with <leader>a
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>k', '<cmd>AerialToggle!<CR>', {})
+        -- Jump forwards/backwards with '{' and '}'
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '{', '<cmd>AerialPrev<CR>', {})
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '}', '<cmd>AerialNext<CR>', {})
+        -- Jump up the tree with '[[' or ']]'
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '[[', '<cmd>AerialPrevUp<CR>', {})
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', ']]', '<cmd>AerialNextUp<CR>', {})
+    end,
 }
 
diff --git a/lua/config_plugins/config_gitsigns.lua b/lua/config_plugins/config_gitsigns.lua
index 3fbe5581..321c4082 100644
--- a/lua/config_plugins/config_gitsigns.lua
+++ b/lua/config_plugins/config_gitsigns.lua
@@ -1,21 +1,21 @@
 require('gitsigns').setup{
-        signcolumn = true,
-        numhl = true,
-        linehl = true,
-        current_line_blame = true,
-        on_attach = function(bufnr)
-          -- Setup keymaps
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '[g', '<cmd>Gitsigns prev_hunk<CR>', {})
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', ']g', '<cmd>Gitsigns next_hunk<CR>', {})
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>gd', '<cmd>Gitsigns diffthis<CR>', {})
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>gq', '<cmd>Gitsigns setqflist<CR>', {})
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>gl', '<cmd>Gitsigns setloclist<CR>', {})
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>hp', '<cmd>Gitsigns preview_hunk<CR>', {})
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>hs', '<cmd>Gitsigns stage_hunk<CR>', {})
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>hr', '<cmd>Gitsigns reset_hunk<CR>', {})
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>bs', '<cmd>Gitsigns stage_buffer<CR>', {})
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>br', '<cmd>Gitsigns reset_buffer<CR>', {})
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>bl', '<cmd>Gitsigns blame_line<CR>', {})
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>bt', '<cmd>Gitsigns toggle_current_line_blame<CR>', {})
-        end,
+    signcolumn = true,
+    numhl = true,
+    linehl = true,
+    current_line_blame = true,
+    on_attach = function(bufnr)
+        -- Setup keymaps
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '[g', '<cmd>Gitsigns prev_hunk<CR>', {})
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', ']g', '<cmd>Gitsigns next_hunk<CR>', {})
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>gd', '<cmd>Gitsigns diffthis<CR>', {})
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>gq', '<cmd>Gitsigns setqflist<CR>', {})
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>gl', '<cmd>Gitsigns setloclist<CR>', {})
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>hp', '<cmd>Gitsigns preview_hunk<CR>', {})
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>hs', '<cmd>Gitsigns stage_hunk<CR>', {})
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>hr', '<cmd>Gitsigns reset_hunk<CR>', {})
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>bs', '<cmd>Gitsigns stage_buffer<CR>', {})
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>br', '<cmd>Gitsigns reset_buffer<CR>', {})
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>bl', '<cmd>Gitsigns blame_line<CR>', {})
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>bt', '<cmd>Gitsigns toggle_current_line_blame<CR>', {})
+    end,
 }
diff --git a/lua/config_plugins/config_lualine.lua b/lua/config_plugins/config_lualine.lua
index 330800c8..b29ce587 100644
--- a/lua/config_plugins/config_lualine.lua
+++ b/lua/config_plugins/config_lualine.lua
@@ -1,11 +1,11 @@
 require('lualine').setup{
-        options = {
-                icons_enabled = true,
-                theme = 'auto',
-        },
-        sections = {
-                -- lualine_x = {'encoding', 'fileformat', 'filetype'},
-                lualine_x = {'aerial', 'filetype'}
-        },
-        extensions = {'aerial', 'fugitive', 'fzf', 'nvim-tree', 'toggleterm'}
+    options = {
+        icons_enabled = true,
+        theme = 'auto',
+    },
+    sections = {
+        -- lualine_x = {'encoding', 'fileformat', 'filetype'},
+        lualine_x = {'aerial', 'filetype'}
+    },
+    extensions = {'aerial', 'fugitive', 'fzf', 'nvim-tree', 'toggleterm'}
 }
diff --git a/lua/config_plugins/config_nightfox.lua b/lua/config_plugins/config_nightfox.lua
index 37b42c7b..bb79eb60 100644
--- a/lua/config_plugins/config_nightfox.lua
+++ b/lua/config_plugins/config_nightfox.lua
@@ -1,14 +1,14 @@
 require('nightfox').setup{
-        modules = {
-                aerial = true,
-                cmp = true,
-                diagnostic = true,
-                fidget = true,
-                gitgutter = true,
-                hop = true,
-                lsp_trouble = true,
-                nvimtree = true,
-                telescope = true,
-                treesitter = true,
-        },
+    modules = {
+        aerial = true,
+        cmp = true,
+        diagnostic = true,
+        fidget = true,
+        gitgutter = true,
+        hop = true,
+        lsp_trouble = true,
+        nvimtree = true,
+        telescope = true,
+        treesitter = true,
+    },
 }
diff --git a/lua/config_plugins/config_nvim-tree.lua b/lua/config_plugins/config_nvim-tree.lua
index 216b81b5..6818a655 100644
--- a/lua/config_plugins/config_nvim-tree.lua
+++ b/lua/config_plugins/config_nvim-tree.lua
@@ -1,9 +1,9 @@
 vim.g.loaded = 1
 vim.g.loaded_netrwPlugin = 1
 require('nvim-tree').setup{
-        filters = { custom = { "^.git$" } },
-        renderer = {
-                group_empty = true,
-                highlight_git = true,
-        },
+    filters = { custom = { "^.git$" } },
+    renderer = {
+        group_empty = true,
+        highlight_git = true,
+    },
 }
diff --git a/lua/config_plugins/config_sniprun.lua b/lua/config_plugins/config_sniprun.lua
index 1d74c063..ea38bec0 100644
--- a/lua/config_plugins/config_sniprun.lua
+++ b/lua/config_plugins/config_sniprun.lua
@@ -1,7 +1,7 @@
 require('sniprun').setup{
-        selected_interpreters = { 'Python3_fifo' },
-        repl_enable = {'Python3_fifo'},
-        display = {
-                "NvimNotify"
-        },
+    selected_interpreters = { 'Python3_fifo' },
+    repl_enable = {'Python3_fifo'},
+    display = {
+        "NvimNotify"
+    },
 }
diff --git a/lua/config_plugins/config_telescope.lua b/lua/config_plugins/config_telescope.lua
index 53c93f71..6777a774 100644
--- a/lua/config_plugins/config_telescope.lua
+++ b/lua/config_plugins/config_telescope.lua
@@ -5,10 +5,10 @@ local actions = require('telescope.actions')
 local trouble = require('trouble.providers.telescope')
 
 require('telescope').setup{
-        defaults = {
-                mappings = {
-                        i = { ["<c-t>"] = trouble.open_with_trouble },
-                        n = { ["<c-t>"] = trouble.open_with_trouble },
-                },
+    defaults = {
+        mappings = {
+            i = { ["<c-t>"] = trouble.open_with_trouble },
+            n = { ["<c-t>"] = trouble.open_with_trouble },
         },
+    },
 }
diff --git a/lua/config_plugins/config_toggleterm.lua b/lua/config_plugins/config_toggleterm.lua
index bd603bc5..7980017a 100644
--- a/lua/config_plugins/config_toggleterm.lua
+++ b/lua/config_plugins/config_toggleterm.lua
@@ -1,17 +1,17 @@
 require('toggleterm').setup{
-        direction = 'float',
-        open_mapping = [[\t]],
-        size = 20,
-        hide_numbers = true, -- hide the number column in toggleterm buffers
-        persist_size = false,
+    direction = 'float',
+    open_mapping = [[\t]],
+    size = 20,
+    hide_numbers = true, -- hide the number column in toggleterm buffers
+    persist_size = false,
 }
 
 function _G.set_terminal_keymaps()
-        local opts = {buffer = 0}
-        vim.keymap.set('t', '<C-h>', [[<Cmd>wincmd h<CR>]], opts)
-        vim.keymap.set('t', '<C-j>', [[<Cmd>wincmd j<CR>]], opts)
-        vim.keymap.set('t', '<C-k>', [[<Cmd>wincmd k<CR>]], opts)
-        vim.keymap.set('t', '<C-l>', [[<Cmd>wincmd l<CR>]], opts)
+    local opts = {buffer = 0}
+    vim.keymap.set('t', '<C-h>', [[<Cmd>wincmd h<CR>]], opts)
+    vim.keymap.set('t', '<C-j>', [[<Cmd>wincmd j<CR>]], opts)
+    vim.keymap.set('t', '<C-k>', [[<Cmd>wincmd k<CR>]], opts)
+    vim.keymap.set('t', '<C-l>', [[<Cmd>wincmd l<CR>]], opts)
 end
 
 vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()')
diff --git a/lua/config_plugins/config_treesitter.lua b/lua/config_plugins/config_treesitter.lua
index d4aecf84..1d92d851 100644
--- a/lua/config_plugins/config_treesitter.lua
+++ b/lua/config_plugins/config_treesitter.lua
@@ -13,6 +13,7 @@ require'nvim-treesitter.configs'.setup {
         highlight = {
                 enable = true,
                 additional_vim_regex_highlighting = false,
+                disable = {'help'},
         },
 }
 
diff --git a/lua/keymaps.lua b/lua/keymaps.lua
index c08f31e4..d99928d8 100644
--- a/lua/keymaps.lua
+++ b/lua/keymaps.lua
@@ -1,13 +1,13 @@
 local function map(mode, shortcut, command)
-        vim.api.nvim_set_keymap(mode, shortcut, command, { noremap = true, silent = true })
+    vim.api.nvim_set_keymap(mode, shortcut, command, { noremap = true, silent = true })
 end
 
 local function nmap(shortcut, command)
-        map('n', shortcut, command)
+    map('n', shortcut, command)
 end
 
 local function imap(shortcut, command)
-        map('i', shortcut, command)
+    map('i', shortcut, command)
 end
 
 vim.g.mapleader=' '
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 73713f8d..45ddbe5e 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -6,117 +6,118 @@ vim.cmd([[
 ]])
 
 require('packer').startup(function(use)
-        use 'wbthomason/packer.nvim'
-        use 'rcarriga/nvim-notify'
-        use 'kyazdani42/nvim-web-devicons'
-        use 'nvim-lua/plenary.nvim'
-        use 'christoomey/vim-tmux-navigator'
-        use 'neovim/nvim-lspconfig'
-        use 'hrsh7th/cmp-nvim-lsp'
-        use 'hrsh7th/cmp-buffer'
-        use 'hrsh7th/cmp-path'
-        use 'hrsh7th/cmp-cmdline'
-        use 'hrsh7th/cmp-nvim-lua'
-        use 'hrsh7th/nvim-cmp'
-        use 'hrsh7th/cmp-vsnip'
-        use 'hrsh7th/vim-vsnip'
-        use {
-                'EdenEast/nightfox.nvim',
-                config = function ()
-                        require 'config_plugins.config_nightfox'
-                end
-        }
-        use {
-                'nvim-treesitter/nvim-treesitter',
-                run = ':TSUpdate',
-                config = function ()
-                        require 'config_plugins.config_treesitter'
-                end
-        }
-        use {
-                'j-hui/fidget.nvim',
-                config = function ()
-                        require('fidget').setup()
-                end
-        }
-        use {
-                'stevearc/aerial.nvim',
-                branch = 'nvim-0.5',
-                config = function ()
-                        require 'config_plugins.config_aerial'
-                end
-        }
-        use {
-                'tpope/vim-fugitive',
-                opt = true,
-                cmd = {'G', 'Git'}
-        }
-        use {
-                'https://github.com/lewis6991/gitsigns.nvim.git',
-                config = function ()
-                        require 'config_plugins.config_gitsigns'
-                end
-        }
-        use {
-                'nvim-lualine/lualine.nvim',
-                config = function ()
-                        require 'config_plugins.config_lualine'
-                end
-        }
-        use {
-                'kyazdani42/nvim-tree.lua',
-                opt = true,
-                cmd = {'NvimTreeToggle', 'NvimTreeFindFile'},
-                config = function()
-                        require 'config_plugins.config_nvim-tree'
-                end
-        }
-        use {
-                'akinsho/toggleterm.nvim',
-                tag = 'v2.*',
-                config = function ()
-                        require 'config_plugins.config_toggleterm'
-                end
-        }
-        use {
-                'nvim-telescope/telescope.nvim',
-                branch = '0.1.x',
-                requires = {
-                        {'nvim-lua/plenary.nvim'}
-                },
-                config = function ()
-                        require 'config_plugins.config_telescope'
-                end
-        }
-        use {
-                'nvim-telescope/telescope-fzf-native.nvim',
-                run = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build'
-        }
-        use {
-                'michaelb/sniprun',
-                run = 'bash install.sh',
-                opt = true,
-                cmd = {'SnipRun', 'SnipInfo', 'SnipReset'},
-                config = function ()
-                        require 'config_plugins.config_sniprun'
-                end
-        }
-        use {
-                'phaazon/hop.nvim',
-                config = function ()
-                        require('hop').setup()
-                end
-        }
-        use {
-                'folke/trouble.nvim',
-                config = function ()
-                        require('trouble').setup()
-                end
-        }
-        use {
-                "lukas-reineke/indent-blankline.nvim",
-                config = function ()
-                        require('indent_blankline').setup()
-                end
-        }
+    use 'wbthomason/packer.nvim'
+    use 'rcarriga/nvim-notify'
+    use 'kyazdani42/nvim-web-devicons'
+    use 'nvim-lua/plenary.nvim'
+    use 'christoomey/vim-tmux-navigator'
+    use 'neovim/nvim-lspconfig'
+    use 'hrsh7th/cmp-nvim-lsp'
+    use 'hrsh7th/cmp-buffer'
+    use 'hrsh7th/cmp-path'
+    use 'hrsh7th/cmp-cmdline'
+    use 'hrsh7th/cmp-nvim-lua'
+    use 'hrsh7th/nvim-cmp'
+    use 'hrsh7th/cmp-vsnip'
+    use 'hrsh7th/vim-vsnip'
+    use {
+        'EdenEast/nightfox.nvim',
+        config = function ()
+            require 'config_plugins.config_nightfox'
+        end
+    }
+    use {
+        'nvim-treesitter/nvim-treesitter',
+        run = ':TSUpdate',
+        config = function ()
+            require 'config_plugins.config_treesitter'
+        end
+    }
+    use {
+        'j-hui/fidget.nvim',
+        config = function ()
+            require('fidget').setup()
+        end
+    }
+    use {
+        'stevearc/aerial.nvim',
+        branch = 'nvim-0.5',
+        config = function ()
+            require 'config_plugins.config_aerial'
+        end
+    }
+    use {
+        'tpope/vim-fugitive',
+        opt = true,
+        cmd = {'G', 'Git'}
+    }
+    use {
+        'https://github.com/lewis6991/gitsigns.nvim.git',
+        tag = 'release',
+        config = function ()
+            require 'config_plugins.config_gitsigns'
+        end
+    }
+    use {
+        'nvim-lualine/lualine.nvim',
+        config = function ()
+            require 'config_plugins.config_lualine'
+        end
+    }
+    use {
+        'kyazdani42/nvim-tree.lua',
+        opt = true,
+        cmd = {'NvimTreeToggle', 'NvimTreeFindFile'},
+        config = function()
+            require 'config_plugins.config_nvim-tree'
+        end
+    }
+    use {
+        'akinsho/toggleterm.nvim',
+        tag = 'v2.*',
+        config = function ()
+            require 'config_plugins.config_toggleterm'
+        end
+    }
+    use {
+        'nvim-telescope/telescope.nvim',
+        branch = '0.1.x',
+        requires = {
+            {'nvim-lua/plenary.nvim'}
+        },
+        config = function ()
+            require 'config_plugins.config_telescope'
+        end
+    }
+    use {
+        'nvim-telescope/telescope-fzf-native.nvim',
+        run = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build'
+    }
+    use {
+        'michaelb/sniprun',
+        run = 'bash install.sh',
+        opt = true,
+        cmd = {'SnipRun', 'SnipInfo', 'SnipReset'},
+        config = function ()
+            require 'config_plugins.config_sniprun'
+        end
+    }
+    use {
+        'phaazon/hop.nvim',
+        config = function ()
+            require('hop').setup()
+        end
+    }
+    use {
+        'folke/trouble.nvim',
+        config = function ()
+            require('trouble').setup()
+        end
+    }
+    use {
+        "lukas-reineke/indent-blankline.nvim",
+        config = function ()
+            require('indent_blankline').setup()
+        end
+    }
 end)