summaryrefslogtreecommitdiff
path: root/lua/user
diff options
context:
space:
mode:
authorchristianchiarulli <chrisatmachine@gmail.com>2021-12-14 18:47:36 -0500
committerChristianChiarulli <chris.machine@pm.me>2021-12-16 07:39:32 -0500
commite07a1d37116bf2aafef18a7f2ef71e45e15ec5cc (patch)
tree77acb9a503185c1374fe8696c8347a2c5a730954 /lua/user
parent5f33318a98845a54b199364b1cd65ef5110e0cb3 (diff)
add indentline
fix t
Diffstat (limited to 'lua/user')
-rw-r--r--lua/user/bufferline.lua8
-rw-r--r--lua/user/indentline.lua70
-rw-r--r--lua/user/keymaps.lua4
-rw-r--r--lua/user/plugins.lua1
4 files changed, 75 insertions, 8 deletions
diff --git a/lua/user/bufferline.lua b/lua/user/bufferline.lua
index 81015c5..7d98cf0 100644
--- a/lua/user/bufferline.lua
+++ b/lua/user/bufferline.lua
@@ -92,12 +92,12 @@ bufferline.setup {
},
close_button = {
- guifg = { attribute = "fg", highlight = "TabLineSel" },
- guibg = { attribute = "bg", highlight = "TabLineSel" },
+ guifg = { attribute = "fg", highlight = "TabLine" },
+ guibg = { attribute = "bg", highlight = "TabLine" },
},
close_button_visible = {
- guifg = { attribute = "fg", highlight = "TabLineSel" },
- guibg = { attribute = "bg", highlight = "TabLineSel" },
+ guifg = { attribute = "fg", highlight = "TabLine" },
+ guibg = { attribute = "bg", highlight = "TabLine" },
},
-- close_button_selected = {
-- guifg = {attribute='fg',highlight='TabLineSel'},
diff --git a/lua/user/indentline.lua b/lua/user/indentline.lua
new file mode 100644
index 0000000..fdf5870
--- /dev/null
+++ b/lua/user/indentline.lua
@@ -0,0 +1,70 @@
+local status_ok, indent_blankline = pcall(require, "indent_blankline")
+if not status_ok then
+ return
+end
+
+vim.g.indent_blankline_buftype_exclude = { "terminal", "nofile" }
+vim.g.indent_blankline_filetype_exclude = {
+ "help",
+ "startify",
+ "dashboard",
+ "packer",
+ "neogitstatus",
+ "NvimTree",
+ "Trouble",
+}
+vim.g.indentLine_enabled = 1
+-- vim.g.indent_blankline_char = "│"
+vim.g.indent_blankline_char = "▏"
+-- vim.g.indent_blankline_char = "▎"
+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_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",
+}
+-- HACK: work-around for https://github.com/lukas-reineke/indent-blankline.nvim/issues/59
+vim.wo.colorcolumn = "99999"
+
+-- vim.cmd [[highlight IndentBlanklineIndent1 guifg=#E06C75 gui=nocombine]]
+-- vim.cmd [[highlight IndentBlanklineIndent2 guifg=#E5C07B gui=nocombine]]
+-- vim.cmd [[highlight IndentBlanklineIndent3 guifg=#98C379 gui=nocombine]]
+-- vim.cmd [[highlight IndentBlanklineIndent4 guifg=#56B6C2 gui=nocombine]]
+-- vim.cmd [[highlight IndentBlanklineIndent5 guifg=#61AFEF gui=nocombine]]
+-- vim.cmd [[highlight IndentBlanklineIndent6 guifg=#C678DD gui=nocombine]]
+-- vim.opt.list = true
+-- vim.opt.listchars:append "space:⋅"
+-- vim.opt.listchars:append "space:"
+-- vim.opt.listchars:append "eol:↴"
+
+indent_blankline.setup({
+ -- show_end_of_line = true,
+ -- space_char_blankline = " ",
+ show_current_context = true,
+ -- show_current_context_start = true,
+ -- char_highlight_list = {
+ -- "IndentBlanklineIndent1",
+ -- "IndentBlanklineIndent2",
+ -- "IndentBlanklineIndent3",
+ -- },
+})
diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua
index 5b07011..bf8afd8 100644
--- a/lua/user/keymaps.lua
+++ b/lua/user/keymaps.lua
@@ -67,9 +67,5 @@ keymap("x", "<A-k>", ":move '<-2<CR>gv-gv", opts)
-- keymap("t", "<C-k>", "<C-\\><C-N><C-w>k", term_opts)
-- keymap("t", "<C-l>", "<C-\\><C-N><C-w>l", term_opts)
--- Comment
-keymap("n", "<leader>/", "<cmd>lua require('Comment').toggle()<CR>", opts)
-keymap("v", "<leader>/", ":lua require(\"Comment.api\").gc(vim.fn.visualmode())<cr>", opts)
-
-- Nvimtree
keymap("n", "<leader>e", ":NvimTreeToggle<cr>", opts)
diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua
index 5588703..58166df 100644
--- a/lua/user/plugins.lua
+++ b/lua/user/plugins.lua
@@ -54,6 +54,7 @@ return packer.startup(function(use)
use "akinsho/toggleterm.nvim"
use "ahmedkhalf/project.nvim"
use 'lewis6991/impatient.nvim'
+ use "lukas-reineke/indent-blankline.nvim"
-- Colorschemes
-- use "lunarvim/colorschemes" -- A bunch of colorschemes you can try out