From 4316ab9949d39825fffebe2c10c48c76973c3b96 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sun, 26 Nov 2023 17:07:27 +0100 Subject: [PATCH] fix themes Signed-off-by: Andreas Gerler --- bba.org | 56 ---------------------- custom.el | 4 +- themes/atari-theme.el | 97 +++++++++++++++++++++++++++++++++++++++ themes/bba1-theme.el | 21 +++++++++ themes/tangerine-theme.el | 59 ++++++++++++++++++++++++ 5 files changed, 180 insertions(+), 57 deletions(-) create mode 100644 themes/atari-theme.el create mode 100644 themes/bba1-theme.el create mode 100644 themes/tangerine-theme.el diff --git a/bba.org b/bba.org index 5a396ed3..62f9d03a 100644 --- a/bba.org +++ b/bba.org @@ -3222,68 +3222,12 @@ whole team. No matter what editor gets used. #+END_SRC * set theme bba1 - [[https://emacsfodder.github.io/emacs-theme-editor/][Emacs Theme Editor]] is a nice tool to define your colors. #+BEGIN_SRC emacs-lisp - (let* ((variable-tuple (cond ((x-list-fonts "Arial") '(:font "Arial")) - ((x-list-fonts "Source Sans Pro") '(:font "Source Sans Pro")) - ((x-list-fonts "Lucida Grande") '(:font "Lucida Grande")) - ((x-list-fonts "Verdana") '(:font "Verdana")) - ((x-family-fonts "Sans Serif") '(:family "Sans Serif")) - (nil (warn "Cannot find a Sans Serif Font. Install Source Sans Pro.")))) - (base-font-color (face-foreground 'default nil 'default)) - (headline `(:inherit default :foreground "#62a9cd"))) - - (deftheme bba1 "DOCSTRING for bba1") - (custom-theme-set-faces 'bba1 - '(default ((default (:foreground "#07e30d" :background "#000000" )))) - '(cursor ((default (:background "#f09213" )))) - '(fringe ((default (:background "#131313" )))) - '(mode-line ((default (:foreground "#282828" :background "#d96503" )))) - '(region ((default (:background "#7a7674" )))) - '(secondary-selection ((default (:background "#584e47" )))) - '(font-lock-builtin-face ((default (:foreground "#fe8019" )))) - '(font-lock-comment-face ((default (:foreground "#df7114" )))) - '(font-lock-function-name-face ((default (:foreground "#b8bb26" )))) - '(font-lock-keyword-face ((default (:foreground "#fb4934" )))) - '(font-lock-string-face ((default (:foreground "#b8bb26" )))) - '(font-lock-type-face ((default (:foreground "#d3869b" )))) - '(font-lock-constant-face ((default (:foreground "#d3869b" )))) - '(font-lock-variable-name-face ((default (:foreground "#83a598" )))) - '(minibuffer-prompt ((default (:foreground "#b8bb26" :bold t )))) - '(font-lock-warning-face ((default (:foreground "red" :bold t )))) - '(org-block-begin-line ((t (:background "#07538a" :foreground "#84cbef" :extend t))) t) - '(org-block-end-line ((t (:inherit org-block-begin-line))) t) - '(org-block ((t (:inherit shadow :background "#29759c" :foreground "#84cbef" :distant-forground "#131313" :extend t)))) - ;; '(show-paren-match ((t (:distant-foreground "#29759c":background "#84cbef" )))) - ;;'(show-paren-match ((t (:inverse-video t)))) - '(show-paren-match ((t (:underline (:color "#07e30d" :style line))))) - '(show-paren-mismatch ((t (:underline (:color "red" :style wave))))) - - `(org-level-8 ((t (,@headline ,@variable-tuple)))) - `(org-level-7 ((t (,@headline ,@variable-tuple)))) - `(org-level-6 ((t (,@headline ,@variable-tuple)))) - `(org-level-5 ((t (,@headline ,@variable-tuple)))) - `(org-level-4 ((t (,@headline ,@variable-tuple :height 1.1)))) - `(org-level-3 ((t (,@headline ,@variable-tuple :height 1.25)))) - `(org-level-2 ((t (,@headline ,@variable-tuple :height 1.4)))) - `(org-level-1 ((t (,@headline ,@variable-tuple :height 1.6)))) - `(org-document-title ((t (,@headline ,@variable-tuple :height 1.5 :underline nil)))) - )) - (provide-theme 'bba1) - (enable-theme 'bba1) -#+END_SRC - -#+begin_src emacs-lisp :eval never :tangle no (if (display-graphic-p) (progn (when (>= emacs-major-version 27) - (let ((custom--inhibit-theme-enable nil)) - (custom-theme-set-faces - 'bba1 - ;; theme settings - )) (with-eval-after-load 'org (dolist (face '(org-block org-block-begin-line diff --git a/custom.el b/custom.el index d5b90f24..05cda0ce 100644 --- a/custom.el +++ b/custom.el @@ -11,8 +11,10 @@ '(aws-snippets-regions '("us-east-1" "eu-west-1" "ap-southeast-1" "cn-north-1")) '(bmkp-last-as-first-bookmark-file "~/workorg/bookmarks") '(cfengine-parameters-indent '(promise pname 2)) + '(custom-enabled-themes '(bba1)) '(custom-safe-themes - '("8db4b03b9ae654d4a57804286eb3e332725c84d7cdab38463cb6b97d5762ad26" default)) + '("8c6bc3959bb049983f4c76b1a0b78a3a28629370558e1d7bd45d7b54bf671a88" "8db4b03b9ae654d4a57804286eb3e332725c84d7cdab38463cb6b97d5762ad26" default)) + '(custom-theme-directory "~/.emacs.d/themes/") '(gnuserv-program (concat exec-directory "/gnuserv")) '(grep-template "grep -i -nH -e ") '(helm-comint-mode-list '(comint-mode slime-repl-mode sql-interactive-mode)) diff --git a/themes/atari-theme.el b/themes/atari-theme.el new file mode 100644 index 00000000..6432a3a5 --- /dev/null +++ b/themes/atari-theme.el @@ -0,0 +1,97 @@ +;; For best results, run this after installing the Atari Classic Chunky font from +;; http://members.bitstream.net/marksim/atarimac/fonts.html + +(deftheme atari + "Atari 800 Color Theme") + +(defun atari-click () + "Play the Atari Basic click" + (when (symbolp this-command) + (let ((c (symbol-name this-command))) + ;;(message "c is %s" c) + (unless + (or + (not this-command) + (string-match-p "^mouse-" c) + (string-match-p "^mwheel-" c) + (string-match-p "-wheel-" c)) + (play-sound '(sound :file "~/.atari-click.mp3")))))) + +(let ((coding-system-for-write 'raw-text)) + (with-temp-file "~/.atari-click.mp3" + (progn + (set-buffer-multibyte nil) + (insert (base64-decode-string " +H4sIAAAAAAACA/v/ewILAwHgmZeWD6T4gZiZgYGtjSGUEFhFCPwnBIB2Wfo4+roa61laFDGugjlF +pEGFI9GNgaEB5A4ddedKhuEO/oMjiClQ4WqrwQEG1yNS15Z0MPBODW3duYtBcNOqDdvNHZiMa5sc +JqhwsjQq8Hc8/yDEwigwo7K8vPr/9793bxowOPFVmrx7pKRkDAzWjS0n5wuwMST8Z2Dii7DgsP70 +4Ie9APPz/00Mjef/7LDjbzBgcXc35WBlanRYEMDZdtujQUNCxODznPfPfx5uYBD0K57zRJHz/wsH +w/QjjA0S9n9kWOynsx/80SD/X4PD+r8ef/P/PwIssgceFFjI8LEzNx54kKDAsHXRV//nXF8XiTK9 ++39uyZfNW+7/UzSYssfp8JKw/W3L2FR/mrlH/gvUmyBkkbr/w6OGIIFH+pry/81M1Rw2OPz1WGn9 +/2fjxo0dC5mOnul8VP3/v6uwsMKfe7u8/v//6+7/b3Md2BqIfYwMrGvFV9VbhK8VWCFe/q9Ufenc +Zf8/crYsfSQmq7T1j6mBof7JTVbnP3WWNEw8rPu/XYRpQrtgpcf/nxtXGrE2sb9y9bz//wxvb48r +h5heir/w/f+/NGbMZH/29VL4//+vrOq/zl5lnyYXGh17/tPLLTP2/b+TFunt+O//70ksnA1M+03D +2lIeMIQ/W3XhzBxgvDEukWFgUGBgMGluYGBhYRJ8FMHe/GHBkssVG1QEz8lZHq9J8ZAX60zbePLH +hZyIPCvPlf+lRExmPpXU2+b/hP3Ozq4ImcT7Dw+UcCiy37z+i0ntHMOlujM2q7btnv/0cqZh7f8d +ZzZNa/7DwaJ8ZAM/+0NHz2UfEzyU59gU9/04McFOV+hs8uSPC25suFMyOfifiUam8Smj2Jz5J/h3 +FotssDi8/3DDCwEn/s3rv7D4zmFcBstmekaraAJobT7hwgYYQwX9HxgYMoHxwsHAwAuMFkZQDDFA +YghYmLCsGgUDCADAFmVzhgYAAA==")) + (zlib-decompress-region (point-min) (point-max))))) + +(define-minor-mode atari-click-mode + "A minor mode that plays the old atari click on key press." + nil nil nil + (if atari-click-mode + (add-hook 'pre-command-hook 'atari-click) + (remove-hook 'pre-command-hook 'atari-click))) + +(defcustom atari-click-mode nil + "Toggle atari-click-mode. + Setting this variable directly does not take effect; + use either \\[customize] or the function `atari-click-mode'." + :set 'custom-set-minor-mode + :initialize 'custom-initialize-default + :type 'boolean) + +(let + ((inverse '((nil (:inverse-video t)))) + (empty '((nil nil)))) + (custom-theme-set-faces + 'atari + '(default ((t (:inherit nil :stipple nil :background "#175A68" :foreground "#67ABB9" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :width normal :height 120 :family "Atari Classic Chunky")))) + '(cursor ((t ( :background "#67ABB9" )))) + `(fringe ,empty) + `(highlight ,inverse) + `(mode-line ,inverse) + `(mode-line-inactive ,inverse) + `(region ,inverse) + `(button ,inverse) + `(variable-pitch ,empty) + `(widget-field ,inverse) + `(link ,inverse) + `(link-visited ,inverse) + `(minibuffer-prompt ,empty) + `(font-lock-builtin-face ,empty) + `(font-lock-function-name-face ,empty) + `(font-lock-preprocessor-face ,empty) + `(font-lock-string-face ,empty) + `(font-lock-type-face ,empty) + `(font-lock-keyword-face ,empty) + `(font-lock-negation-char-face ,empty) + `(font-lock-reference-face ,empty) + `(font-lock-variable-name-face ,empty) + `(font-lock-warning-face ,empty) + `(font-lock-comment-delimiter-face ,empty) + `(font-lock-comment-face ,empty) + `(font-lock-constant-face ,empty) + `(font-lock-doc-face ,empty) + )) + +(custom-theme-set-variables + 'atari + '(blink-cursor-mode nil) + '(show-paren-mode nil) + '(atari-click-mode t) + '(fringe-mode '(60 . 0))) + +(provide-theme 'atari) diff --git a/themes/bba1-theme.el b/themes/bba1-theme.el new file mode 100644 index 00000000..e692eca5 --- /dev/null +++ b/themes/bba1-theme.el @@ -0,0 +1,21 @@ + (deftheme bba1 "DOCSTRING for bba1") + (custom-theme-set-faces 'bba1 + '(default ((default (:foreground "#07e30d" :background "#000000" )))) + '(cursor ((default (:background "#f09213" )))) + '(fringe ((default (:background "#131313" )))) + '(mode-line ((default (:foreground "#282828" :background "#d96503" )))) + '(region ((default (:background "#7a7674" )))) + '(secondary-selection ((default (:background "#584e47" )))) + '(font-lock-builtin-face ((default (:foreground "#fe8019" )))) + '(font-lock-comment-face ((default (:foreground "#df7114" )))) + '(font-lock-function-name-face ((default (:foreground "#b8bb26" )))) + '(font-lock-keyword-face ((default (:foreground "#fb4934" )))) + '(font-lock-string-face ((default (:foreground "#b8bb26" )))) + '(font-lock-type-face ((default (:foreground "#d3869b" )))) + '(font-lock-constant-face ((default (:foreground "#d3869b" )))) + '(font-lock-variable-name-face ((default (:foreground "#83a598" )))) + '(minibuffer-prompt ((default (:foreground "#b8bb26" :bold t )))) + '(font-lock-warning-face ((default (:foreground "red" :bold t )))) + ) + (provide-theme 'bba1) + diff --git a/themes/tangerine-theme.el b/themes/tangerine-theme.el new file mode 100644 index 00000000..452ba280 --- /dev/null +++ b/themes/tangerine-theme.el @@ -0,0 +1,59 @@ +(deftheme tangerine + "tangerine Created by Jasonm23 - 2012-07-02.") + +(custom-theme-set-variables + 'tangerine + '(powerline-color1 "#6D3300") + '(powerline-color2 "#411E00") + '(linum-format " %7i ") + '(fringe-mode 6)) + +(custom-theme-set-faces + 'tangerine + '(fixed-pitch ((t (:family "Monospace")))) + '(variable-pitch ((t (:family "Sans Serif")))) + '(escape-glyph ((t (:foreground "#FF6600" :background "#011d2c")))) + '(linum ((t (:background "#311000" :foreground "#d13000" :box nil :height 100)))) + '(fringe ((t (:background "#1f0a00" :Foreground "#603000")))) + '(mode-line ((t (:background "#1f0a00" :box nil :foreground "#ec5604" :height 85)))) + '(mode-line-inactive ((t (:weight light :box nil :background "#201000" :foreground "#603000" :inherit (mode-line))))) + '(mode-line-emphasis ((t (:weight bold)))) + '(mode-line-highlight ((t (:box nil (t (:inherit (highlight))))))) + '(mode-line-buffer-id ((t (:weight bold :box nil)))) + '(cursor ((t (:foreground "#ffffff" :background "#4c2400")))) + '(minibuffer-prompt ((t (:weight bold :foreground "#cc6000")))) + '(minibuffer-message ((t (:foreground "#ffffff")))) + '(region ((t (:background "#291000")))) + '(secondary-selection ((((class color) (min-colors 88) (background dark)) (:background "#502400")))) + '(font-lock-builtin-face ((t (:foreground "#6d3300")))) + '(font-lock-comment-face ((t (:foreground "#572900")))) + '(font-lock-comment-delimiter-face ((t (:foreground "#cc6000")))) + '(font-lock-doc-face ((t (:inherit (font-lock-string-face))))) + '(font-lock-function-name-face ((t (:foreground "#7d3300")))) + '(font-lock-keyword-face ((t (:foreground "#994800")))) + '(font-lock-negation-char-face ((t nil))) + '(font-lock-preprocessor-face ((t (:inherit (font-lock-builtin-face))))) + '(font-lock-regexp-grouping-backslash ((t (:inherit (bold))))) + '(font-lock-regexp-grouping-construct ((t (:inherit (bold))))) + '(font-lock-string-face ((t (:foreground "#DD6000")))) + '(font-lock-constant-face ((t (:foreground "#EE8800")))) + '(font-lock-type-face ((t (:foreground "#AE5200")))) + '(font-lock-variable-name-face ((t (:foreground "#994000")))) + '(font-lock-warning-face ((t (:weight bold :foreground "#FF0000")))) + '(highlight ((((class color) (min-colors 88) (background light)) (:background "#004453")) (((class color) (min-colors 88) (background dark)) (:background "#004450")) (((class color) (min-colors 16) (background light)) (:background "#004450")) (((class color) (min-colors 16) (background dark)) (:background "#005560")) (((class color) (min-colors 8)) (:foreground "#000000" :background "#00FF00")) (t (:inverse-video t)))) + '(shadow ((((class color grayscale) (min-colors 88) (background light)) (:foreground "#999999")) (((class color grayscale) (min-colors 88) (background dark)) (:foreground "#999999")) (((class color) (min-colors 8) (background light)) (:foreground "#00ff00")) (((class color) (min-colors 8) (background dark)) (:foreground "#ffff00")))) + '(trailing-whitespace ((((class color) (background light)) (:background "#ff0000")) (((class color) (background dark)) (:background "#ff0000")) (t (:inverse-video t)))) + '(link ((((class color) (min-colors 88) (background light)) (:underline t :foreground "#00b7f0")) (((class color) (background light)) (:underline t :foreground "#0044FF")) (((class color) (min-colors 88) (background dark)) (:underline t :foreground "#0099aa")) (((class color) (background dark)) (:underline t :foreground "#0099aa")) (t (:inherit (underline))))) + '(link-visited ((default (:inherit (link))) (((class color) (background light)) (:inherit (link))) (((class color) (background dark)) (:inherit (link))))) + '(button ((t (:inherit (link))))) + '(header-line ((default (:inherit (mode-line))) (((type tty)) (:underline t :inverse-video nil)) (((class color grayscale) (background light)) (:box nil :foreground "#222222" :background "#bbbbbb")) (((class color grayscale) (background dark)) (:box nil :foreground "#bbbbbb" :background "#222222")) (((class mono) (background light)) (:underline t :box nil :inverse-video nil :foreground "#000000" :background "#ffffff")) (((class mono) (background dark)) (:underline t :box nil :inverse-video nil :foreground "#ffffff" :background "#000000")))) + '(tooltip ((default nil) (nil nil))) + '(isearch ((((class color) (min-colors 88) (background light)) (:foreground "#99ccee" :background "#444444")) (((class color) (min-colors 88) (background dark)) (:foreground "#bb3311" :background "##444444")) (((class color) (min-colors 16)) (:foreground "#0088cc" :background "#444444")) (((class color) (min-colors 8)) (:foreground "#0088cc" :background "#444444")) (t (:inverse-video t)))) + '(isearch-fail ((((class color) (min-colors 88) (background light)) (:background "#ffaaaa")) (((class color) (min-colors 88) (background dark)) (:background "#880000")) (((class color) (min-colors 16)) (:background "#FF0000")) (((class color) (min-colors 8)) (:background "#FF0000")) (((class color grayscale)) (:foreground "#888888")) (t (:inverse-video t)))) + '(lazy-highlight ((((class color) (min-colors 88) (background light)) (:background "#77bbdd")) (((class color) (min-colors 88) (background dark)) (:background "#77bbdd")) (((class color) (min-colors 16)) (:background "#4499ee")) (((class color) (min-colors 8)) (:background "#4499ee")) (t (:underline t)))) + '(match ((((class color) (min-colors 88) (background light)) (:background "#3388cc")) (((class color) (min-colors 88) (background dark)) (:background "#3388cc")) (((class color) (min-colors 8) (background light)) (:foreground "#000000" :background "#FFFF00")) (((class color) (min-colors 8) (background dark)) (:foreground "#ffffff" :background "#0000FF")) (((type tty) (class mono)) (:inverse-video t)) (t (:background "#888888")))) + '(next-error ((t (:inherit (region))))) + '(query-replace ((t (:inherit (isearch))))) + '(default ((t (:foreground "#FFaa78" :background "#160a00"))))) + +(provide-theme 'tangerine) -- 2.47.3