From c799544b124794a8b727c61df53c415dc219ca12 Mon Sep 17 00:00:00 2001 From: Tony Blyler Date: Wed, 28 Jun 2023 23:03:36 -0400 Subject: [PATCH] Fix neovim treesitter indent colors and utiliez mini.nvim more rather than have more plugins --- .../private_dot_config/nvim/lazy-lock.json | 6 ++--- .../nvim/lua/plugins/bufferline.lua | 9 ------- .../nvim/lua/plugins/indent-blankline.lua | 3 ++- .../nvim/lua/plugins/mini-nvim.lua | 25 ++++++++----------- .../nvim/lua/plugins/statusline.lua | 16 ------------ 5 files changed, 14 insertions(+), 45 deletions(-) delete mode 100644 chezmoi/private_dot_config/nvim/lua/plugins/bufferline.lua delete mode 100644 chezmoi/private_dot_config/nvim/lua/plugins/statusline.lua diff --git a/chezmoi/private_dot_config/nvim/lazy-lock.json b/chezmoi/private_dot_config/nvim/lazy-lock.json index dee6674..bb76086 100644 --- a/chezmoi/private_dot_config/nvim/lazy-lock.json +++ b/chezmoi/private_dot_config/nvim/lazy-lock.json @@ -1,17 +1,15 @@ { - "bufferline.nvim": { "branch": "main", "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, "gitsigns.nvim": { "branch": "main", "commit": "a36bc3360d584d39b4fb076d855c4180842d4444" }, "gruvbox.nvim": { "branch": "main", "commit": "df149bccb19a02c5c2b9fa6ec0716f0c0487feb0" }, "hop.nvim": { "branch": "master", "commit": "03f0434869f1f38868618198b5f4f2ab6d39aef2" }, "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" }, "lazy.nvim": { "branch": "main", "commit": "4c8b625bc873ca76b76eee0c28c98f1f7148f17f" }, - "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "4c3baba22189aa2a08d32bb8d08b32c7e22a2e84" }, - "mason.nvim": { "branch": "main", "commit": "8adaf0bc58ddadd70dad563f949042fb1cb0211c" }, + "mason.nvim": { "branch": "main", "commit": "b68d3be4b664671002221d43c82e74a0f1006b26" }, "mini.nvim": { "branch": "main", "commit": "a4241b6f51393d5e4d91a12d94e386bae287dae5" }, "neodev.nvim": { "branch": "main", "commit": "a2b1d8fb9fa4daa35d3fd9123bccccccbd4a3520" }, - "null-ls.nvim": { "branch": "main", "commit": "bbaf5a96913aa92281f154b08732be2f57021c45" }, + "null-ls.nvim": { "branch": "main", "commit": "b919452c84e461c21a79185bef90c96e1cfecff9" }, "nvim-lsp-basics": { "branch": "main", "commit": "632714bd3ab355eb6e725b5a78cd8730f12d14d2" }, "nvim-lspconfig": { "branch": "master", "commit": "b6b34b9acf84949f0ac1c00747765e62b81fb38d" }, "nvim-treesitter": { "branch": "master", "commit": "e7f2b1276b7aa68099acc8169ce51f7e389b1772" }, diff --git a/chezmoi/private_dot_config/nvim/lua/plugins/bufferline.lua b/chezmoi/private_dot_config/nvim/lua/plugins/bufferline.lua deleted file mode 100644 index 134d1b9..0000000 --- a/chezmoi/private_dot_config/nvim/lua/plugins/bufferline.lua +++ /dev/null @@ -1,9 +0,0 @@ --- See current buffers at the top of the editor -return { - { - "akinsho/bufferline.nvim", - version = "v3.*", - dependencies = "nvim-tree/nvim-web-devicons", - opts = {}, - }, -} diff --git a/chezmoi/private_dot_config/nvim/lua/plugins/indent-blankline.lua b/chezmoi/private_dot_config/nvim/lua/plugins/indent-blankline.lua index b9d6aa9..bf99da0 100644 --- a/chezmoi/private_dot_config/nvim/lua/plugins/indent-blankline.lua +++ b/chezmoi/private_dot_config/nvim/lua/plugins/indent-blankline.lua @@ -4,6 +4,7 @@ return { show_current_context = true, show_current_context_start = true, show_trailing_blankline_indent = false, - char_highlight_list = {"NvimTreeIndentMarker"}, + char_highlight_list = {"Comment"}, + context_highlight_list = {"Special"}, }, } diff --git a/chezmoi/private_dot_config/nvim/lua/plugins/mini-nvim.lua b/chezmoi/private_dot_config/nvim/lua/plugins/mini-nvim.lua index e689445..bbd1e4e 100644 --- a/chezmoi/private_dot_config/nvim/lua/plugins/mini-nvim.lua +++ b/chezmoi/private_dot_config/nvim/lua/plugins/mini-nvim.lua @@ -3,40 +3,35 @@ return { "echasnovski/mini.nvim", config = function() local animate = require("mini.animate") + local timing = animate.gen_timing.linear({ duration = duration, unit = "total" }) animate.setup({ cursor = { - timing = animate.gen_timing.linear({ duration = 100, unit = "total" }) + timing = timing }, scroll = { - timing = animate.gen_timing.linear({ duration = 100, unit = "total" }) + timing = timing }, resize = { - timing = animate.gen_timing.linear({ duration = 100, unit = "total" }) + timing = timing }, open = { - timing = animate.gen_timing.linear({ duration = 100, unit = "total" }) + timing = timing }, close = { - timing = animate.gen_timing.linear({ duration = 100, unit = "total" }) + timing = timing }, }) require("mini.bufremove").setup() require("mini.comment").setup() require("mini.completion").setup() require("mini.cursorword").setup() - require("mini.indentscope").setup({ - options = { - border = "both", - indent_at_cursor = true, - try_as_border = true, - }, - symbol = "│" - }) + require("mini.pairs").setup() + require("mini.tabline").setup() + require("mini.starter").setup() + require("mini.statusline").setup() require("mini.surround").setup() require("mini.trailspace").setup() - vim.opt.list = true - vim.opt.listchars = "tab:│ " vim.api.nvim_command(":command Bd lua MiniBufremove.delete()") vim.api.nvim_command(":command FixWhitespace lua MiniTrailspace.trim()") end, diff --git a/chezmoi/private_dot_config/nvim/lua/plugins/statusline.lua b/chezmoi/private_dot_config/nvim/lua/plugins/statusline.lua deleted file mode 100644 index 89b7d73..0000000 --- a/chezmoi/private_dot_config/nvim/lua/plugins/statusline.lua +++ /dev/null @@ -1,16 +0,0 @@ --- Fancier statusline -return { - "nvim-lualine/lualine.nvim", - config = function() - local colorscheme = require("helpers.colorscheme") - local lualine_theme = colorscheme == "default" and "auto" or colorscheme - require("lualine").setup({ - options = { - icons_enabled = true, - theme = lualine_theme, - component_separators = "|", - section_separators = "", - }, - }) - end, -}