From 1f81bc57df4c64cb16aae38c79d597764fb06b45 Mon Sep 17 00:00:00 2001 From: Michael Peters Date: Mon, 28 Feb 2022 08:54:52 -0600 Subject: [PATCH] git gutter + indentation --- lua/configs/indent-blankline.lua | 60 ++++++++++++++++++++++++++++++++ lua/plugins.lua | 7 ++-- todo.txt | 14 ++++---- 3 files changed, 70 insertions(+), 11 deletions(-) create mode 100644 lua/configs/indent-blankline.lua diff --git a/lua/configs/indent-blankline.lua b/lua/configs/indent-blankline.lua new file mode 100644 index 0000000..5d8a36d --- /dev/null +++ b/lua/configs/indent-blankline.lua @@ -0,0 +1,60 @@ +local M = {} + +function M.config() + local status_ok, indent_blankline = pcall(require, "indent_blankline") + if not status_ok then + return + end + + vim.g.indentLine_enabled = 1 + vim.g.indent_blankline_show_trailing_blankline_indent = false + vim.g.indent_blankline_show_first_indent_level = true + vim.g.indent_blankline_use_treesitter = true + vim.g.indent_blankline_show_current_context = true + vim.g.indent_blankline_char = "▏" + vim.g.indent_blankline_buftype_exclude = { + "nofile", + "terminal", + "lsp-installer", + "lspinfo", + } + vim.g.indent_blankline_filetype_exclude = { + "help", + "startify", + "dashboard", + "packer", + "neogitstatus", + "NvimTree", + "Trouble", + } + vim.g.indent_blankline_context_patterns = { + "class", + "return", + "function", + "method", + "^if", + "^while", + "jsx_element", + "^for", + "^object", + "^table", + "block", + "arguments", + "if_statement", + "else_clause", + "jsx_element", + "jsx_self_closing_element", + "try_statement", + "catch_clause", + "import_statement", + "operation_type", + } + + indent_blankline.setup { + show_current_context = true, + show_current_context_start = false, + } +end + +return M + diff --git a/lua/plugins.lua b/lua/plugins.lua index b8dbf69..8d697bb 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -58,11 +58,10 @@ packer.startup { } -- Git marks + use { 'lewis6991/gitsigns.nvim', config = function() require'configs.gitsigns'.config() end } - use { - 'lewis6991/gitsigns.nvim', - config = function() require'configs.gitsigns'.config() end - } + -- Show indentation + use { 'lukas-reineke/indent-blankline.nvim', config = function() require'configs.indent-blankline'.config() end } -- Telescope diff --git a/todo.txt b/todo.txt index 6cea916..bc3fe30 100644 --- a/todo.txt +++ b/todo.txt @@ -16,12 +16,12 @@ [x] vim-bbye [ ] Language Processing - [ ] Treesitter - [ ] nvim-ts-autotag + [x] Treesitter + [x] nvim-ts-autotag [ ] indent-blankline.nvim - [ ] comment - [ ] norcalli/nvim-colorizer.lua - [ ] nvim-ts-context-commentstring + [x] comment + [x] norcalli/nvim-colorizer.lua + [x] nvim-ts-context-commentstring [ ] nvim-autopairs [ ] nvim-lsp-installer [ ] Native LSP @@ -34,8 +34,8 @@ [ ] LuaSnip [ ] nvim-cmp -[ ] Git Integration - [ ] Gitsigns +[x] Git Integration + [x] Gitsigns [ ] Find Files [ ] Telescope