diff options
| -rw-r--r-- | .doom.d/init.el | 2 | ||||
| -rw-r--r-- | .doom.d/themes/zt-theme.el | 61 |
2 files changed, 34 insertions, 29 deletions
diff --git a/.doom.d/init.el b/.doom.d/init.el index b3af47b..9ebd5b8 100644 --- a/.doom.d/init.el +++ b/.doom.d/init.el @@ -133,7 +133,7 @@ ;;fstar ; (dependent) types and (monadic) effects and Z3 ;;gdscript ; the language you waited for (go +lsp) ; the hipster dialect - ;;(haskell +lsp) ; a language that's lazier than I am + (haskell +lsp) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on ;;json ; At least it ain't XML diff --git a/.doom.d/themes/zt-theme.el b/.doom.d/themes/zt-theme.el index e4f5d2d..b32d2be 100644 --- a/.doom.d/themes/zt-theme.el +++ b/.doom.d/themes/zt-theme.el @@ -19,24 +19,24 @@ ;; ;;; Variables -(defgroup doom-one-theme nil - "Options for the `doom-one' theme." +(defgroup zt-theme nil + "Options for the `zt' theme." :group 'doom-themes) -(defcustom doom-one-brighter-modeline nil +(defcustom zt-brighter-modeline nil "If non-nil, more vivid colors will be used to style the mode-line." - :group 'doom-one-theme + :group 'zt-theme :type 'boolean) -(defcustom doom-one-brighter-comments nil +(defcustom zt-brighter-comments nil "If non-nil, comments will be highlighted in more vivid colors." - :group 'doom-one-theme + :group 'zt-theme :type 'boolean) -(defcustom doom-one-padded-modeline doom-themes-padded-modeline +(defcustom zt-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-one-theme + :group 'zt-theme :type '(choice integer boolean)) @@ -83,25 +83,30 @@ Can be an integer to determine the exact padding." (violet '("#a9a1e1" "#a9a1e1" "magenta" )) (cyan '("#46D9FF" "#46D9FF" "brightcyan" )) (dark-cyan '("#5699AF" "#5699AF" "cyan" )) + ; custom colors + (purple '("#9b1bed" "#a9a1e1" "magenta" )) + (purple2 '("#660ec7" "#a9a1e1" "magenta" )) + (pink '("#ff0aa3" "#c678dd" "brightmagenta")) + (lime '("#0ec685" "#ecbe7b" "yellow")) ;; 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) + (highlight magenta) (vertical-bar (doom-darken base1 0.1)) - (selection dark-blue) + (selection magenta) (builtin magenta) - (comments (if doom-one-brighter-comments dark-cyan base5)) - (doc-comments (doom-lighten (if doom-one-brighter-comments dark-cyan base5) 0.25)) - (constants violet) - (functions magenta) - (keywords blue) + (comments (if zt-brighter-comments dark-cyan base5)) + (doc-comments (doom-lighten (if zt-brighter-comments dark-cyan base5) 0.25)) + (constants (doom-lighten lime 0.5)) + (functions (doom-lighten purple2 0.3)) + (keywords lime) (methods cyan) - (operators blue) - (type yellow) - (strings green) - (variables (doom-lighten magenta 0.4)) - (numbers orange) + (operators lime) + (type magenta) + (strings (doom-lighten pink 0.6)) + (variables (doom-lighten pink 0.4)) + (numbers yellow) (region `(,(doom-lighten (car bg-alt) 0.15) ,@(doom-lighten (cdr base1) 0.35))) (error red) (warning yellow) @@ -114,39 +119,39 @@ Can be an integer to determine the exact padding." ;; mandatory for derived themes. (modeline-fg fg) (modeline-fg-alt base5) - (modeline-bg (if doom-one-brighter-modeline + (modeline-bg (if zt-brighter-modeline (doom-darken blue 0.45) (doom-darken bg-alt 0.1))) - (modeline-bg-alt (if doom-one-brighter-modeline + (modeline-bg-alt (if zt-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-one-padded-modeline - (if (integerp doom-one-padded-modeline) doom-one-padded-modeline 4)))) + (when zt-padded-modeline + (if (integerp zt-padded-modeline) zt-padded-modeline 4)))) ;;;; Base theme face overrides (((line-number &override) :foreground magenta) ((line-number-current-line &override) :foreground magenta) ((font-lock-comment-face &override) - :background (if doom-one-brighter-comments (doom-lighten bg 0.05))) + :background (if zt-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-one-brighter-modeline base8 highlight)) + (mode-line-emphasis :foreground (if zt-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-one-brighter-modeline modeline-bg highlight)) + (doom-modeline-bar :background (if zt-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) @@ -176,4 +181,4 @@ Can be an integer to determine the exact padding." ;;;; Base theme variable overrides- ()) -;;; doom-one-theme.el ends here +;;; zt-theme.el ends here |