Skip to content

Commit

Permalink
Merge pull request #89 from NamesCode/main
Browse files Browse the repository at this point in the history 
Match style guide
  • Loading branch information
@NamesCode
NamesCode committed May 19, 2023
2 parents 2719e06 + 2f3c364 commit 8aae242
Showing 1 changed file with 39 additions and 37 deletions.
76 changes: 39 additions & 37 deletions catppuccin-theme.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ Must be one of `mocha`, `macchiato`, `frappe`, or `latte`."
(apply rgb-to-hex (mapcar (lambda (v) (floor (* (- 1 factor) v)))
(funcall hex-to-rgb color))))))

;;;; User functions
;;; User functions

(defun catppuccin-reload ()
"Reload the Catppuccin theme, useful for after having set custom colors with `catppuccin-set-color`."
Expand All @@ -264,8 +264,8 @@ Must be one of `mocha`, `macchiato`, `frappe`, or `latte`."

;;;; Theme definition:
(let ((colors '((undef "#ff00ff" "#ff00ff")
(ctp-rosewater (catppuccin-get-color 'rosewater) (catppuccin-quantize-color (catppuccin-get-color 'rosewater)))
(ctp-flamingo (catppuccin-get-color 'flamingo) (catppuccin-quantize-color (catppuccin-get-color 'flamingo)))
(ctp-rosewater (catppuccin-get-color 'rosewater) (catppuccin-quantize-color (catppuccin-get-color 'rosewater)))
(ctp-flamingo (catppuccin-get-color 'flamingo) (catppuccin-quantize-color (catppuccin-get-color 'flamingo)))
(ctp-pink (catppuccin-get-color 'pink) (catppuccin-quantize-color (catppuccin-get-color 'pink)))
(ctp-mauve (catppuccin-get-color 'mauve) (catppuccin-quantize-color (catppuccin-get-color 'mauve)))
(ctp-red (catppuccin-get-color 'red) (catppuccin-quantize-color (catppuccin-get-color 'red)))
Expand Down Expand Up @@ -298,11 +298,11 @@ Must be one of `mocha`, `macchiato`, `frappe`, or `latte`."
(catppuccin-darken (catppuccin-get-color 'base) 5)
(catppuccin-lighten (catppuccin-get-color 'base) 5))))))
(faces '(;; default / basic faces
(cursor :background ,ctp-rosewater)
(cursor :background ,ctp-rosewater) ;; If you want to change this to a nicer colour you can do so by swapping "ctp-rosewater" with another colour var like "ctp-red"
(default :background ,ctp-base :foreground ,ctp-text)
(default-italic :slant italic)
(hl-todo :foreground ,ctp-peach)
(error :foreground ,ctp-maroon)
(error :foreground ,ctp-red)
(ffap :foreground ,undef)
(fringe :background ,ctp-base :foreground ,ctp-surface1)
(header-line :inherit 'mode-line)
Expand All @@ -311,12 +311,12 @@ Must be one of `mocha`, `macchiato`, `frappe`, or `latte`."
(info-quoted-name :foreground ,undef)
(info-string :foreground ,ctp-green)
(lazy-highlight :foreground ,ctp-subtext1 :background ,ctp-surface1)
(link :foreground ,ctp-rosewater :underline t)
(link-unvisited :foreground ,ctp-mauve :underline t)
(link :foreground ,ctp-lavender :underline t)
(link-unvisited :foreground ,ctp-blue :underline t)
(linum :foreground ,ctp-surface1 :background ,ctp-base)
(line-number :foreground ,ctp-surface1 :background ,ctp-base)
(line-number-current-line :inherit line-number :foreground ,ctp-lavender)
(match :background ,ctp-surface1 :foreground ,ctp-text)
(match :background ,ctp-red :foreground ,ctp-mantle)
(menu :background ,ctp-current :inverse-video nil :foreground ,ctp-text)
(minibuffer-prompt :weight normal :foreground ,ctp-subtext0)
(mode-line :background ,ctp-mantle nil :foreground ,ctp-text)
Expand All @@ -326,7 +326,7 @@ Must be one of `mocha`, `macchiato`, `frappe`, or `latte`."
(region :background ,ctp-surface0 :extend t)
(shadow :foreground ,ctp-surface2)
(success :foreground ,ctp-green)
(warning :foreground ,ctp-peach)
(warning :foreground ,ctp-yellow)
(tooltip :foreground ,ctp-overlay2 :background ,ctp-surface0)
(trailing-whitespace :inherit warning)
(window-divider :foreground ,ctp-mantle)
Expand Down Expand Up @@ -402,10 +402,10 @@ Must be one of `mocha`, `macchiato`, `frappe`, or `latte`."
(company-tooltip-annotation-selection :foreground ,ctp-mauve)
;; completions (minibuffer.el)
(completions-annotations :inherit font-lock-comment-face)
(completions-common-part :foreground ,ctp-rosewater)
(completions-common-part :foreground ,ctp-sky)
(completions-first-difference :foreground ,ctp-text)
;; diff-hl
(diff-hl-change :foreground ,ctp-peach :background ,ctp-peach)
(diff-hl-change :foreground ,ctp-blue :background ,ctp-blue)
(diff-hl-delete :foreground ,ctp-red :background ,ctp-red)
(diff-hl-insert :foreground ,ctp-green :background ,ctp-green)
;; diff-refine
Expand Down Expand Up @@ -496,7 +496,7 @@ Must be one of `mocha`, `macchiato`, `frappe`, or `latte`."
;; elfeed
(elfeed-search-date-face :foreground ,ctp-subtext0)
(elfeed-search-title-face :foreground ,ctp-text)
(elfeed-search-unread-title-face :foreground ,ctp-rosewater)
(elfeed-search-unread-title-face :foreground ,ctp-red)
(elfeed-search-feed-face :foreground ,ctp-text :weight bold)
(elfeed-search-tag-face :foreground ,ctp-green)
(elfeed-search-last-update-face :weight bold)
Expand Down Expand Up @@ -646,9 +646,9 @@ Must be one of `mocha`, `macchiato`, `frappe`, or `latte`."
(ido-incomplete-regexp :inherit warning)
(ido-indicator :foreground ,ctp-text :weight bold)
;; ivy
(ivy-current-match :background ,ctp-blue :foreground ,ctp-mantle :bold t)
(ivy-current-match :background ,ctp-red :foreground ,ctp-mantle :bold t)
(ivy-action :background unspecified :foreground ,ctp-lavender)
(ivy-grep-line-number :background unspecified :foreground ,ctp-peach)
(ivy-grep-line-number :background unspecified :foreground ,ctp-teal)
(ivy-minibuffer-match-face-1 :background unspecified :foreground ,ctp-blue :bold t)
(ivy-minibuffer-match-face-2 :background unspecified :foreground ,ctp-sapphire)
(ivy-minibuffer-match-face-3 :background unspecified :foreground ,ctp-lavender)
Expand Down Expand Up @@ -741,20 +741,20 @@ Must be one of `mocha`, `macchiato`, `frappe`, or `latte`."
(markdown-footnote-face :foreground ,ctp-yellow)
(markdown-header-face :weight normal)
(markdown-header-face-1
:foreground ,ctp-blue
:foreground ,ctp-red
,@(when catppuccin-enlarge-headings
(list :height catppuccin-height-title-1)))
(markdown-header-face-2
:foreground ,ctp-blue
:foreground ,ctp-peach
,@(when catppuccin-enlarge-headings
(list :height catppuccin-height-title-2)))
(markdown-header-face-3
:foreground ,ctp-blue
:foreground ,ctp-yellow
,@(when catppuccin-enlarge-headings
(list :height catppuccin-height-title-3)))
(markdown-header-face-4 :foreground ,ctp-blue)
(markdown-header-face-5 :foreground ,ctp-blue)
(markdown-header-face-6 :foreground ,ctp-blue)
(markdown-header-face-4 :foreground ,ctp-green)
(markdown-header-face-5 :foreground ,ctp-sapphire)
(markdown-header-face-6 :foreground ,ctp-lavender)
(markdown-inline-code-face :foreground ,ctp-green)
(markdown-plain-url-face :inherit link)
(markdown-pre-face :foreground ,ctp-green)
Expand All @@ -779,7 +779,7 @@ Must be one of `mocha`, `macchiato`, `frappe`, or `latte`."
;; mini-modeline
(mini-modeline-mode-line :inherit mode-line :height 0.1 :box nil)
;; mu4e
(mu4e-unread-face :foreground ,ctp-rosewater)
(mu4e-unread-face :foreground ,ctp-maroon)
(mu4e-view-url-number-face :foreground ,ctp-yellow)
(mu4e-highlight-face :background ,ctp-base
:weight bold
Expand Down Expand Up @@ -858,10 +858,10 @@ Must be one of `mocha`, `macchiato`, `frappe`, or `latte`."
,@(when catppuccin-enlarge-headings
(list :height catppuccin-height-title-3)))
(org-level-4 :weight normal :foreground ,ctp-green)
(org-level-5 :weight normal :foreground ,ctp-teal)
(org-level-6 :weight normal :foreground ,ctp-sapphire)
(org-level-7 :weight normal :foreground ,ctp-blue)
(org-level-8 :weight normal :foreground ,ctp-mauve)
(org-level-5 :weight normal :foreground ,ctp-sapphire)
(org-level-6 :weight normal :foreground ,ctp-lavender)
(org-level-7 :weight normal :foreground ,ctp-mauve)
(org-level-8 :weight normal :foreground ,ctp-maroon)
(org-link :inherit link)
(org-meta-line :inherit font-lock-comment-face)
(org-priority :foreground ,ctp-yellow)
Expand Down Expand Up @@ -894,7 +894,7 @@ Must be one of `mocha`, `macchiato`, `frappe`, or `latte`."
(cfw:face-today :inherit cfw:face-today-title)
(cfw:face-select :background ,ctp-surface1 :foreground ,ctp-text)
(cfw:face-toolbar :background ,ctp-base)
(cfw:face-toolbar-button-off :foreground ,ctp-rosewater)
(cfw:face-toolbar-button-off :foreground ,ctp-lavender)
(cfw:face-toolbar-button-on :foreground ,ctp-mauve)
;; outline
(outline-1 :foreground ,ctp-blue)
Expand All @@ -911,19 +911,19 @@ Must be one of `mocha`, `macchiato`, `frappe`, or `latte`."
(rainbow-delimiters-depth-3-face :foreground ,ctp-yellow)
(rainbow-delimiters-depth-4-face :foreground ,ctp-green)
(rainbow-delimiters-depth-5-face :foreground ,ctp-sapphire)
(rainbow-delimiters-depth-6-face :foreground ,ctp-red)
(rainbow-delimiters-depth-7-face :foreground ,ctp-peach)
(rainbow-delimiters-depth-8-face :foreground ,ctp-yellow)
(rainbow-delimiters-depth-6-face :foreground ,ctp-lavender)
(rainbow-delimiters-depth-7-face :foreground ,ctp-mauve)
(rainbow-delimiters-depth-8-face :foreground ,ctp-maroon)
(rainbow-delimiters-unmatched-face :inherit warning)
;; rst (reStructuredText)
(rst-level-1 :foreground ,ctp-blue)
(rst-level-2 :foreground ,ctp-blue)
(rst-level-3 :foreground ,ctp-blue)
(rst-level-4 :foreground ,ctp-blue)
(rst-level-5 :foreground ,ctp-blue)
(rst-level-6 :foreground ,ctp-blue)
(rst-level-7 :foreground ,ctp-blue)
(rst-level-8 :foreground ,ctp-blue)
(rst-level-1 :foreground ,ctp-red)
(rst-level-2 :foreground ,ctp-peach)
(rst-level-3 :foreground ,ctp-yellow)
(rst-level-4 :foreground ,ctp-green)
(rst-level-5 :foreground ,ctp-sapphire)
(rst-level-6 :foreground ,ctp-lavender)
(rst-level-7 :foreground ,ctp-mauve)
(rst-level-8 :foreground ,ctp-maroon)
;; show-paren
(show-paren-match :foreground ,ctp-pink
:weight bold
Expand All @@ -933,6 +933,8 @@ Must be one of `mocha`, `macchiato`, `frappe`, or `latte`."
(show-paren-mismatch :inherit warning)
;; slime
(slime-repl-inputed-output-face :foreground ,ctp-mauve)
;; swiper
(swiper-background-match-face-2 :background ,ctp-surface1 :foreground ,ctp-text)
;; spam
(spam :inherit gnus-summary-normal-read :foreground ,ctp-peach
:strike-through t :slant oblique)
Expand Down

0 comments on commit 8aae242

Please sign in to comment.