Merge branch 'master' into cla

1 files changed, 54 insertions, 0 deletions

diff --git a/nvim/lua/options.lua b/nvim/lua/options.lua
index 1d4826e..ae802be 100644
--- a/nvim/lua/options.lua
+++ b/nvim/lua/options.lua
@@ -8,6 +8,8 @@ vim.opt.tabstop = 2                 -- number of visual spaces per TAB
 vim.opt.softtabstop = 2             -- number of spaces in tab when editing
 vim.opt.shiftwidth = 2              -- insert 2 spaces on a tab
 vim.opt.expandtab = true            -- tabs are spaces
+vim.opt.smartindent = true
+vim.opt.smarttab = true
 
 -- UI config
 vim.opt.number = true               -- show absolute number
@@ -30,3 +32,55 @@ vim.opt.undolevels = 1000           -- Number of undo levels
 vim.opt.backspace = { "indent", "eol", "start" } -- Backspace behavior
 vim.opt.foldmethod = "marker"
 vim.opt.conceallevel = 2
+
+-- Plugins
+-- emmet
+vim.g.user_emmet_leader_key = '<C-a>'
+
+-- zig
+vim.g.zig_fmt_autosave = 1
+
+-- markdown
+vim.g.vim_markdown_folding_disabled = 1
+vim.g.vim_markdown_folding_level = 3
+vim.g.vim_markdown_toc_autofit = 1
+vim.g.vim_markdown_emphasis_multiline = 0
+vim.g.tex_conceal = ""
+vim.g.vim_markdown_math = 1
+vim.g.vim_markdown_conceal_code_blocks = 1
+vim.g.vim_markdown_fenced_languages = { 'c++=cpp', 'viml=vim', 'bash=sh', 'ini=dosini' }
+vim.g.vim_markdown_follow_anchor = 1
+vim.g.vim_markdown_math = 1
+vim.g.vim_markdown_frontmatter = 1
+vim.g.vim_markdown_toml_frontmatter = 1
+vim.g.vim_markdown_strikethrough = 1
+vim.g.vim_markdown_no_extensions_in_markdown = 1
+vim.g.vim_markdown_autowrite = 1
+vim.g.vim_markdown_auto_insert_bullets = 0
+vim.g.vim_markdown_new_list_item_indent = 0
+vim.g.vim_markdown_edit_url_in = 'tab'
+
+-- NERDTree
+vim.g.NERDTreeGitStatusUseNerdFonts = 1
+vim.g.NERDTreeGitStatusShowClean = 1
+vim.g.NERDTreeDirArrowExpandable = '>'
+vim.g.NERDTreeDirArrowCollapsible = '<'
+vim.g.NERDTreeMapToggleHidden = 'z'
+
+-- goyo
+vim.g.goyo_width = '90%'
+vim.g.goyo_height = '100%'
+
+-- limelight
+vim.g.limelight_conceal_ctermfg = 'gray'
+vim.g.limelight_conceal_guifg = 'gray'
+
+-- devicon
+vim.g.airline_powerline_fonts = 1
+vim.g.webdevicons_enable_nerdtree = 1
+
+-- vim-indent-guides
+vim.g.indent_guides_enable_on_vim_startup = 0
+
+-- vim-signify
+vim.opt.updatetime = 100