From a05c7ef81c694ec80650a860c40134cf22dce928 Mon Sep 17 00:00:00 2001 From: Martin Larsson Date: Thu, 2 Jan 2025 10:55:42 +0100 Subject: [PATCH] Remove different highlighting for edgetools, also, remove trouble symbols window --- home/.config/nvim/lua/plugs/catppuccin.lua | 45 ---------------- home/.config/nvim/lua/plugs/trouble.lua | 60 ---------------------- home/.config/nvim/lua/terminal.lua | 1 - 3 files changed, 106 deletions(-) diff --git a/home/.config/nvim/lua/plugs/catppuccin.lua b/home/.config/nvim/lua/plugs/catppuccin.lua index 42b04b4..290f081 100644 --- a/home/.config/nvim/lua/plugs/catppuccin.lua +++ b/home/.config/nvim/lua/plugs/catppuccin.lua @@ -1,22 +1,8 @@ -local function add_new_custom_highlights() - local colors = require("catppuccin.palettes.macchiato"); - local highlights = { - { name = "EdgeTool", config = { bg = colors.mantle, fg = colors.text } }, - { name = "EdgeToolBorder", config = { bg = colors.mantle, fg = colors.lavender } }, - } - - for _, highlight in ipairs(highlights) do - vim.api.nvim_set_hl(0, highlight.name, highlight.config) - end -end - return { "catppuccin/nvim", name = "catppuccin", priority = 1000, config = function() - add_new_custom_highlights() - require("catppuccin").setup({ flavour = "macchiato", background = { @@ -54,40 +40,9 @@ return { CmpItemMenu = { fg = colors.overlay2 }, CopilotSuggestion = { fg = colors.overlay2 }, - Pmenu = { link = "EdgeTool" }, - PmenuSel = { bg = colors.overlay0 }, - - -- Telescope - TelescopeNormal = { link = "EdgeTool" }, - TelescopeBorder = { link = "EdgeToolBorder" }, - TelescopePromptNormal = { link = "EdgeTool" }, - TelescopePromptBorder = { link = "EdgeToolBorder" }, - TelescopeResultsNormal = { link = "EdgeTool" }, - TelescopeResultsBorder = { link = "EdgeToolBorder" }, - TelescopePreviewNormal = { link = "EdgeTool" }, - TelescopePreviewBorder = { link = "EdgeToolBorder" }, - - -- -- Trouble - -- TroubleNormal = { bg = colors.red }, - -- TroubleCount = { bg = colors.red }, - -- TroubleCode = { bg = colors.red }, - -- TroubleText = { bg = colors.red }, - -- Saga - SagaNormal = { link = "EdgeTool" }, - SagaBorder = { link = "EdgeToolBorder" }, ActionPreviewTitle = { bg = colors.mantle }, - -- Mason - Mason = { link = "EdgeTool" }, - MasonNormal = { link = "EdgeTool" }, - - -- Lazy - LazyNormal = { link = "EdgeTool" }, - - -- Notify - NotifyBackground = { link = "EdgeTool" }, - -- Leap LeapLabelPrimary = { bg = colors.green, fg = colors.base }, LeapBackdrop = { link = "Comment" }, diff --git a/home/.config/nvim/lua/plugs/trouble.lua b/home/.config/nvim/lua/plugs/trouble.lua index f248d2c..5313699 100644 --- a/home/.config/nvim/lua/plugs/trouble.lua +++ b/home/.config/nvim/lua/plugs/trouble.lua @@ -23,61 +23,6 @@ local function setup_autosize_callback() }) end -local function change_trouble_highlight_background(color_palette) - local highlights = { - -- "TroubleCode", - -- "TroubleCount", - -- "TroubleDirectory", - -- "TroubleFilename", - -- "TroubleIconArray", - -- "TroubleIconBoolean", - -- "TroubleIconClass", - -- "TroubleIconConstant", - -- "TroubleIconConstructor", - -- "TroubleIconDirectory", - -- "TroubleIconEnum", - -- "TroubleIconEnumMember", - -- "TroubleIconEvent", - -- "TroubleIconField", - -- "TroubleIconFile", - -- "TroubleIconFunction", - -- "TroubleIconInterface", - -- "TroubleIconKey", - -- "TroubleIconMethod", - -- "TroubleIconModule", - -- "TroubleIconNamespace", - -- "TroubleIconNull", - -- "TroubleIconNumber", - -- "TroubleIconObject", - -- "TroubleIconOperator", - -- "TroubleIconPackage", - -- "TroubleIconProperty", - -- "TroubleIconString", - -- "TroubleIconStruct", - -- "TroubleIconTypeParameter", - -- "TroubleIconVariable", - -- "TroubleIndent", - -- "TroubleIndentFoldClosed", - -- "TroubleIndentFoldOpen", - -- "TroubleIndentLast", - -- "TroubleIndentMiddle", - -- "TroubleIndentTop", - -- "TroubleIndentWs", - -- "TroubleNormal", - -- "TroubleNormalNC", - -- "TroublePos", - -- "TroublePreview", - -- "TroubleSource", - -- "TroubleText", - } - - for _, highlight in ipairs(highlights) do - local current_highlight = vim.api.nvim_get_hl(0, { name = highlight }) - current_highlight.bg = "#1e2030" -- color_palette.mantle - vim.api.nvim_set_hl(0, highlight, current_highlight) - end -end - return { "folke/trouble.nvim", event = "VeryLazy", @@ -87,7 +32,6 @@ return { trouble.setup({}) local utils = require("utils") - change_trouble_highlight_background() setup_autosize_callback() local function toggle_trouble_mode(mode_to_toggle) @@ -103,10 +47,6 @@ return { keys = "x", mode = "diagnostics" }, - { - keys = "ls", - mode = "symbols" - }, { keys = "ll", mode = "loclist" diff --git a/home/.config/nvim/lua/terminal.lua b/home/.config/nvim/lua/terminal.lua index 165c86f..e17f2c5 100644 --- a/home/.config/nvim/lua/terminal.lua +++ b/home/.config/nvim/lua/terminal.lua @@ -34,7 +34,6 @@ local function toggle_terminal() vim.api.nvim_win_set_height(terminal_window, height) vim.api.nvim_win_set_option(terminal_window, "winfixheight", true) - vim.api.nvim_win_set_option(terminal_window, "winhighlight", "Normal:EdgeTool,FloatBorder:EdgeTool") utils.lock_buf_to_window(terminal_window, terminal_bufnr, "terminal") vim.api.nvim_command("startinsert") end