Browse Source

plugins: added indentLine as a temporal alternative to indent-blankline.nvim

my-config
NTBBloodbath 4 years ago
parent
commit
d640492adb
No known key found for this signature in database GPG Key ID: 18D6730BC846AAC5
  1. 5
      autoload/doom.vim
  2. 21
      autoload/doom/default.vim
  3. 5
      doc/doom_nvim.txt
  4. 11
      doomrc
  5. 8
      lua/plugins.lua

5
autoload/doom.vim

@ -35,11 +35,6 @@ let g:doom_indent = 4
" @default = 1
let g:doom_show_indent = 1
" Show current context on the current indent line
" If this option slows your Neovim, just turn it off.
" @default = 0
let g:doom_show_indent_context = 0
" Expand tabs
" @default = 1
let g:doom_expand_tabs = 1

21
autoload/doom/default.vim

@ -65,24 +65,9 @@ function doom#default#loadGlob()
" Set SPC as the mapleader
let mapleader = ' '
" Indent Lines, disabled until this issue is fixed
" https://github.com/neovim/neovim/issues/14050
" let g:indent_blankline_enabled = g:doom_show_indent
" let g:indent_blankline_char_list = ['|', '¦', '┆', '┊']
" Disable indent lines on dashboard and help
" let g:indent_blankline_filetype_exclude = ['help', 'dashboard', 'NvimTree', 'minimap']
" Disable indent line on first indent
" let g:indent_blankline_show_first_indent_level = v:false
" If treesitter is not disabled, then ...
" if index(g:doom_disabled_plugins, 'treesitter') == -1
" " When on, use treesitter to determine the current context. Then show
" " the indent character in a different highlight. Might be slower.
" " If this option slows your Neovim, just turn off the variable
" " g:doom_show_indent_context
" let g:indent_blankline_show_current_context = g:doom_show_indent_context
" " use treesitter to calculate indentation when possible.
" let g:indent_blankline_use_treesitter = 1
" endif
" Indent Lines
let g:indentLine_enabled = g:doom_show_indent
let g:indentLine_char_list = ['|', '¦', '┆', '┊']
" NOTE: most of Doom Nvim plugins are written in Lua, their configs
" resides in the `lua/configs/` directory.

5
doc/doom_nvim.txt

@ -108,11 +108,6 @@ Specifies the width of tabs and shifttabs
default value = 1
Show Indent Lines
`g:doom_show_indent_context`
default value = 0
Show current context on the current indent line.
If this option slows your Neovim, just turn it off.
`g:doom_expand_tabs`
default value = 1
Specifies if spaces or tabs must be used

11
doomrc

@ -32,16 +32,9 @@ let g:doom_preserve_edit_pos = 0
let g:doom_indent = 4
" Show indent lines
" NOTE: unused at the moment, waiting for this to be fixed
" https://github.com/neovim/neovim/issues/14050
" @default = 1
let g:doom_show_indent = 1
" Show current context on the current indent line
" If this option slows your Neovim, just turn it off.
" @default = 0
let g:doom_show_indent_context = 0
" Expand tabs
" Specifies if spaces or tabs must be used
" 0 : spaces
@ -92,10 +85,10 @@ let g:doom_colorscheme_bg = 'dark'
let g:doom_check_updates = 0
" Disabled plugins
" @default = ['indentlines']
" @default = []
" example:
" let g:doom_disabled_plugins = ['emmet-vim']
let g:doom_disabled_plugins = ['indentlines']
let g:doom_disabled_plugins = []
" Disabled plugins modules
" @default = ['git', 'lsp', 'web']

8
lua/plugins.lua

@ -279,18 +279,14 @@ return packer.startup(function()
'windwp/nvim-autopairs',
disable = (disabled_files and true or disabled_autopairs)
}
-- Indent Lines,
-- we use the lua branch for better performance on Neovim Nightly (>=0.5)
-- we have also disabled it until this issue is fixed to avoid visual bugs
-- https://github.com/neovim/neovim/issues/14050
-- Indent Lines
local disabled_indent_lines = has_value(g.doom_disabled_plugins, 'indentlines')
if disabled_files and (not disabled_indent_lines) then
table.insert(disabled_plugins, 'indentlines')
nvim_set_var('doom_disabled_plugins', disabled_plugins)
end
use {
'lukas-reineke/indent-blankline.nvim',
branch = 'lua',
'Yggdroot/indentLine',
disable = (disabled_files and true or disabled_indent_lines)
}
-- EditorConfig support

Loading…
Cancel
Save