From 548ab61ee1bd259ea3ba8b34a86c1ff16839155a Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Sat, 15 Apr 2023 10:59:31 +0200
Subject: [PATCH] Neovim: ident, describe keys, minor fixes.

---
 nvim/init.lua | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/nvim/init.lua b/nvim/init.lua
index 890ec0e..473426a 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -25,12 +25,22 @@ require("lazy").setup({
   "nvim-lualine/lualine.nvim",
   "nvim-treesitter/nvim-treesitter",
   "tanvirtin/monokai.nvim",
+  "lukas-reineke/indent-blankline.nvim",
   { "nvim-telescope/telescope.nvim",
     dependencies = { 'nvim-lua/plenary.nvim' }
   },
   { "nvim-tree/nvim-tree.lua",
     dependencies = { "nvim-tree/nvim-web-devicons" }
-  }
+  },
+  {
+    "folke/which-key.nvim",
+    config = function()
+      vim.o.timeout = true
+      vim.o.timeoutlen = 300
+      require("which-key").setup({
+      })
+    end,
+  },
 })
 
 -- start & setup plugins
@@ -68,9 +78,13 @@ require("lualine").setup({
   },
 })
 require("nvim-treesitter.configs").setup({
-    build = ":TSUpdate",
-    ensure_installed = { "bash", "python", "terraform", "vim", "yaml" },
-    highlight = { enable = true },
+  build = ":TSUpdate",
+  ensure_installed = { "bash", "python", "terraform", "vim", "yaml" },
+  highlight = {
+    enable = true,
+    use_languagetree = true,
+  },
+  indent = { enable = true },
 })
 require("nvim-tree").setup({
   sort_by = "case_sensitive",
@@ -78,9 +92,13 @@ require("nvim-tree").setup({
     group_empty = true,
   },
   view = {
-    width = 80,
+    adaptive_size = true,
   },
 })
+require("indent_blankline").setup({
+    show_current_context = true,
+    show_current_context_start = true,
+})
 
 -- modify colorcheme
 vim.api.nvim_set_hl(0, "Normal", { bg = NONE })
@@ -120,21 +138,21 @@ vim.opt.softtabstop = 2
 vim.g.mapleader = " "
 vim.keymap.set("i", "<C-a>", "<esc>I", { silent = true })
 vim.keymap.set("i", "<C-e>", "<esc>A", { silent = true })
-vim.keymap.set("n", "<C-x>", ":bd<cr>", { 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>c", ':execute "set colorcolumn=" . (&colorcolumn == "" ? "80,120" : "")<cr>', { silent = true, desc = "toggle column" })
 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>h", ":set hlsearch!<cr>", { silent = true })
-vim.keymap.set("n", "<leader>j", ":bprevious<cr>", { silent = true })
-vim.keymap.set("n", "<leader>k", ":bnext<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", "<leader>t", ":NvimTreeToggle<cr>", { silent = true })
+vim.keymap.set("n", "<leader>h", ":set hlsearch!<cr>", { silent = true, desc = "toggle hlsearch" })
+vim.keymap.set("n", "<leader>j", ":bprevious<cr>", { silent = true, desc = "previous buffer" })
+vim.keymap.set("n", "<leader>k", ":bnext<cr>", { silent = true, desc = "next buffer" })
+vim.keymap.set("n", "<leader>n", ":set nonumber!<cr>:Gitsigns toggle_signs<cr>", { silent = true, desc = "toggle decorations" })
+vim.keymap.set("n", "<leader>s", ":set spell!<cr>", { silent = true, desc = "toggle spell" })
+vim.keymap.set("n", "<leader>t", ":NvimTreeToggle<cr>", { silent = true, desc = "toggle tree" })
+vim.keymap.set("n", "<leader>x", ":bd<cr>", { silent = true, desc = "close buffer" })
 vim.keymap.set("n", "<tab>", "<C-w>w", { silent = true })
 
 -- autocmd
-vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, {
+vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
   pattern = {"*.gotmpl"},
   callback = function() vim.bo.filetype = "yaml" end,
 })