From 9e3b58d72c2464a96dcd96ef4c141f193a201fe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Sun, 24 Sep 2023 21:22:22 +0200 Subject: [PATCH] Neovim changes to plugins --- .config/nvim/lua/plugins/bbq.lua | 4 +- .config/nvim/lua/plugins/block.lua | 2 +- .config/nvim/lua/plugins/bufferline.lua | 97 +++++++++++-------- .config/nvim/lua/plugins/catppuccin.lua | 40 ++++++-- .config/nvim/lua/plugins/endwise.lua | 6 ++ .config/nvim/lua/plugins/hardtime.lua.bak | 12 +-- .config/nvim/lua/plugins/indent-blankline.lua | 24 +++++ .config/nvim/lua/plugins/lualine.lua | 2 +- .config/nvim/lua/plugins/neo-tree.lua | 5 +- .config/nvim/lua/plugins/nerdy.lua | 13 +++ .../nvim/lua/plugins/telescope-all-recent.lua | 3 + 11 files changed, 145 insertions(+), 63 deletions(-) create mode 100644 .config/nvim/lua/plugins/endwise.lua create mode 100644 .config/nvim/lua/plugins/indent-blankline.lua create mode 100644 .config/nvim/lua/plugins/nerdy.lua diff --git a/.config/nvim/lua/plugins/bbq.lua b/.config/nvim/lua/plugins/bbq.lua index f889e616..9f819d4e 100644 --- a/.config/nvim/lua/plugins/bbq.lua +++ b/.config/nvim/lua/plugins/bbq.lua @@ -8,6 +8,8 @@ return { "nvim-tree/nvim-web-devicons", -- optional dependency }, event = "BufRead", - opts = {}, + opts = { + theme = "catppuccin-macchiato", + }, }, } diff --git a/.config/nvim/lua/plugins/block.lua b/.config/nvim/lua/plugins/block.lua index e79f0755..d5e2b3a2 100644 --- a/.config/nvim/lua/plugins/block.lua +++ b/.config/nvim/lua/plugins/block.lua @@ -1,7 +1,7 @@ return { { "HampusHauffman/block.nvim", - keys = { { "ub", ":Block", desc = "Toggle Block" } }, + keys = { { "ub", ":Block", desc = "Toggle Block" } }, config = function() require("block").setup({ percent = 0.9, diff --git a/.config/nvim/lua/plugins/bufferline.lua b/.config/nvim/lua/plugins/bufferline.lua index 9ae44331..8cb9e318 100644 --- a/.config/nvim/lua/plugins/bufferline.lua +++ b/.config/nvim/lua/plugins/bufferline.lua @@ -1,48 +1,59 @@ +local macchiato = require("catppuccin.palettes").get_palette("macchiato") return { - { - "akinsho/bufferline.nvim", - event = "VeryLazy", - keys = { - { "bp", "BufferLineTogglePin", desc = "Toggle pin" }, - { "bP", "BufferLineGroupClose ungrouped", desc = "Delete non-pinned buffers" }, - }, - opts = { - options = { - -- stylua: ignore - close_command = function(n) require("mini.bufremove").delete(n, false) end, - -- stylua: ignore - separator_style = "slope", - highlights = { - fill = { - fg = "#cad3f5", - bg = "#24273a", - }, - background = { - fg = "#cad3f5", - bg = "#24273a", - } + { + "akinsho/bufferline.nvim", + event = "VeryLazy", + dependencies = { + "catppuccin", }, - - right_mouse_command = function(n) - require("mini.bufremove").delete(n, false) - end, - diagnostics = "nvim_lsp", - always_show_bufferline = false, - diagnostics_indicator = function(_, _, diag) - local icons = require("lazyvim.config").icons.diagnostics - local ret = (diag.error and icons.Error .. diag.error .. " " or "") - .. (diag.warning and icons.Warn .. diag.warning or "") - return vim.trim(ret) - end, - offsets = { - { - filetype = "neo-tree", - text = "Neo-tree", - highlight = "Directory", - text_align = "left", - }, + keys = { + { "bp", "BufferLineTogglePin", desc = "Toggle pin" }, + { "bP", "BufferLineGroupClose ungrouped", desc = "Delete non-pinned buffers" }, + }, + opts = { + highlights = require("catppuccin.groups.integrations.bufferline").get({ + styles = { "italic", "bold" }, + custom = { + all = { + fill = { bg = macchiato.mantle }, + background = { bg = macchiato.mantle }, + }, + }, + }), + options = { + buffer_close_icon = "", + modified_icon = "", + close_icon = "", + color_icons = true, + close_command = function(n) + require("mini.bufremove").delete(n, false) + end, + separator_style = "slope", + right_mouse_command = function(n) + require("mini.bufremove").delete(n, false) + end, + themable = true, + view = "multiwindow", + indicator = { + style = "underline", + }, + diagnostics = "nvim_lsp", + always_show_bufferline = false, + diagnostics_indicator = function(_, _, diag) + local icons = require("lazyvim.config").icons.diagnostics + local ret = (diag.error and icons.Error .. diag.error .. " " or "") + .. (diag.warning and icons.Warn .. diag.warning or "") + return vim.trim(ret) + end, + offsets = { + { + filetype = "neo-tree", + text = "Neo-tree", + highlight = "Directory", + text_align = "left", + }, + }, + }, }, - }, }, - }, } diff --git a/.config/nvim/lua/plugins/catppuccin.lua b/.config/nvim/lua/plugins/catppuccin.lua index a20f3d6c..bee26092 100644 --- a/.config/nvim/lua/plugins/catppuccin.lua +++ b/.config/nvim/lua/plugins/catppuccin.lua @@ -7,6 +7,12 @@ return { integrations = { alpha = true, cmp = true, + barbecue = { + dim_dirname = true, -- directory name is dimmed by default + bold_basename = true, + dim_context = false, + alt_background = false, + }, dap = { enabled = true, enable_ui = true, -- enable nvim-dap-ui @@ -15,26 +21,42 @@ return { gitsigns = true, illuminate = true, indent_blankline = { enabled = true }, - lsp_trouble = true, mason = true, markdown = true, mini = true, native_lsp = { enabled = true, + virtual_text = { + errors = { "italic" }, + hints = { "italic" }, + warnings = { "italic" }, + information = { "italic" }, + }, underlines = { - errors = { "undercurl" }, - hints = { "undercurl" }, - warnings = { "undercurl" }, - information = { "undercurl" }, + errors = { "underline" }, + hints = { "underline" }, + warnings = { "underline" }, + information = { "underline" }, + }, + inlay_hints = { + background = true, }, }, - navic = { enabled = true, custom_bg = "lualine" }, - neotest = true, + navic = { enabled = false, custom_bg = "lualine" }, + neotest = false, neotree = true, + notifier = false, noice = true, - notify = true, + ufo = true, + overseer = false, + rainbow_delimiters = true, semantic_tokens = true, - telescope = true, + telescope = { + enabled = true, + -- style = "nvchad" + }, + lsp_trouble = false, + symbols_outline = false, treesitter = true, treesitter_context = false, which_key = true, diff --git a/.config/nvim/lua/plugins/endwise.lua b/.config/nvim/lua/plugins/endwise.lua new file mode 100644 index 00000000..7c6b9bc6 --- /dev/null +++ b/.config/nvim/lua/plugins/endwise.lua @@ -0,0 +1,6 @@ +return { + { + "RRethy/nvim-treesitter-endwise", + event = "BufRead", + }, +} diff --git a/.config/nvim/lua/plugins/hardtime.lua.bak b/.config/nvim/lua/plugins/hardtime.lua.bak index 0c468c8d..16f793d8 100644 --- a/.config/nvim/lua/plugins/hardtime.lua.bak +++ b/.config/nvim/lua/plugins/hardtime.lua.bak @@ -18,21 +18,19 @@ return { disable_mouse = false, restricted_keys = { ["h"] = { "n", "x" }, - ["j"] = { "n", "x" }, + ["l"] = { "n", "x" }, ["-"] = { "n", "x" }, ["+"] = { "n", "x" }, ["gj"] = { "n", "x" }, ["gk"] = { "n", "x" }, - [""] = { "n", "x" }, - [""] = { "n", "x" }, [""] = { "n", "x" }, [""] = { "n", "x" }, }, disabled_keys = { - [""] = { "n" }, - [""] = { "n" }, - [""] = { "n" }, - [""] = { "n" }, + [""] = { "" }, + [""] = { "" }, + [""] = { "" }, + [""] = { "" }, }, }, }, diff --git a/.config/nvim/lua/plugins/indent-blankline.lua b/.config/nvim/lua/plugins/indent-blankline.lua new file mode 100644 index 00000000..c9e41f5d --- /dev/null +++ b/.config/nvim/lua/plugins/indent-blankline.lua @@ -0,0 +1,24 @@ +return { + { + "lukas-reineke/indent-blankline.nvim", + event = { "BufReadPost", "BufNewFile" }, + opts = { + -- char = "▏", + char = "│", + filetype_exclude = { + "help", + "alpha", + "dashboard", + "neo-tree", + "Trouble", + "lazy", + "mason", + "notify", + "toggleterm", + "lazyterm", + }, + show_trailing_blankline_indent = false, + show_current_context = false, + }, + }, +} diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua index e14d8306..776e33eb 100644 --- a/.config/nvim/lua/plugins/lualine.lua +++ b/.config/nvim/lua/plugins/lualine.lua @@ -8,7 +8,7 @@ return { return { options = { - theme = "auto", + theme = "catppuccin", globalstatus = true, disabled_filetypes = { statusline = { "dashboard", "alpha" } }, }, diff --git a/.config/nvim/lua/plugins/neo-tree.lua b/.config/nvim/lua/plugins/neo-tree.lua index 4c5524a4..fecd27a3 100644 --- a/.config/nvim/lua/plugins/neo-tree.lua +++ b/.config/nvim/lua/plugins/neo-tree.lua @@ -34,7 +34,10 @@ return { end, opts = { sources = { "filesystem", "git_status", "buffers", "document_symbols" }, - + -- source_selector = { + -- winbar = true, + -- statusline = true, + -- }, open_files_do_not_replace_types = { "terminal", "Trouble", "qf", "Outline" }, enable_git_status = true, enable_diagnostics = true, diff --git a/.config/nvim/lua/plugins/nerdy.lua b/.config/nvim/lua/plugins/nerdy.lua new file mode 100644 index 00000000..8387e1a5 --- /dev/null +++ b/.config/nvim/lua/plugins/nerdy.lua @@ -0,0 +1,13 @@ +return { + { + "2kabhishek/nerdy.nvim", + dependencies = { + "stevearc/dressing.nvim", + "nvim-telescope/telescope.nvim", + }, + cmd = "Nerdy", + keys = { + { "sN", "Nerdy", desc = "Nerd Fonts" }, + }, + }, +} diff --git a/.config/nvim/lua/plugins/telescope-all-recent.lua b/.config/nvim/lua/plugins/telescope-all-recent.lua index cdb38c65..3556cc0c 100644 --- a/.config/nvim/lua/plugins/telescope-all-recent.lua +++ b/.config/nvim/lua/plugins/telescope-all-recent.lua @@ -13,6 +13,9 @@ return { disable = false, sorting = "frecency", }, + ["yanky.nvim#yank_history"] = { + disable = true, + }, }, }) end,