aboutsummaryrefslogtreecommitdiff
path: root/.doom.d
diff options
context:
space:
mode:
Diffstat (limited to '.doom.d')
-rw-r--r--.doom.d/config.el2
-rw-r--r--.doom.d/custom.el11
-rw-r--r--.doom.d/themes/tokyo-night-theme.el299
-rw-r--r--.doom.d/themes/zt-theme.el179
4 files changed, 189 insertions, 302 deletions
diff --git a/.doom.d/config.el b/.doom.d/config.el
index 0ad28c3..3981ff9 100644
--- a/.doom.d/config.el
+++ b/.doom.d/config.el
@@ -27,7 +27,7 @@
;; There are two ways to load a theme. Both assume the theme is installed and
;; available. You can either set `doom-theme' or manually load a theme with the
;; `load-theme' function. This is the default:
-(setq doom-theme 'tokyo-night)
+(setq doom-theme 'zt)
;; If you use `org' and don't want your org files in the default location below,
;; change `org-directory'. It must be set before org loads!
diff --git a/.doom.d/custom.el b/.doom.d/custom.el
index f97dc92..607765c 100644
--- a/.doom.d/custom.el
+++ b/.doom.d/custom.el
@@ -18,8 +18,15 @@
(setq web-mode-markup-indent-offset 2)))
(custom-set-faces!
+ '(default :background "#100b13")
'(window-divider :foreground "#9b1bed")
- ;'(line-number :foreground "#ff0aa3")))
- )
+ '(hl-line :background "#21242b")
+ '(region :background "#71279f")
+ '(selection :background "#9b1bed")
+ '(cursor :background "#ff0aa3")
+ '(highlight :background "#ff0aa3")
+ '(line-number :slant normal :background "#100b13")
+ '(line-number-current-line :slant normal :background "#21242b"))
+
; window transparency
(add-to-list 'default-frame-alist '(alpha . 90))
diff --git a/.doom.d/themes/tokyo-night-theme.el b/.doom.d/themes/tokyo-night-theme.el
deleted file mode 100644
index c4dd15b..0000000
--- a/.doom.d/themes/tokyo-night-theme.el
+++ /dev/null
@@ -1,299 +0,0 @@
-;;; themes/tokyo-night-theme.el -*- lexical-binding: t; -*-
-
-;;; doom-tokyo-night-theme.el --- inspired by VSCode's Tokyo Night theme -*- lexical-binding: t; no-byte-compile: t; -*-
-;;
-;; Added: December 15, 2021 (#650)
-;; Author: FosterHangdaan <https://github.com/FosterHangdaan>
-;; Maintainer:
-;; Source: https://github.com/enkia/tokyo-night-vscode-theme
-;;
-;;; Commentary:
-;;; Code:
-
-(require 'doom-themes)
-
-
-;;
-;;; Variables
-
-(defgroup doom-tokyo-night-theme nil
- "Options for doom-themes"
- :group 'doom-themes)
-
-(defcustom doom-tokyo-night-brighter-modeline nil
- "If non-nil, more vivid colors will be used to style the mode-line."
- :group 'doom-tokyo-night-theme
- :type 'boolean)
-
-(defcustom doom-tokyo-night-brighter-comments nil
- "If non-nil, comments will be highlighted in more vivid colors."
- :group 'doom-tokyo-night-theme
- :type 'boolean)
-
-(defcustom doom-tokyo-night-comment-bg doom-tokyo-night-brighter-comments
- "If non-nil, comments will have a subtle, darker background. Enhancing their legibility."
- :group 'doom-tokyo-night-theme
- :type 'boolean)
-
-(defcustom doom-tokyo-night-padded-modeline nil
- "If non-nil, adds a 4px padding to the mode-line. Can be an integer to determine the exact padding."
- :group 'doom-tokyo-night-theme
- :type '(or integer boolean))
-
-
-;;
-;;; Theme definition
-
-(def-doom-theme tokyo-night
- "A clean, dark theme that celebrates the lights of downtown Tokyo at night."
-
- ; Color Scheme
- ; gui 256
- ; "#f7768e" "#f7768e" => This keyword, HTML elements, Regex group symbol, CSS units, Terminal Red
- ; "#ff9e64" "#ff9e64" => Number and Boolean constants, Language support constants
- ; "#e0af68" "#e0af68" => Function parameters, Regex character sets, Terminal Yellow
- ; "#9ece6a" "#9ece6a" => Strings, CSS class names
- ; "#73daca" "#73daca" => Object literal keys, Markdown links, Terminal Green
- ; "#b4f9f8" "#b4f9f8" => Regex literal strings
- ; "#2ac3de" "#2ac3de" => Language support functions, CSS HTML elements
- ; "#7dcfff" "#7dcfff" => Object properties, Regex quantifiers and flags, Markdown headings, Terminal Cyan, Markdown code, Import/export keywords
- ; "#7aa2f7" "#7aa2f7" => Function names, CSS property names, Terminal Blue
- ; "#bb9af7" "#bb9af7" => Control Keywords, Storage Types, Regex symbols and operators, HTML Attributes, Terminal Magenta
- ; "#c0caf5" "#c0caf5" => Variables, Class names, Terminal White
- ; "#a9b1d6" "#a9b1d6" => Editor foreground
- ; "#9aa5ce" "#9aa5ce" => Markdown Text, HTML Text
- ; "#cfc9c2" "#cfc9c2" => Parameters inside functions (semantic highlighting only)
- ; "#565f89" "#565f89" => Comments
- ; "#414868" "#414868" => Terminal black
- ; "#24283b" "#24283b" => Editor background (Storm)
- ; "#1a1b26" "#1a1b26" => Editor background (Night)
-
- ;; name default 256 16
- ;((bg '("#1a1b26" nil nil ))
- ((bg '("#100b13" nil nil ))
- (bg-alt '("#1a1b26" nil nil ))
- (base0 '("#414868" "#414868" "black" ))
- (base1 '("#51587a" "#51587a" "brightblack" ))
- (base2 '("#61698b" "#61698b" "brightblack" ))
- (base3 '("#71799d" "#71799d" "brightblack" ))
- (base4 '("#8189af" "#8189af" "brightblack" ))
- (base5 '("#9099c0" "#9099c0" "brightblack" ))
- (base6 '("#a0aad2" "#a0aad2" "brightblack" ))
- (base7 '("#b0bae3" "#b0bae3" "brightblack" ))
- (base8 '("#c0caf5" "#c0caf5" "white" ))
- (fg-alt '("#c0caf5" "#c0caf5" "brightwhite" ))
- (fg '("#a9b1d6" "#a9b1d6" "white" ))
-
- (grey base4)
- (red '("#f7768e" "#f7768e" "red" ))
- (orange '("#ff9e64" "#ff9e64" "brightred" ))
- (green '("#73daca" "#73daca" "green" ))
- (teal '("#2ac3de" "#2ac3de" "brightgreen" ))
- (yellow '("#e0af68" "#e0af68" "yellow" ))
- (blue '("#7aa2f7" "#7aa2f7" "brightblue" ))
- (dark-blue '("#565f89" "#565f89" "blue" ))
- (magenta '("#bb9af7" "#bb9af7" "magenta" ))
- (violet '("#9aa5ce" "#9aa5ce" "brightmagenta"))
- (cyan '("#b4f9f8" "#b4f9f8" "brightcyan" ))
- (dark-cyan '("#7dcfff" "#7dcfff" "cyan" ))
- ; Additional custom colors
- (dark-green '("#9ece6a" "#9ece6a" "green" ))
- (brown '("#cfc9c2" "#cfc9c2" "yellow" ))
-
- ;; face categories -- required for all themes
- (highlight cyan)
- (vertical-bar (doom-lighten bg 0.05))
- (selection base0)
- (builtin red)
- (comments (if doom-tokyo-night-brighter-comments base5 base1))
- (doc-comments (doom-lighten (if doom-tokyo-night-brighter-comments base5 base1) 0.25))
- (constants orange)
- (functions blue)
- (keywords magenta)
- (methods blue)
- (operators dark-cyan)
- (type base8)
- (strings dark-green)
- (variables base8)
- (numbers orange)
- (region base0)
- (error red)
- (warning yellow)
- (success green)
- (vc-modified orange)
- (vc-added green)
- (vc-deleted red)
-
- ;; custom categories
- (hidden `(,(car bg) "black" "black"))
- (-modeline-bright doom-tokyo-night-brighter-modeline)
- (-modeline-pad
- (when doom-tokyo-night-padded-modeline
- (if (integerp doom-tokyo-night-padded-modeline) doom-tokyo-night-padded-modeline 4)))
-
- (modeline-fg nil)
- (modeline-fg-alt base5)
-
- (modeline-bg
- (if -modeline-bright
- base3
- `(,(doom-darken (car bg) 0.15) ,@(cdr base0))))
- (modeline-bg-l
- (if -modeline-bright
- base3
- `(,(doom-darken (car bg) 0.1) ,@(cdr base0))))
- (modeline-bg-inactive (doom-darken bg 0.1))
- (modeline-bg-inactive-l `(,(car bg) ,@(cdr base1))))
-
-
- ;; --- Extra Faces ------------------------
- (
- ((line-number-current-line &override) :foreground base8)
- ((line-number &override) :foreground comments :background (doom-darken bg 0.025))
-
- (font-lock-comment-face
- :foreground comments
- :background (if doom-tokyo-night-comment-bg (doom-lighten bg 0.05)))
- (font-lock-doc-face
- :inherit 'font-lock-comment-face
- :foreground doc-comments)
-
- ;;; Doom Modeline
- (doom-modeline-bar :background (if -modeline-bright modeline-bg highlight))
- (doom-modeline-buffer-path :foreground base8 :weight 'normal)
- (doom-modeline-buffer-file :foreground brown :weight 'normal)
-
- (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 -modeline-bright base8 highlight))
- (mode-line-buffer-id
- :foreground highlight)
-
- ;;; Indentation
- (whitespace-indentation :background bg)
- (whitespace-tab :background bg)
-
- ;;; Ivy
- (ivy-subdir :foreground blue)
- (ivy-minibuffer-match-face-1 :foreground green :background bg-alt)
- (ivy-minibuffer-match-face-2 :foreground orange :background bg-alt)
- (ivy-minibuffer-match-face-3 :foreground red :background bg-alt)
- (ivy-minibuffer-match-face-4 :foreground yellow :background bg-alt)
-
- ;;; Elscreen
- (elscreen-tab-other-screen-face :background "#353a42" :foreground "#1e2022")
-
- ;;; Solaire
- (solaire-mode-line-face
- :inherit 'mode-line
- :background modeline-bg-l
- :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-l)))
- (solaire-mode-line-inactive-face
- :inherit 'mode-line-inactive
- :background modeline-bg-inactive-l
- :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-l)))
-
- ;;; Telephone
- (telephone-line-accent-active
- :inherit 'mode-line
- :background (doom-lighten bg 0.2))
- (telephone-line-accent-inactive
- :inherit 'mode-line
- :background (doom-lighten bg 0.05))
- (telephone-line-evil-emacs
- :inherit 'mode-line
- :background dark-blue)
-
- ;;;; rainbow-delimiters
- (rainbow-delimiters-depth-1-face :foreground fg)
- (rainbow-delimiters-depth-2-face :foreground blue)
- (rainbow-delimiters-depth-3-face :foreground orange)
- (rainbow-delimiters-depth-4-face :foreground green)
- (rainbow-delimiters-depth-5-face :foreground cyan)
- (rainbow-delimiters-depth-6-face :foreground yellow)
- (rainbow-delimiters-depth-7-face :foreground teal)
-
- ;;; Treemacs
- (treemacs-root-face :foreground magenta :weight 'bold :height 1.2)
- (doom-themes-treemacs-root-face :foreground magenta :weight 'ultra-bold :height 1.2)
- (doom-themes-treemacs-file-face :foreground fg-alt)
- (treemacs-directory-face :foreground base8)
- (treemacs-file-face :foreground fg)
- (treemacs-git-modified-face :foreground green)
- (treemacs-git-renamed-face :foreground yellow)
-
- ;;; Magit
- (magit-section-heading :foreground blue)
- (magit-branch-remote :foreground orange)
- (magit-diff-our :foreground (doom-darken red 0.2) :background (doom-darken red 0.7))
- (magit-diff-our-highlight :foreground red :background (doom-darken red 0.5) :weight 'bold)
- (magit-diff-removed :foreground (doom-darken red 0.2) :background (doom-darken red 0.7))
- (magit-diff-removed-highlight :foreground red :background (doom-darken red 0.5) :weight 'bold)
-
- ;; --- Major-Mode Faces -------------------
- ;;; elisp
- (highlight-quoted-symbol :foreground yellow)
-
- ;;; js2-mode
- (js2-function-param :foreground yellow)
- (js2-object-property :foreground green)
-
- ;;; typescript-mode
- (typescript-this-face :foreground red)
- (typescript-access-modifier-face :foreground brown)
-
- ;;; rjsx-mode
- (rjsx-tag :foreground red)
- (rjsx-text :foreground violet)
- (rjsx-attr :foreground magenta :slant 'italic :weight 'medium)
- (rjsx-tag-bracket-face :foreground (doom-darken red 0.3))
-
- ;;; css-mode / scss-mode
- (css-property :foreground blue)
- (css-selector :foreground teal)
- (css-pseudo-class :foreground orange)
-
- ;;; markdown-mode
- (markdown-markup-face :foreground violet)
- (markdown-header-face :inherit 'bold :foreground dark-cyan)
- (markdown-blockquote-face :foreground violet :background (doom-lighten bg 0.04))
- (markdown-table-face :foreground violet :background (doom-lighten bg 0.04))
- ((markdown-code-face &override) :foreground dark-cyan :background (doom-lighten bg 0.04))
-
- ;;; org-mode
- (org-hide :foreground hidden)
- (org-block :background (doom-darken base2 0.65))
- (org-block-begin-line :background (doom-darken base2 0.65) :foreground comments :extend t)
- (solaire-org-hide-face :foreground hidden)
-
- ;;; web-mode
- (web-mode-json-context-face :foreground brown)
- (web-mode-json-key-face :foreground teal)
- ;;;; Block
- (web-mode-block-delimiter-face :foreground yellow)
- ;;;; Code
- (web-mode-constant-face :foreground constants)
- (web-mode-variable-name-face :foreground variables)
- ;;;; CSS
- (web-mode-css-pseudo-class-face :foreground orange)
- (web-mode-css-property-name-face :foreground blue)
- (web-mode-css-selector-face :foreground teal)
- (web-mode-css-function-face :foreground yellow)
- ;;;; HTML
- (web-mode-html-attr-engine-face :foreground yellow)
- (web-mode-html-attr-equal-face :foreground operators)
- (web-mode-html-attr-name-face :foreground magenta)
- (web-mode-html-tag-bracket-face :foreground (doom-darken red 0.3))
- (web-mode-html-tag-face :foreground red))
-
-
- ;; --- extra variables ---------------------
- ;; ()
- )
-
-;;; doom-tokyo-night-theme.el ends here
diff --git a/.doom.d/themes/zt-theme.el b/.doom.d/themes/zt-theme.el
new file mode 100644
index 0000000..e4f5d2d
--- /dev/null
+++ b/.doom.d/themes/zt-theme.el
@@ -0,0 +1,179 @@
+;;; themes/zt-theme.el -*- lexical-binding: t; -*-
+
+;;; doom-one-theme.el --- inspired by Atom One Dark -*- lexical-binding: t; no-byte-compile: t; -*-
+;;
+;; Added: May 23, 2016 (28620647f838)
+;; Author: Henrik Lissner <https://github.com/hlissner>
+;; Maintainer: Henrik Lissner <https://github.com/hlissner>
+;; Source: https://github.com/atom/one-dark-ui
+;;
+;;; Commentary:
+;;
+;; This themepack's flagship theme.
+;;
+;;; Code:
+
+(require 'doom-themes)
+
+
+;;
+;;; Variables
+
+(defgroup doom-one-theme nil
+ "Options for the `doom-one' theme."
+ :group 'doom-themes)
+
+(defcustom doom-one-brighter-modeline nil
+ "If non-nil, more vivid colors will be used to style the mode-line."
+ :group 'doom-one-theme
+ :type 'boolean)
+
+(defcustom doom-one-brighter-comments nil
+ "If non-nil, comments will be highlighted in more vivid colors."
+ :group 'doom-one-theme
+ :type 'boolean)
+
+(defcustom doom-one-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
+ :type '(choice integer boolean))
+
+
+;;
+;;; Theme definition
+
+(def-doom-theme zt
+ "A dark theme inspired by Atom One Dark."
+
+ ;; name default 256 16
+ ((bg '("#282c34" "black" "black" ))
+ (fg '("#bbc2cf" "#bfbfbf" "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-alt '("#21242b" "black" "black" ))
+ (bg-alt '("#100b13" "black" "black" ))
+ (fg-alt '("#5B6268" "#2d2d2d" "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 '("#1B2229" "black" "black" ))
+ (base1 '("#1c1f24" "#1e1e1e" "brightblack" ))
+ (base2 '("#202328" "#2e2e2e" "brightblack" ))
+ (base3 '("#23272e" "#262626" "brightblack" ))
+ (base4 '("#3f444a" "#3f3f3f" "brightblack" ))
+ (base5 '("#5B6268" "#525252" "brightblack" ))
+ (base6 '("#73797e" "#6b6b6b" "brightblack" ))
+ (base7 '("#9ca0a4" "#979797" "brightblack" ))
+ (base8 '("#DFDFDF" "#dfdfdf" "white" ))
+
+ (grey base4)
+ (red '("#ff6c6b" "#ff6655" "red" ))
+ (orange '("#da8548" "#dd8844" "brightred" ))
+ (green '("#98be65" "#99bb66" "green" ))
+ (teal '("#4db5bd" "#44b9b1" "brightgreen" ))
+ (yellow '("#ECBE7B" "#ECBE7B" "yellow" ))
+ (blue '("#51afef" "#51afef" "brightblue" ))
+ (dark-blue '("#2257A0" "#2257A0" "blue" ))
+ (magenta '("#c678dd" "#c678dd" "brightmagenta"))
+ (violet '("#a9a1e1" "#a9a1e1" "magenta" ))
+ (cyan '("#46D9FF" "#46D9FF" "brightcyan" ))
+ (dark-cyan '("#5699AF" "#5699AF" "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 dark-blue)
+ (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)
+ (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-one-brighter-modeline
+ (doom-darken blue 0.45)
+ (doom-darken bg-alt 0.1)))
+ (modeline-bg-alt (if doom-one-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))))
+
+
+ ;;;; 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)))
+ (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))
+
+ ;;;; 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-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-one-theme.el ends here
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 00:18:39 +0000