Merge branch 'master' of github.com:roodletoof/neovim-config

init.lua

@@ -46,8 +46,6 @@ vim.cmd [[
 
     nnoremap ,cD :call setqflist(filter(getqflist(), 'v:val != getqflist()[getqflist({"idx": 0}).idx - 1]'))<CR>
 
-    tnoremap <esc> <c-\><c-n>
-    autocmd BufEnter * if &buftype == 'terminal' | :startinsert | endif 
     nnoremap ,t <c-w>v<c-w>l:terminal<CR>a
 
     " Don't include curdir, it just causes pain.
@@ -71,16 +69,10 @@ vim.cmd [[
     autocmd BufEnter *__virtual* setlocal buftype=nofile bufhidden=hide noswapfile
 
     let g:rustfmt_autosave = 1
-]]
 
-vim.g.c_syntax_for_h = 1
+    " remove annoying and bad indentation
-vim.g.python_indent = { -- Fixes retarded default python indentation.
+    autocmd FileType * setlocal indentexpr=
-    open_paren = 'shiftwidth()',
+]]
-    nested_paren = 'shiftwidth()',
-    continue = 'shiftwidth()',
-    closed_paren_align_last_line = false,
-    searchpair_timeout = 300,
-}
 
 local function file_exists(name) --{{{1
     local f = io.open(name,"r")
@@ -312,6 +304,9 @@ require'lazy'.setup{ --{{{1
                 ensure_installed = "all",
                 sync_install = false,
                 auto_install = true,
+                indent = {
+                    enable = true,
+                },
                 highlight = {
                     enable = true,
                     additional_vim_regex_highlighting = false,
@@ -319,6 +314,12 @@ require'lazy'.setup{ --{{{1
             }
         end,
     },
+    { "kdheepak/lazygit.nvim", --{{{2
+        lazy = true,
+        cmd = { "LazyGit", "LazyGitConfig", "LazyGitCurrentFile", "LazyGitFilter", "LazyGitFilterCurrentFile", },
+        dependencies = { "nvim-lua/plenary.nvim", },
+        keys = { { ",g", "<cmd>LazyGit<cr>", desc = "LazyGit" }, },
+    },
     { 'mfussenegger/nvim-dap', --{{{2
         dependencies = {
             'nvim-treesitter/nvim-treesitter',