From 5dffc39d71b2325d9e3b243efcf9012d90f71a49 Mon Sep 17 00:00:00 2001 From: johndovern <92282293+johndovern@users.noreply.github.com> Date: Mon, 5 Jun 2023 17:43:50 -0700 Subject: [PATCH 01/10] Add kanagawa theme --- README.md | 3 +- themes/doom-kanagawa-theme.el | 178 ++++++++++++++++++++++++++++++++++ 2 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 themes/doom-kanagawa-theme.el diff --git a/README.md b/README.md index 82323136..10e8f62a 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,7 @@ welcome PRs to help us maintain and address inconsistencies in them. | doom-horizon | [link](https://github.com/aodhneine/horizon-theme.el) | ported from VSCode Horizon (ported by [@karetsu](https://github.com/karetsu)) | | doom-Iosvkem | [link](https://github.com/neutaaaaan/iosvkem) | ported from the default dark theme for Adobe Brackets (ported by [@neutaaaaan](https://github.com/neutaaaaan)) | | doom-ir-black | [link](https://github.com/twerth/ir_black) | ported from Vim's ir_black colorscheme (ported by [@legendre6891](https://github.com/legendre6891)) | +| doom-kanagawa | [link](https://github.com/rebelot/kanagawa.nvim) | based on rebelot's neovim colorscheme (ported py [@Anskrevy](https://github.com/Anskrevy)) | | doom-lantern | [link](https://github.com/Gitleptune/lantern-theme) | based on Gitleptune's Lantern theme (ported by [@paladhammika](https://github.com/paladhammika)) | | doom-laserwave | [link](https://github.com/Jaredk3nt/laserwave) | a clean synthwave/outrun theme inspired by VSCode's Laserwave (ported by [@hyakt](https://github.com/hyakt)) | | doom-manegarm | original | an original autumn-inspired dark theme (ported by [@kenranunderscore](https://github.com/kenranunderscore)) | @@ -122,7 +123,7 @@ welcome PRs to help us maintain and address inconsistencies in them. | doom-outrun-electric | [link](https://github.com/samrap/outrun-theme-vscode) | a high contrast, neon theme inspired by Outrun Electric on VSCode (ported by [@ema2159](https://github.com/ema2159)) | | doom-palenight | [link](https://github.com/equinusocio/vsc-material-theme) | adapted from equinusocio's Material themes (ported by [@Brettm12345](https://github.com/Brettm12345)) | | doom-peacock | [link](https://github.com/daylerees/colour-schemes/blob/master/emacs/peacock-theme.el) | inspired by daylerees' Peacock (ported by [@teesloane](https://github.com/teesloane)) | -| doom-pine | [link](https://github.com/morhetz/gruvbox) | a green-tinged Gruvbox (by [@RomanHargrave](https://github.com/RomanHargrave)) | +| doom-pine | [link](https://github.com/morhetz/gruvbox) | a green-tinged Gruvbox (by [@RomanHargrave](https://github.com/RomanHargrave)) | | doom-plain | [link](https://github.com/gko/plain/) | inspired by gko's plain theme for VSCode (ported by [@das-s](https://github.com/das-s)) | | doom-plain-dark | [link](https://github.com/gko/plain/) | inspired by gko's plain theme for VSCode (ported by [@das-s](https://github.com/das-s)) | | doom-rouge | [link](https://github.com/josefaidt/rouge-theme) | ported from VSCode's Rouge Theme (ported by [@das-s](https://github.com/das-s)) | diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el new file mode 100644 index 00000000..d379777a --- /dev/null +++ b/themes/doom-kanagawa-theme.el @@ -0,0 +1,178 @@ +;;; doom-kanagawa-theme.el --- inspired by rebelot/kanagawa.nvim and others -*- lexical-binding: t; no-byte-compile: t; -*- +;; +;; Added: June 4 2023 +;; Author: Anskrevy / scss-mode + (css-proprietary-property :foreground orange) + (css-property :foreground green) + (css-selector :foreground blue) + ;;;; doom-modeline + (doom-modeline-bar :background (if doom-kanagawa-brighter-modeline modeline-bg highlight)) + (doom-modeline-buffer-file :inherit 'mode-line-buffer-id :weight 'bold) + (doom-modeline-buffer-path :inherit 'mode-line-emphasis :weight 'bold) + (doom-modeline-buffer-project-root :foreground green :weight 'bold) + ;;;; elscreen + (elscreen-tab-other-screen-face :background "#353a42" :foreground "#1e2022") + ;;;; ivy + (ivy-current-match :background dark-blue :distant-foreground base0 :weight 'normal) + ;;;; LaTeX-mode + (font-latex-math-face :foreground green) + ;;;; markdown-mode + (markdown-markup-face :foreground base5) + (markdown-header-face :inherit 'bold :foreground red) + ((markdown-code-face &override) :background (doom-lighten base3 0.05)) + ;;;; rjsx-mode + (rjsx-tag :foreground red) + (rjsx-attr :foreground orange) + ;;;; solaire-mode + (solaire-mode-line-face + :inherit 'mode-line + :background modeline-bg-alt + :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-alt))) + (solaire-mode-line-inactive-face + :inherit 'mode-line-inactive + :background modeline-bg-inactive-alt + :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-alt)))) + + ;;;; Base theme variable overrides- + ()) + +;;; doom-kanagawa-theme.el ends here From 3c4469898c44c988f61a8b20cb9988070118746c Mon Sep 17 00:00:00 2001 From: johndovern <92282293+johndovern@users.noreply.github.com> Date: Mon, 5 Jun 2023 18:34:11 -0700 Subject: [PATCH 02/10] Fix selection coloring --- themes/doom-kanagawa-theme.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el index d379777a..4237e009 100644 --- a/themes/doom-kanagawa-theme.el +++ b/themes/doom-kanagawa-theme.el @@ -88,7 +88,7 @@ Can be an integer to determine the exact padding." ;; error, as they are used in the base theme defined in doom-themes-base. (highlight blue) (vertical-bar (doom-darken base1 0.1)) - (selection dark-blue) + (selection (doom-darken dark-blue 0.5)) (builtin magenta) (comments (if doom-kanagawa-brighter-comments dark-cyan base5)) (doc-comments (doom-lighten (if doom-kanagawa-brighter-comments dark-cyan base5) 0.25)) From 55e4f8edcd710a08c3e0829ed984c2830a1913da Mon Sep 17 00:00:00 2001 From: johndovern <92282293+johndovern@users.noreply.github.com> Date: Fri, 1 Sep 2023 23:07:24 -0700 Subject: [PATCH 03/10] Fix README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 10e8f62a..90978417 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ welcome PRs to help us maintain and address inconsistencies in them. | doom-outrun-electric | [link](https://github.com/samrap/outrun-theme-vscode) | a high contrast, neon theme inspired by Outrun Electric on VSCode (ported by [@ema2159](https://github.com/ema2159)) | | doom-palenight | [link](https://github.com/equinusocio/vsc-material-theme) | adapted from equinusocio's Material themes (ported by [@Brettm12345](https://github.com/Brettm12345)) | | doom-peacock | [link](https://github.com/daylerees/colour-schemes/blob/master/emacs/peacock-theme.el) | inspired by daylerees' Peacock (ported by [@teesloane](https://github.com/teesloane)) | -| doom-pine | [link](https://github.com/morhetz/gruvbox) | a green-tinged Gruvbox (by [@RomanHargrave](https://github.com/RomanHargrave)) | +| doom-pine | [link](https://github.com/morhetz/gruvbox) | a green-tinged Gruvbox (by [@RomanHargrave](https://github.com/RomanHargrave)) | | doom-plain | [link](https://github.com/gko/plain/) | inspired by gko's plain theme for VSCode (ported by [@das-s](https://github.com/das-s)) | | doom-plain-dark | [link](https://github.com/gko/plain/) | inspired by gko's plain theme for VSCode (ported by [@das-s](https://github.com/das-s)) | | doom-rouge | [link](https://github.com/josefaidt/rouge-theme) | ported from VSCode's Rouge Theme (ported by [@das-s](https://github.com/das-s)) | From d274d06deed279842c7d96d324a1dc53de5d96c2 Mon Sep 17 00:00:00 2001 From: Anskrevy <95379591+Anskrevy@users.noreply.github.com> Date: Mon, 4 Sep 2023 18:03:54 -0700 Subject: [PATCH 04/10] Update source --- themes/doom-kanagawa-theme.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el index 4237e009..bb893cca 100644 --- a/themes/doom-kanagawa-theme.el +++ b/themes/doom-kanagawa-theme.el @@ -3,13 +3,12 @@ ;; Added: June 4 2023 ;; Author: Anskrevy Date: Mon, 5 Feb 2024 23:17:33 -0800 Subject: [PATCH 05/10] Some small tweaks --- themes/doom-kanagawa-theme.el | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el index bb893cca..fc43d1e6 100644 --- a/themes/doom-kanagawa-theme.el +++ b/themes/doom-kanagawa-theme.el @@ -46,14 +46,14 @@ Can be an integer to determine the exact padding." "A dark theme inspired by rebelot/kanagawa.nvim and others." ;; name default 256 16 - ((bg '("#1d1c1c" "black" "black" )) + ((bg '("#181616" "black" "black" )) (fg '("#DCD7BA" "#DCD7BA" "brightwhite" )) ;; These are off-color variants of bg/fg, used primarily for `solaire-mode', ;; but can also be useful as a basis for subtle highlights (e.g. for hl-line ;; or region), especially when paired with the `doom-darken', `doom-lighten', ;; and `doom-blend' helper functions. - (bg-alt '("#181616" "black" "black" )) + (bg-alt '("#1D1C19" "black" "black" )) (fg-alt '("#C8C093" "#C8C093" "white" )) ;; These should represent a spectrum from bg to fg, where base0 is a starker @@ -70,15 +70,15 @@ Can be an integer to determine the exact padding." (base8 '("#BABDB9" "#BABDB9" "white" )) (grey base4) - (red '("#d8616b" "#d8616b" "red" )) - (orange '("#ffa066" "#ffa066" "brightred" )) - (green '("#98bb6c" "#98bb6c" "green" )) + (red '("#FF5D62" "#FF5D62" "red" )) + (orange '("#FFA066" "#FFA066" "brightred" )) + (green '("#98BB6C" "#98BB6C" "green" )) (teal '("#7AA89F" "#7AA89F" "brightgreen" )) (yellow '("#E6C384" "#E6C384" "yellow" )) (blue '("#7FB4CA" "#7FB4CA" "brightblue" )) (dark-blue '("#7E9CD8" "#7E9CD8" "blue" )) (magenta '("#957FB8" "#957FB8" "brightmagenta")) - (violet '("#aaa1c8" "#aaa1c8" "magenta" )) + (violet '("#9CABCA" "#9CABCA" "magenta" )) (cyan '("#A3D4D5" "#A3D4D5" "brightcyan" )) (dark-cyan '("#658594" "#658594" "cyan" )) @@ -139,6 +139,10 @@ Can be an integer to determine the exact padding." :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive))) (mode-line-emphasis :foreground (if doom-kanagawa-brighter-modeline base8 highlight)) + ;;;; indent-guides + (highlight-indent-guides-character-face :foreground base4) + (highlight-indent-guides-top-character-face :foreground base4) + (highlight-indent-guides-stack-character-face :foreground base4) ;;;; css-mode / scss-mode (css-proprietary-property :foreground orange) (css-property :foreground green) From 3a2537986184500f6f05ec55ca4b244ade1451ad Mon Sep 17 00:00:00 2001 From: Anskrevy <95379591+Anskrevy@users.noreply.github.com> Date: Mon, 5 Feb 2024 23:18:14 -0800 Subject: [PATCH 06/10] Add optional red cursor that some versions use --- themes/doom-kanagawa-theme.el | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el index fc43d1e6..3901ee67 100644 --- a/themes/doom-kanagawa-theme.el +++ b/themes/doom-kanagawa-theme.el @@ -38,6 +38,11 @@ Can be an integer to determine the exact padding." :group 'doom-kanagawa-theme :type '(choice integer boolean)) +(defcustom doom-kanagawa-red-cursor nil + "If non-nil, cursor will be red." + :group 'doom-kanagawa-theme + :type 'boolean) + ;; ;;; Theme definition @@ -127,7 +132,8 @@ Can be an integer to determine the exact padding." ;;;; Base theme face overrides - (((line-number &override) :foreground base4) + ((cursor :background (if doom-kanagawa-red-cursor red fg-alt)) + ((line-number &override) :foreground base4) ((line-number-current-line &override) :foreground fg) ((font-lock-comment-face &override) :background (if doom-kanagawa-brighter-comments (doom-lighten bg 0.05))) @@ -143,6 +149,8 @@ Can be an integer to determine the exact padding." (highlight-indent-guides-character-face :foreground base4) (highlight-indent-guides-top-character-face :foreground base4) (highlight-indent-guides-stack-character-face :foreground base4) + ;;;; evil-snipe + (evil-snipe-first-match-face :foreground (if doom-kanagawa-red-cursor red blue) :background bg-alt) ;;;; css-mode / scss-mode (css-proprietary-property :foreground orange) (css-property :foreground green) From 91d02596a04ff25087dd657fa7bae4a55f945d6b Mon Sep 17 00:00:00 2001 From: Anskrevy <95379591+Anskrevy@users.noreply.github.com> Date: Sat, 23 Mar 2024 22:31:17 -0700 Subject: [PATCH 07/10] Better highlighting for corfu --- themes/doom-kanagawa-theme.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el index 3901ee67..f3b2b14f 100644 --- a/themes/doom-kanagawa-theme.el +++ b/themes/doom-kanagawa-theme.el @@ -151,6 +151,8 @@ Can be an integer to determine the exact padding." (highlight-indent-guides-stack-character-face :foreground base4) ;;;; evil-snipe (evil-snipe-first-match-face :foreground (if doom-kanagawa-red-cursor red blue) :background bg-alt) + ;;;; corfu + (corfu-current :background base5) ;;;; css-mode / scss-mode (css-proprietary-property :foreground orange) (css-property :foreground green) From 4766ee5234065251c2f6185f5e48d17584c32439 Mon Sep 17 00:00:00 2001 From: Anskrevy <95379591+Anskrevy@users.noreply.github.com> Date: Sun, 24 Mar 2024 00:37:25 -0700 Subject: [PATCH 08/10] Make background highlights consistent --- themes/doom-kanagawa-theme.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el index f3b2b14f..7709b5d9 100644 --- a/themes/doom-kanagawa-theme.el +++ b/themes/doom-kanagawa-theme.el @@ -105,7 +105,7 @@ Can be an integer to determine the exact padding." (strings green) (variables (doom-lighten magenta 0.4)) (numbers orange) - (region `(,(doom-lighten (car bg-alt) 0.15) ,@(doom-lighten (cdr base1) 0.35))) + (region base3) (error red) (warning yellow) (success green) @@ -152,7 +152,7 @@ Can be an integer to determine the exact padding." ;;;; evil-snipe (evil-snipe-first-match-face :foreground (if doom-kanagawa-red-cursor red blue) :background bg-alt) ;;;; corfu - (corfu-current :background base5) + (corfu-current :background base3) ;;;; css-mode / scss-mode (css-proprietary-property :foreground orange) (css-property :foreground green) From 230712d5a16062ca5acc4b6839f46bebecf7d3fa Mon Sep 17 00:00:00 2001 From: Anskrevy <95379591+Anskrevy@users.noreply.github.com> Date: Sun, 24 Mar 2024 13:19:43 -0700 Subject: [PATCH 09/10] Revert #4766ee5 change to region --- themes/doom-kanagawa-theme.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el index 7709b5d9..967c8c96 100644 --- a/themes/doom-kanagawa-theme.el +++ b/themes/doom-kanagawa-theme.el @@ -105,7 +105,7 @@ Can be an integer to determine the exact padding." (strings green) (variables (doom-lighten magenta 0.4)) (numbers orange) - (region base3) + (region `(,(doom-lighten (car bg-alt) 0.15) ,@(doom-lighten (cdr base1) 0.35))) (error red) (warning yellow) (success green) From 3390755d0a4df5fe5c9be8644da2d1601751fd87 Mon Sep 17 00:00:00 2001 From: Anskrevy <95379591+Anskrevy@users.noreply.github.com> Date: Tue, 9 Jul 2024 20:32:55 -0700 Subject: [PATCH 10/10] fix: vterm color bright black previously invisible --- themes/doom-kanagawa-theme.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el index 967c8c96..95515a05 100644 --- a/themes/doom-kanagawa-theme.el +++ b/themes/doom-kanagawa-theme.el @@ -184,6 +184,8 @@ Can be an integer to determine the exact padding." :inherit 'mode-line-inactive :background modeline-bg-inactive-alt :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-alt)))) + ;;;; vterm + (vterm-color-bright-black :inherit 'term-color-bright-black :foreground base5) ;;;; Base theme variable overrides- ())