From 5bacab1784742733190e85df56261deb6980c121 Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Tue, 14 Dec 2021 18:47:36 -0500 Subject: add indentline --- lua/user/indentline.lua | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ lua/user/plugins.lua | 1 + 2 files changed, 71 insertions(+) create mode 100644 lua/user/indentline.lua (limited to 'lua/user') 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/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 -- cgit v1.2.3 From 95e5604074b7443968f01738f7c556260a13b297 Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Tue, 14 Dec 2021 18:52:22 -0500 Subject: add alpha add alpha fix t --- init.lua | 1 + lua/user/alpha.lua | 42 ++++++++++++++++++++++++++++++++++++++++++ lua/user/bufferline.lua | 8 ++++---- lua/user/keymaps.lua | 4 ---- lua/user/lualine.lua | 2 +- lua/user/plugins.lua | 2 ++ 6 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 lua/user/alpha.lua (limited to 'lua/user') diff --git a/init.lua b/init.lua index ed16382..260ae33 100644 --- a/init.lua +++ b/init.lua @@ -16,3 +16,4 @@ require "user.toggleterm" require "user.project" require "user.impatient" require "user.indentline" +require "user.alpha" diff --git a/lua/user/alpha.lua b/lua/user/alpha.lua new file mode 100644 index 0000000..249a166 --- /dev/null +++ b/lua/user/alpha.lua @@ -0,0 +1,42 @@ +local status_ok, alpha = pcall(require, "alpha") +if not status_ok then + return +end + +local dashboard = require("alpha.themes.dashboard") +dashboard.section.header.val = { + [[ __ ]], + [[ ___ ___ ___ __ __ /\_\ ___ ___ ]], + [[ / _ `\ / __`\ / __`\/\ \/\ \\/\ \ / __` __`\ ]], + [[/\ \/\ \/\ __//\ \_\ \ \ \_/ |\ \ \/\ \/\ \/\ \ ]], + [[\ \_\ \_\ \____\ \____/\ \___/ \ \_\ \_\ \_\ \_\]], + [[ \/_/\/_/\/____/\/___/ \/__/ \/_/\/_/\/_/\/_/]], +} +dashboard.section.buttons.val = { + dashboard.button("f", " Find file", ":Telescope find_files "), + dashboard.button("e", " New file", ":ene startinsert "), + dashboard.button("p", " Find project", ":Telescope projects "), + dashboard.button("r", " Recently used files", ":Telescope oldfiles "), + dashboard.button("t", " Find text", ":Telescope live_grep "), + dashboard.button("c", " Configuration", ":e ~/.config/nvim/init.lua "), + dashboard.button("q", " Quit Neovim", ":qa"), +} + +local function footer() +-- NOTE: requires the fortune-mod package to work + -- local handle = io.popen("fortune") + -- local fortune = handle:read("*a") + -- handle:close() + -- return fortune + return "chrisatmachine.com" +end + +dashboard.section.footer.val = footer() + +dashboard.section.footer.opts.hl = "Type" +dashboard.section.header.opts.hl = "Include" +dashboard.section.buttons.opts.hl = "Keyword" + +dashboard.opts.opts.noautocmd = true +-- vim.cmd([[autocmd User AlphaReady echo 'ready']]) +alpha.setup(dashboard.opts) 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/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", "", ":move '<-2gv-gv", opts) -- keymap("t", "", "k", term_opts) -- keymap("t", "", "l", term_opts) --- Comment -keymap("n", "/", "lua require('Comment').toggle()", opts) -keymap("v", "/", ":lua require(\"Comment.api\").gc(vim.fn.visualmode())", opts) - -- Nvimtree keymap("n", "e", ":NvimTreeToggle", opts) diff --git a/lua/user/lualine.lua b/lua/user/lualine.lua index 50484cb..3318ecd 100644 --- a/lua/user/lualine.lua +++ b/lua/user/lualine.lua @@ -68,7 +68,7 @@ lualine.setup({ theme = "auto", component_separators = { left = "", right = "" }, section_separators = { left = "", right = "" }, - disabled_filetypes = { "dashboard", "NvimTree", "Outline" }, + disabled_filetypes = { "alpha", "dashboard", "NvimTree", "Outline" }, always_divide_middle = true, }, sections = { diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index 58166df..183b805 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -55,6 +55,8 @@ return packer.startup(function(use) use "ahmedkhalf/project.nvim" use 'lewis6991/impatient.nvim' use "lukas-reineke/indent-blankline.nvim" + use 'goolord/alpha-nvim' + use "antoinemadec/FixCursorHold.nvim" -- This is needed to fix lsp doc highlight -- Colorschemes -- use "lunarvim/colorschemes" -- A bunch of colorschemes you can try out -- cgit v1.2.3