Update fringes and modeline to blend into background better

This commit is contained in:
zongor 2025-05-17 00:15:40 -04:00
parent e5a6ad9743
commit afe41395b8
1 changed files with 193 additions and 159 deletions

View File

@ -1,159 +1,193 @@
;;; mazarbul.el --- Drums in the deep, they are coming... ;;; mazarbul.el --- Drums in the deep, they are coming...
(setq col_fore "#f8f8f2") (setq col_fore "#f8f8f2")
(setq col_fore< "#bdbdb1") (setq col_fore< "#bdbdb1")
(setq col_fore<< "#ababa0") (setq col_fore<< "#ababa0")
(setq col_fore<<< "#999990") (setq col_fore<<< "#999990")
(setq col_gry "#bbbbb0") (setq col_gry "#bbbbb0")
(setq col_back>>> "#545550") (setq col_back>>> "#545550")
(setq col_back>> "#363631") (setq col_back>> "#363631")
(setq col_back> "#454640") (setq col_back> "#454640")
(setq col_back "#262620") (setq col_back "#262620")
(setq col_back< "#646460") (setq col_back< "#282820")
(setq col_back<< "#181810")
(setq col_grn "#9ce22e")
(setq col_blu "#66d9ef") (setq col_grn "#9ce22e")
(setq col_pur "#a281ff") (setq col_blu "#66d9ef")
(setq col_pin "#fd4d80") (setq col_pur "#a281ff")
(setq col_mag "#db2765") (setq col_pin "#fd4d80")
(setq col_red "#ff0000") (setq col_mag "#db2765")
(setq col_org "#ff843b") (setq col_red "#ff3333")
(setq col_ylw "#e6db74") (setq col_org "#ff843b")
(setq col_ylw "#e6db74")
(deftheme mazarbul
"Drums in the deep, they are coming...") (deftheme mazarbul
"Drums in the deep, they are coming...")
(custom-theme-set-variables
'mazarbul (custom-theme-set-variables
) 'mazarbul
)
(custom-theme-set-faces
'mazarbul (custom-theme-set-faces
'mazarbul
;; Main window colors
`(default ((t (:foreground ,col_fore ;; Main window colors
:background ,col_back)))) `(default ((t (:foreground ,col_fore
`(fringe ((t (:background ,col_back<)))) :background ,col_back))))
`(vertical-border ((t (:background ,col_back<)))) `(fringe ((t (:box (:line-width -1 :color ,col_back)
`(cursor ((t (:background ,col_fore<<)))) :foreground ,col_back<
:background ,col_back>>))))
;; search and highlighting `(vertical-border ((t (:background ,col_back>>))))
`(region ((t (:background ,col_back>>>)))) `(vertical-bar ((t (:background ,col_back>>))))
`(isearch ((t (:background ,col_blu `(vertical-line ((t (:background ,col_back>>))))
:foreground ,col_fore)))) `(window-divider ((t (:foreground ,col_back>> :background ,col_back>>))))
`(highlight ((t (:background ,col_back>>>)))) `(window-divider-first-pixel ((t (:foreground ,col_back>> :background ,col_back>>))))
`(lazy-highlight ((t (:background ,col_back>>>)))) `(window-divider-last-pixel ((t (:foreground ,col_back>> :background ,col_back>>))))
`(cursor ((t (:background ,col_fore<<))))
;; main keywords
`(font-lock-package-name-face ((t (:foreground ,col_blu)))) ;; search and highlighting
`(font-lock-class-name-face ((t (:foreground ,col_fore)))) `(region ((t (:background ,col_back>>>))))
`(font-lock-keyword-face ((t (:foreground ,col_mag)))) `(isearch ((t (:background ,col_blu
`(font-lock-extend-face ((t (:foreground ,col_gry)))) :foreground ,col_fore))))
`(font-lock-function-name-face ((t (:foreground ,col_grn)))) `(highlight ((t (:background ,col_back>>>))))
`(font-lock-fundef-face ((t (:inherit font-lock-function-name-face)))) `(lazy-highlight ((t (:background ,col_back>>>))))
`(font-lock-keyword-bold-face ((t (:foreground ,col_mag))))
;; some method names do this (like obj.copy()) and I'm not sure why ;; main keywords
`(font-lock-gc-alloc-face ((t (:inherit font-lock-function-name-face)))) `(font-lock-package-name-face ((t (:foreground ,col_blu))))
`(font-lock-class-name-face ((t (:foreground ,col_fore))))
;; variables, types `(font-lock-keyword-face ((t (:foreground ,col_mag))))
`(font-lock-type-face ((t (:foreground ,col_blu)))) `(font-lock-extend-face ((t (:foreground ,col_gry))))
`(font-lock-highlight-green-face ((t (:inherit font-lock-type-face)))) `(font-lock-function-name-face ((t (:foreground ,col_grn))))
`(font-lock-string-face ((t (:foreground ,col_ylw)))) `(font-lock-fundef-face ((t (:inherit font-lock-function-name-face))))
`(font-lock-unit-face ((t (:foreground ,col_pur)))) `(font-lock-keyword-bold-face ((t (:foreground ,col_mag))))
`(font-lock-variable-name-face ((t (:foreground ,col_fore)))) ;; some method names do this (like obj.copy()) and I'm not sure why
`(font-lock-macro-key-face ((t (:inherit font-lock-variable-name-face)))) `(font-lock-gc-alloc-face ((t (:inherit font-lock-function-name-face))))
`(font-lock-const-face ((t (:foreground ,col_pur))))
`(font-lock-resource-face ((t (:foreground ,col_org)))) ;; variables, types
`(font-lock-debug-face ((t (:foreground ,col_red)))) `(font-lock-type-face ((t (:foreground ,col_blu))))
`(font-lock-highlight-green-face ((t (:inherit font-lock-type-face))))
;; comments `(font-lock-string-face ((t (:foreground ,col_ylw))))
`(font-lock-comment-face ((t (:foreground ,col_gry)))) `(font-lock-unit-face ((t (:foreground ,col_pur))))
`(font-lock-comment-delimiter-face ((t (:inherit font-lock-comment-face)))) `(font-lock-variable-name-face ((t (:foreground ,col_fore))))
`(font-lock-doc-face ((t (:inherit font-lock-comment-face)))) `(font-lock-macro-key-face ((t (:inherit font-lock-variable-name-face))))
`(font-lock-const-face ((t (:foreground ,col_pur))))
;; control and returns `(font-lock-resource-face ((t (:foreground ,col_org))))
`(font-lock-control-face ((t (:background ,col_back>)))) `(font-lock-debug-face ((t (:foreground ,col_red))))
;; uhh... emacs builtins? no idea if these are used elsewhere ;; comments
`(font-lock-builtin-face ((t (:foreground ,col_org)))) `(font-lock-comment-face ((t (:foreground ,col_gry))))
`(font-lock-constant-face ((t (:foreground ,col_blu)))) `(font-lock-comment-delimiter-face ((t (:inherit font-lock-comment-face))))
`(font-lock-warning-face ((t (:foreground ,col_red)))) `(font-lock-doc-face ((t (:inherit font-lock-comment-face))))
;; modeline stuffs ;; control and returns
`(mode-line ((t (:box (:line-width -1 :color ,col_gry) `(font-lock-control-face ((t (:background ,col_back>))))
:foreground ,col_back>
:background ,col_fore<)))) ;; uhh... emacs builtins? no idea if these are used elsewhere
`(mode-line-inactive ((t (:box (:line-width -1 :color ,col_gry) `(font-lock-builtin-face ((t (:foreground ,col_org))))
:foreground ,col_back< `(font-lock-constant-face ((t (:foreground ,col_pur))))
:background ,col_fore<<<)))) `(font-lock-warning-face ((t (:foreground ,col_red))))
;; emacs tooltips
`(tooltip ((t (:inherit (variable-pitch) ;; modeline stuffs
:foreground ,col_fore<
:background ,col_back<))))
`(link ((t (:underline (:color foreground-color :style line) `(modeline-fg ((t (:background ,col_back>>>))))
:foreground ,col_grn))))
`(link-visited ((t (:underline (:color foreground-color :style line) `(mode-line ((t (:box (:line-width -1 :color ,col_back)
:foreground ,col_grn :foreground ,col_fore
:inherit (link))))) :background ,col_back>>))))
`(mode-line-inactive ((t (:box (:line-width -1 :color ,col_back)
;; Bodge in our colors :foreground ,col_back>
`(font-lock-bblue-face ((t (:foreground ,col_blu)))) :background ,col_back<))))
`(font-lock-bdblue-face ((t (:foreground ,col_blu)))) ;; emacs tooltips
`(font-lock-bgreen-face ((t (:foreground ,col_grn)))) `(tooltip ((t (:inherit (variable-pitch)
`(font-lock-bdgreen-face ((t (:foreground ,col_grn)))) :foreground ,col_fore<
`(font-lock-bred-face ((t (:foreground ,col_red)))) :background ,col_back<))))
`(font-lock-bdred-face ((t (:foreground ,col_red)))) `(link ((t (:underline (:color foreground-color :style line)
`(font-lock-bgray-face ((t (:foreground ,col_fore<<<)))) :foreground ,col_grn))))
`(font-lock-black-face ((t (:foreground ,col_back<)))) `(link-visited ((t (:underline (:color foreground-color :style line)
`(font-lock-bpink-face ((t (:foreground ,col_pin)))) :foreground ,col_grn
`(font-lock-bpurple-face ((t (:foreground ,col_pur)))) :inherit (link)))))
;; Bodge in our colors
`(font-lock-highlight-angry-comment-face ((t (:foreground ,col_red)))) `(font-lock-bblue-face ((t (:foreground ,col_blu))))
`(font-lock-highlight-bad-language-face ((t (:foreground ,col_red)))) `(font-lock-bdblue-face ((t (:foreground ,col_blu))))
`(font-lock-highlight-blue-face ((t (:foreground ,col_blu)))) `(font-lock-bgreen-face ((t (:foreground ,col_grn))))
`(font-lock-highlight-intense-red-face ((t (:foreground ,col_pin `(font-lock-bdgreen-face ((t (:foreground ,col_grn))))
:background ,col_back>>)))) `(font-lock-bred-face ((t (:foreground ,col_red))))
`(font-lock-highlight-orange-face ((t (:foreground ,col_org)))) `(font-lock-bdred-face ((t (:foreground ,col_red))))
`(font-lock-highlight-red-face ((t (:foreground ,col_red)))) `(font-lock-bgray-face ((t (:foreground ,col_fore<<<))))
`(font-lock-black-face ((t (:foreground ,col_back<))))
;; stuff in the console `(font-lock-bpink-face ((t (:foreground ,col_pin))))
`(font-lock-if-debug-face ((t (:foreground ,col_blu)))) `(font-lock-bpurple-face ((t (:foreground ,col_pur))))
`(font-lock-bold-face ((t (:foreground ,col_org))))
`(font-lock-stack-frame-face ((t (:foreground ,col_ylw)))) `(font-lock-highlight-angry-comment-face ((t (:foreground ,col_red))))
`(font-lock-highlight-bad-language-face ((t (:foreground ,col_red))))
;; electric buffer list `(font-lock-highlight-blue-face ((t (:foreground ,col_blu))))
`(cm-electric-emacs-buffer-mode-face ((t (:foreground ,col_pur)))) `(font-lock-highlight-intense-red-face ((t (:foreground ,col_pin
`(cm-electric-c-buffer-mode-face ((t (:foreground ,col_blu)))) :background ,col_back>>))))
`(font-lock-highlight-orange-face ((t (:foreground ,col_org))))
`(cm-electric-cm-dir-face ((t (:foreground ,col_pin)))) `(font-lock-highlight-red-face ((t (:foreground ,col_red))))
`(cm-electric-custom-dir-face ((t (:foreground ,col_org))))
`(cm-electric-emacs-face ((t (:inherit cm-electric-custom-dir-face)))) ;; stuff in the console
`(cm-electric-profile-dir-face ((t (:foreground ,col_ylw)))) `(font-lock-if-debug-face ((t (:foreground ,col_blu))))
`(font-lock-bold-face ((t (:foreground ,col_org))))
`(cm-electric-buffer-mode-face ((t (:foreground ,col_mag)))) `(font-lock-stack-frame-face ((t (:foreground ,col_ylw))))
`(cm-electric-cet-dir-face ((t (:foreground ,col_mag))))
`(cm-electric-root-face ((t (:foreground ,col_mag)))) ;; electric buffer list
`(cm-electric-fundamental-face ((t (:foreground ,col_mag)))) `(cm-electric-emacs-buffer-mode-face ((t (:foreground ,col_pur))))
`(cm-electric-rs-file-face ((t (:foreground ,col_mag)))) `(cm-electric-c-buffer-mode-face ((t (:foreground ,col_blu))))
;; Everything left over is ,col_mag `(cm-electric-cm-dir-face ((t (:foreground ,col_pin))))
`(font-lock-fixed-face ((t (:foreground ,col_mag)))) `(cm-electric-custom-dir-face ((t (:foreground ,col_org))))
`(font-lock-global-face ((t (:foreground ,col_mag)))) `(cm-electric-emacs-face ((t (:inherit cm-electric-custom-dir-face))))
`(font-lock-hasp-face ((t (:foreground ,col_mag)))) `(cm-electric-profile-dir-face ((t (:foreground ,col_ylw))))
`(font-lock-keyword-bold-bold-face ((t (:foreground ,col_mag))))
`(font-lock-reference-face ((t (:foreground ,col_mag)))) `(cm-electric-buffer-mode-face ((t (:foreground ,col_mag))))
`(font-lock-number-face ((t (:foreground ,col_mag)))) `(cm-electric-cet-dir-face ((t (:foreground ,col_mag))))
`(font-lock-operator-face ((t (:foreground ,col_grn)))) ;; no idea if this is done or not `(cm-electric-root-face ((t (:foreground ,col_mag))))
`(font-lock-end-statement ((t (:foreground ,col_mag)))) `(cm-electric-fundamental-face ((t (:foreground ,col_mag))))
`(font-lock-preprocessor-face ((t (:foreground ,col_mag)))) `(cm-electric-rs-file-face ((t (:foreground ,col_mag))))
`(font-lock-gay-face ((t (:foreground ,col_mag))))
`(hl-line ((t (:background ,col_mag)))) ;; Everything left over is ,col_mag
`(font-lock-fixed-face ((t (:foreground ,col_mag))))
;; Extra face definitions for pluggins and whatnot `(font-lock-global-face ((t (:foreground ,col_mag))))
`(column-enforce-face ((t (:inherit nil `(font-lock-hasp-face ((t (:foreground ,col_mag))))
:background ,col_back>> `(font-lock-keyword-bold-bold-face ((t (:foreground ,col_mag))))
:underline nil)))) `(font-lock-reference-face ((t (:foreground ,col_mag))))
) `(font-lock-number-face ((t (:foreground ,col_mag))))
`(font-lock-operator-face ((t (:foreground ,col_grn)))) ;; no idea if this is done or not
(provide-theme 'mazarbul) `(font-lock-end-statement ((t (:foreground ,col_mag))))
`(font-lock-preprocessor-face ((t (:foreground ,col_mag))))
`(font-lock-gay-face ((t (:foreground ,col_mag))))
`(hl-line ((t (:background ,col_mag))))
;; Extra face definitions for pluggins and whatnot
`(column-enforce-face ((t (:inherit nil
:background ,col_back>>
:underline nil))))
`(rainbow-delimiters-depth-1-face ((t :foreground ,col_mag)))
`(rainbow-delimiters-depth-2-face ((t :foreground ,col_org)))
`(rainbow-delimiters-depth-3-face ((t :foreground ,col_grn)))
`(rainbow-delimiters-depth-4-face ((t :foreground ,col_blu)))
`(rainbow-delimiters-depth-5-face ((t :foreground ,col_mag)))
`(rainbow-delimiters-depth-6-face ((t :foreground ,col_org)))
`(rainbow-delimiters-depth-7-face ((t :foreground ,col_grn)))
`(vc-modified ((t :foreground ,col_blu)))
`(vc-added ((t :foreground ,col_grn)))
`(vc-deleted ((t :foreground ,col_red)))
`(git-gutter:separator ((t :foreground ,col_blu)))
`(git-gutter:modified ((t :foreground ,col_mag)))
`(git-gutter:added ((t :foreground ,col_grn)))
`(git-gutter:deleted ((t :foreground ,col_red)))
`(git-gutter:unchanged ((t :foreground ,col_ylw)))
`(modeline-fg ((t (:background ,col_back>>>))))
`(modeline-fg-alt ((t (:background ,col_back>>))))
`(modeline-bg ((t (:background ,col_back))))
`(modeline-bg-inactive ((t (:background ,col_back<)))))
(provide-theme 'mazarbul)