From 315bc508ee0bfb62b6608f8f445126158ca2cc35 Mon Sep 17 00:00:00 2001 From: mrtnvgr Date: Fri, 27 Oct 2023 12:55:04 +0700 Subject: [PATCH] plugins/catppuccin: add disableUnderline option (#669) * plugins/catppuccin: add `disableUnderline` option * re-test? * fix ci --- plugins/colorschemes/catppuccin.nix | 3 +++ tests/test-sources/plugins/colorschemes/catppuccin.nix | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/colorschemes/catppuccin.nix b/plugins/colorschemes/catppuccin.nix index 7409b8ff..d59bea95 100644 --- a/plugins/colorschemes/catppuccin.nix +++ b/plugins/colorschemes/catppuccin.nix @@ -62,6 +62,8 @@ in { disableBold = helpers.defaultNullOpts.mkBool false "Force no bold"; + disableUnderline = helpers.defaultNullOpts.mkBool false "Force no underline"; + styles = { comments = helpers.defaultNullOpts.mkNullable (types.listOf types.str) @@ -326,6 +328,7 @@ in { dim_inactive = dimInactive; no_italic = disableItalic; no_bold = disableBold; + no_underline = disableUnderline; color_overrides = colorOverrides; custom_highlights = helpers.ifNonNull' cfg.customHighlights diff --git a/tests/test-sources/plugins/colorschemes/catppuccin.nix b/tests/test-sources/plugins/colorschemes/catppuccin.nix index 37b0659a..9d3c0491 100644 --- a/tests/test-sources/plugins/colorschemes/catppuccin.nix +++ b/tests/test-sources/plugins/colorschemes/catppuccin.nix @@ -4,7 +4,7 @@ colorschemes.catppuccin.enable = true; }; - # All the upstream default options of poimandres + # All the upstream default options of catppuccin defaults = { colorschemes.catppuccin = { enable = true; @@ -14,15 +14,13 @@ dark = "mocha"; }; transparentBackground = false; - terminalColors = true; + terminalColors = false; showBufferEnd = false; dimInactive = { enabled = true; shade = "dark"; percentage = 0.15; }; - disableItalic = true; - disableBold = true; styles = { comments = ["italic"]; conditionals = ["italic"]; @@ -58,6 +56,10 @@ terminalColors = true; colorOverrides.mocha.base = "#1e1e2f"; + disableItalic = true; + disableBold = true; + disableUnderline = true; + integrations = { barbar = true; fidget = true;