-
-
Notifications
You must be signed in to change notification settings - Fork 419
theme: add kanagawa #790
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Anskrevy
wants to merge
20
commits into
doomemacs:master
Choose a base branch
from
Anskrevy:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
theme: add kanagawa #790
Changes from 2 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
5dffc39
Add kanagawa theme
johndovern 3c44698
Fix selection coloring
johndovern 55e4f8e
Fix README
johndovern d274d06
Update source
Anskrevy 3c47bb7
Merge branch 'doomemacs:master' into master
Anskrevy aab4f76
Some small tweaks
Anskrevy 3a25379
Add optional red cursor that some versions use
Anskrevy 4312709
Merge branch 'doomemacs:master' into master
Anskrevy 91d0259
Better highlighting for corfu
Anskrevy 4766ee5
Make background highlights consistent
Anskrevy 230712d
Revert #4766ee5 change to region
Anskrevy ed9c4cd
Merge branch 'doomemacs:master' into master
Anskrevy 3390755
fix: vterm color bright black previously invisible
Anskrevy 186f9a7
Update themes/doom-kanagawa-theme.el
Anskrevy eee0c30
Merge branch 'doomemacs:master' into master
Anskrevy 0aa4c09
refactor(kanagawa): make distinct hybrid theme
Anskrevy 46713e8
add(kanagawa): port dragon, lotus, and wave themes
Anskrevy ba35648
feat(kanagawa): `*-match-org-blocks` option
Anskrevy c3f95e8
fix(docs): typo
Anskrevy 3f97e1a
fix(kanagawa): org block background colors
Anskrevy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 <https://github.com/Anskrevy | ||
| ;; Maintainer: | ||
| ;; Source: ???? | ||
|
Anskrevy marked this conversation as resolved.
Outdated
|
||
| ;; | ||
| ;;; Commentary: | ||
| ;;; Original theme by rebelot see: https://github.com/rebelot/kanagawa.nvim | ||
| ;;; Inspiration taken from modified version in https://github.com/NvChad/base46 | ||
| ;;; and konrad1977 https://github.com/konrad1977/emacs . | ||
| ;;; fi | ||
| ;; | ||
| ;;; Code: | ||
|
|
||
| (require 'doom-themes) | ||
|
|
||
|
|
||
| ;; | ||
| ;;; Variables | ||
|
|
||
| (defgroup doom-kanagawa-theme nil | ||
| "Options for the `doom-kanagawa' theme." | ||
| :group 'doom-themes) | ||
|
|
||
| (defcustom doom-kanagawa-brighter-modeline nil | ||
| "If non-nil, more vivid colors will be used to style the mode-line." | ||
| :group 'doom-kanagawa-theme | ||
| :type 'boolean) | ||
|
|
||
| (defcustom doom-kanagawa-brighter-comments nil | ||
| "If non-nil, comments will be highlighted in more vivid colors." | ||
| :group 'doom-kanagawa-theme | ||
| :type 'boolean) | ||
|
|
||
| (defcustom doom-kanagawa-padded-modeline doom-themes-padded-modeline | ||
| "If non-nil, adds a 4px padding to the mode-line. | ||
| Can be an integer to determine the exact padding." | ||
| :group 'doom-kanagawa-theme | ||
| :type '(choice integer boolean)) | ||
|
|
||
|
|
||
| ;; | ||
| ;;; Theme definition | ||
|
|
||
| (def-doom-theme doom-kanagawa | ||
| "A dark theme inspired by rebelot/kanagawa.nvim and others." | ||
|
|
||
| ;; name default 256 16 | ||
| ((bg '("#1d1c1c" "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" )) | ||
| (fg-alt '("#C8C093" "#C8C093" "white" )) | ||
|
|
||
| ;; These should represent a spectrum from bg to fg, where base0 is a starker | ||
| ;; bg and base8 is a starker fg. For example, if bg is light grey and fg is | ||
| ;; dark grey, base0 should be white and base8 should be black. | ||
| (base0 '("#191922" "black" "black" )) | ||
| (base1 '("#28282E" "#28282E" "brightblack" )) | ||
| (base2 '("#222129" "#222129" "brightblack" )) | ||
| (base3 '("#26252C" "#26252C" "brightblack" )) | ||
| (base4 '("#37363A" "#37363A" "brightblack" )) | ||
| (base5 '("#464546" "#464546" "brightblack" )) | ||
| (base6 '("#545451" "#545451" "brightblack" )) | ||
| (base7 '("#727169" "#727169" "brightblack" )) | ||
| (base8 '("#BABDB9" "#BABDB9" "white" )) | ||
|
|
||
| (grey base4) | ||
| (red '("#d8616b" "#d8616b" "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" )) | ||
| (cyan '("#A3D4D5" "#A3D4D5" "brightcyan" )) | ||
| (dark-cyan '("#658594" "#658594" "cyan" )) | ||
|
|
||
| ;; These are the "universal syntax classes" that doom-themes establishes. | ||
| ;; These *must* be included in every doom themes, or your theme will throw an | ||
| ;; error, as they are used in the base theme defined in doom-themes-base. | ||
| (highlight blue) | ||
| (vertical-bar (doom-darken base1 0.1)) | ||
| (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)) | ||
| (constants violet) | ||
| (functions magenta) | ||
| (keywords blue) | ||
| (methods cyan) | ||
| (operators blue) | ||
| (type yellow) | ||
| (strings green) | ||
| (variables (doom-lighten magenta 0.4)) | ||
| (numbers orange) | ||
| (region `(,(doom-lighten (car bg-alt) 0.15) ,@(doom-lighten (cdr base1) 0.35))) | ||
| (error red) | ||
| (warning yellow) | ||
| (success green) | ||
| (vc-modified orange) | ||
| (vc-added green) | ||
| (vc-deleted red) | ||
|
|
||
| ;; These are extra color variables used only in this theme; i.e. they aren't | ||
| ;; mandatory for derived themes. | ||
| (modeline-fg fg) | ||
| (modeline-fg-alt base5) | ||
| (modeline-bg (if doom-kanagawa-brighter-modeline | ||
| (doom-darken blue 0.45) | ||
| (doom-darken bg-alt 0.1))) | ||
| (modeline-bg-alt (if doom-kanagawa-brighter-modeline | ||
| (doom-darken blue 0.475) | ||
| `(,(doom-darken (car bg-alt) 0.15) ,@(cdr bg)))) | ||
| (modeline-bg-inactive `(,(car bg-alt) ,@(cdr base1))) | ||
| (modeline-bg-inactive-alt `(,(doom-darken (car bg-alt) 0.1) ,@(cdr bg))) | ||
|
|
||
| (-modeline-pad | ||
| (when doom-kanagawa-padded-modeline | ||
| (if (integerp doom-kanagawa-padded-modeline) doom-kanagawa-padded-modeline 4)))) | ||
|
|
||
|
|
||
| ;;;; Base theme face overrides | ||
| (((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))) | ||
| (mode-line | ||
| :background modeline-bg :foreground modeline-fg | ||
| :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg))) | ||
| (mode-line-inactive | ||
| :background modeline-bg-inactive :foreground modeline-fg-alt | ||
| :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive))) | ||
| (mode-line-emphasis :foreground (if doom-kanagawa-brighter-modeline base8 highlight)) | ||
|
|
||
| ;;;; css-mode <built-in> / 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 | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.