diff options
Diffstat (limited to 'blendoit')
| -rw-r--r-- | blendoit/blendoit-init.el | 306 | ||||
| -rw-r--r-- | blendoit/blendoit-init.org | 78 | ||||
| -rw-r--r-- | blendoit/blendoit-sidebar.el | 23 | ||||
| -rw-r--r-- | blendoit/init-bootstrap.el | 13 | ||||
| -rw-r--r-- | blendoit/test.el | 1 | ||||
| -rw-r--r-- | blendoit/themes/blendoit-dark-theme.el | 85 | ||||
| -rw-r--r-- | blendoit/themes/blendoit-light-theme.el | 44 |
7 files changed, 415 insertions, 135 deletions
diff --git a/blendoit/blendoit-init.el b/blendoit/blendoit-init.el new file mode 100644 index 0000000..4e064da --- /dev/null +++ b/blendoit/blendoit-init.el @@ -0,0 +1,306 @@ +;; Prompt enterprise or personal install. Create file in .emacs.d/ on Linux, + ;; AppData/ on Windows. Ask user for details and preferred bindings. + +; Check if .emacs.d exists + +; If it does, warn user + +; Copy init-bootstrap.el from USB to where operating systems expects init.el + +(setq gc-cons-threshold 100000000) + +; (setq initial-buffer-choice (lambda () (get-buffer "*dashboard*"))) + +(setq custom-file "~/.emacs.d/init-custom.el") +(load custom-file) + +; (profiler-start) + +(defun find-init-blendoit () + "Jump to this very file." + (interactive) + (find-file "~/.emacs.d/blendoit/blendoit-init.org")) + +(global-set-key (kbd "C-c c") 'find-init-blendoit) + +(global-set-key (kbd "C-c v") 'customize-variable) +(global-set-key (kbd "C-c f") 'customize-face) + +(setq backup-directory-alist `((".*" . ,temporary-file-directory)) +auto-save-file-name-transforms `((".*" ,temporary-file-directory t)) + backup-by-copying t ; Don't delink hardlinks + version-control t ; Use version numbers on backups + delete-old-versions t ; Automatically delete excess backups + kept-new-versions 20 ; how many of the newest versions to keep + kept-old-versions 5 ; and how many of the old + ) + +(setq user-full-name "Marius Peter" + user-mail-address "blendoit@gmail.com") + +(if (string-equal system-type "windows-nt") + (add-to-list 'exec-path "C:/Users/marius.peter/PortableGit/bin/")) + +(global-set-key (kbd "C-`") 'delete-other-windows) + (global-set-key (kbd "C-s") 'save-buffer) + (global-set-key (kbd "C-b") 'ibuffer-sidebar-toggle-sidebar) + (global-set-key (kbd "C-r") 'counsel-recentf) +; (global-set-key (kbd "C-n") 'make-frame) ; 7aram! + +(global-set-key (kbd "C-o") 'menu-find-file-existing) + +(defadvice find-file-read-args (around find-file-read-args-always-use-dialog-box act) + "Simulate invoking menu item as if by the mouse; see `use-dialog-box'." + (let ((last-nonmenu-event nil)) + ad-do-it)) + +(defun delete-window-or-previous-buffer () + "Delete window; if sole window, previous buffer." + (interactive) + (if (> (length (window-list)) 1) + (delete-window) + (previous-buffer))) + +(global-set-key (kbd "C-w") 'delete-window-or-previous-buffer) +(global-set-key (kbd "C-q") 'save-buffers-kill-terminal) + +(global-set-key (kbd "C--") 'text-scale-decrease) +(global-set-key (kbd "C-=") 'text-scale-increase) +(global-set-key (kbd "C-+") 'text-scale-increase) + +(require 'package) +(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) +(add-to-list 'package-archives '("org" . "https://orgmode.org/elpa/") t) +(package-initialize) + +(unless (package-installed-p 'use-package) + (package-refresh-contents) + (package-install 'use-package) + (eval-when-compile (require 'use-package))) +(setq use-package-always-ensure t) + +(use-package ivy + :config + (setq ivy-use-virtual-buffers t + ivy-count-format "%d/%d " + enable-recursive-minibuffers t)) +(ivy-mode t) + +(use-package counsel + :bind ("M-x" . counsel-M-x) + :config (counsel-mode t)) + +(global-set-key (kbd "C-f") 'counsel-grep-or-swiper) + +(use-package swiper + :bind (("C-f" . counsel-grep-or-swiper))) + +(use-package evil) +;; (evil-mode 1) + +(setq org-directory "~/org") + +(setq org-hide-emphasis-markers t) +(setq org-startup-indented t) + +(setq org-catch-invisible-edits t) + +(global-set-key (kbd "C-c a") 'org-agenda-list) + +(setq org-time-stamp-custom-formats + '("%d %b, %Y (%a)" . "%d %b, %Y (%a), at %H:%M")) + +(setq org-latex-inactive-timestamp-format + "\\textcolor{ForestGreen!60}{\\textit{%s}}") + +(require 'ox-publish) +(setq org-publish-project-alist + '( + ("Safran-VIP-html" + :base-directory "~/org/WORK/Safran/programs/B787/VIP/doc/org/" + :base-extension "org" + :publishing-directory "~/org/WORK/Safran/programs/B787/VIP/doc/wiki/" + :recursive t + :publishing-function org-html-publish-to-html + :auto-preamble t + :auto-sitemap t + :sitemap-title "" ) + + ("Safran-VIP-static" + :base-directory "~/org/WORK/Safran/programs/B787/VIP/doc/org/" + :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|mp4\\|ogg\\|swf" + :publishing-directory "~/org/WORK/Safran/programs/B787/VIP/doc/wiki/" + :recursive t + :publishing-function org-publish-attachment ) + + ("Safran-VIP-all" + :components ("Safran-VIP-html" "Safran-VIP-static")) + + ("Safran-MA700-html" + :base-directory "~/org/WORK/Safran/programs/MA700/doc/org/" + :base-extension "org" + :publishing-directory "~/org/WORK/Safran/programs/MA700/doc/wiki/" + :recursive t + :publishing-function org-html-publish-to-html + :auto-preamble t + :auto-sitemap t + :sitemap-title "" ) + + ("Safran-MA700-static" + :base-directory "~/org/WORK/Safran/programs/MA700/doc/org/" + :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|mp4\\|ogg\\|swf" + :publishing-directory "~/org/WORK/Safran/programs/MA700/doc/wiki/" + :recursive t + :publishing-function org-publish-attachment ) + + ("Safran-MA700-all" + :components ("Safran-MA700-html" "Safran-MA700-static")))) + + (add-to-list 'org-latex-packages-alist '("table" "xcolor" + t ("pdflatex"))) + (add-to-list 'org-latex-packages-alist '("AUTO" "babel" + t ("pdflatex"))) + (add-to-list 'org-latex-packages-alist '("AUTO" "polyglossia" + t ("xelatex" "lualatex"))) + +(defun blendoit-org-quick-export () + "Org export to PDF and open. + This basically reimplements `C-c C-e l o'." + (interactive) + (org-open-file (org-latex-export-to-pdf))) + +(global-set-key (kbd "C-c e") 'blendoit-org-quick-export) + +(global-undo-tree-mode) + +(use-package dumb-jump) +(add-hook 'xref-backend-functions #'dumb-jump-xref-activate) + +(use-package gnuplot) + +(use-package ledger-mode + :bind + ("C-c r" . ledger-report) + ("C-c C" . ledger-mode-clean-buffer)) + +;; (use-package ibuffer-sidebar) +;; (ibuffer-sidebar-show-sidebar) + +; :bind ("mouse-1" . ibuffer-mouse-visit-buffer) +; :bind ("mouse-3" . ibuffer-mouse-toggle-mark)) + +; (add-hook 'ibuffer-sidebar-mode-hook +; (lambda () +; (local-unset-key (quote mouse-1)) +; (local-unset-key (quote mouse-2)) +; (local-set-key (quote mouse-1) (quote ibuffer-mouse-visit-buffer)) +; (local-set-key (quote mouse-2) (quote ibuffer-mouse-toggle-mark)))) + +;; (load-file) + +(use-package which-key +:init + (which-key-mode) +;; :config +;; (setq which-key-idle-delay 1000) +;; (setq which-key-idle-secondary-delay 0.05) +;; (setq which-key-show-early-on-C-h t) +) + +; (add-hook 'after-init-hook 'global-company-mode) + +(use-package flycheck + :init (global-flycheck-mode)) + +(use-package csv-mode) + +; (use-package json-mode) + +(use-package magit + :bind ("C-c g" . magit-status)) + +(use-package pdf-tools) +;; (pdf-tools-install) + +(setq inhibit-startup-message t) +(use-package dashboard + :config + (dashboard-setup-startup-hook) + (setq dashboard-startup-banner "~/.emacs.d/blendoit/img/Safran_logo.svg") + (setq dashboard-items '((recents . 5) + (projects . 5))) + (setq dashboard-banner-logo-title "A modern professional text editor.")) + +(use-package rainbow-mode + :ensure t + :init + (add-hook 'prog-mode-hook 'rainbow-mode)) + +(use-package projectile + :bind ("C-c p" . 'projectile-command-map) + :init (projectile-mode 1) + (setq projectile-completion-system 'ivy)) + +(use-package all-the-icons) + +(show-paren-mode 1) +(setq show-paren-delay 0) + +(use-package rainbow-delimiters + :config (add-hook 'prog-mode-hook #'rainbow-delimiters-mode)) + +; (electric-pair-mode) + +(setq-default cursor-type (quote box)) +(setq-default mixed-pitch-variable-pitch-cursor (quote bar)) + +(add-hook 'org-mode-hook 'variable-pitch-mode) +(add-hook 'info-mode-hook 'variable-pitch-mode) + +;; (if (> (display-pixel-width nil) 1920) +;; (add-to-list 'custom-set-faces '(default ((t (:family "Hack" :height 176))))) +;; (add-to-list 'custom-set-faces '(default ((t (:family "Hack" :height 140)))))) + +(add-to-list 'default-frame-alist '(width . 80)) +(add-to-list 'default-frame-alist '(height . 32)) + +(add-to-list 'initial-frame-alist '(width . 80)) +(add-to-list 'initial-frame-alist '(height . 32)) + +(when (and (display-graphic-p) (string-equal system-type "gnu/linux")) + (set-frame-parameter (selected-frame) 'alpha '(90 . 50)) + (add-to-list 'default-frame-alist '(alpha . (90 . 50)))) + +(setq custom-theme-directory "~/.emacs.d/blendoit/themes/") +(load-theme 'blendoit-light) +; (load-theme 'blendoit-dark) + +(setq-default fill-column 79) + +(defalias 'yes-or-no-p 'y-or-n-p) + +(set-window-scroll-bars (minibuffer-window) nil nil) + +(save-place-mode 1) + +(setq menu-bar-mode t) + +(setq c-default-style "linux" + c-basic-offset 4) + +(menu-bar-bottom-and-right-window-divider) + + + +(add-hook 'org-mode-hook 'turn-on-auto-fill) + +(recentf-mode 1) +(setq recentf-max-menu-items 25) +(setq recentf-max-saved-items 25) +(run-at-time nil (* 5 60) 'recentf-save-list) + +; (setq pop-up-frames (quote graphic-only)) + +;; (profiler-stop) + +;; (profiler-report) diff --git a/blendoit/blendoit-init.org b/blendoit/blendoit-init.org index 9d43b5a..a457ab8 100644 --- a/blendoit/blendoit-init.org +++ b/blendoit/blendoit-init.org @@ -40,10 +40,30 @@ this is the endgame of \textit{literate programming}. Spacemacs-like dialog for default settings. +Bootstrap main configuration from USB drive. + #+NAME: first-setup #+BEGIN_SRC emacs-lisp ;; Prompt enterprise or personal install. Create file in .emacs.d/ on Linux, ;; AppData/ on Windows. Ask user for details and preferred bindings. + +; Check if .emacs.d exists + +; If it does, warn user + +; Copy init-bootstrap.el from USB to where operating systems expects init.el +#+END_SRC + +** File system paths + +In this subsection, we tell Emacs about relevant paths to resources. + +On my MS Windows machine, I add the path to Portable Git.[fn::Download from +https://git-scm.com/download/win] + +#+BEGIN_SRC emacs-lisp +(if (string-equal system-type "windows-nt") + (add-to-list 'exec-path "C:/Users/marius.peter/PortableGit/bin/")) #+END_SRC * Early setup @@ -151,18 +171,6 @@ to this file. user-mail-address "blendoit@gmail.com") #+END_SRC -** File system paths - -In this subsection, we tell Emacs about relevant paths to resources. - -On my MS Windows machine, I add the path to Portable Git.[fn::Download from -https://git-scm.com/download/win] - -#+BEGIN_SRC emacs-lisp -(if (string-equal system-type "windows-nt") - (add-to-list 'exec-path "C:/Users/marius.peter/PortableGit/bin/")) -#+END_SRC - * Global key bindings The following bindings strive to further enhance CUA[fn::Common User Access.] @@ -204,7 +212,7 @@ The following bindings lead to more natural exit behaviors. (defun delete-window-or-previous-buffer () "Delete window; if sole window, previous buffer." (interactive) - (if (> (length (window-list)) 2) + (if (> (length (window-list)) 1) (delete-window) (previous-buffer))) @@ -605,12 +613,8 @@ This enables us to better manage our =.git= projects. ** Better parentheses #+BEGIN_SRC emacs-lisp -(show-paren-mode 1) -(setq show-paren-delay 0) - (use-package rainbow-delimiters :config (add-hook 'prog-mode-hook #'rainbow-delimiters-mode)) - (electric-pair-mode) #+END_SRC @@ -651,24 +655,36 @@ cursor is a more MS Word-like bar. - More opinionated shapes - Very legible parentheses -*** ~mixed-pitch~ +*** ~variable-pitch-mode~ + +We use ~variable-pitch-mode~ for appropriate modes. + +#+BEGIN_SRC emacs-lisp +(add-hook 'org-mode-hook 'variable-pitch-mode) +(add-hook 'info-mode-hook 'variable-pitch-mode) +#+END_SRC + +*** TODO Default font size + +Make default font size larger on displays of which the resolution is greater +than =1920x1080=. + +#+BEGIN_SRC emacs-lisp +#+END_SRC -Fixed-pitch and variable-pitch faces will be used intelligently in all hooked -modes. +** Initial and default frames -~mixed-pitch~ is good at automatically determining which faces should be -monospaced and proportional; I prefer to define each face in my custom theme. +We set the dimensions of the inital and default frames. #+BEGIN_SRC emacs-lisp - ;; (use-package mixed-pitch - ;; :hook ((org-mode . mixed-pitch-mode) - ;; (Info-mode . mixed-pitch-mode))) + (add-to-list 'default-frame-alist '(width . 80)) + (add-to-list 'default-frame-alist '(height . 32)) -(add-hook 'text-mode-hook 'variable-pitch-mode) -(add-hook 'info-mode-hook 'variable-pitch-mode) + (add-to-list 'initial-frame-alist '(width . 80)) + (add-to-list 'initial-frame-alist '(height . 32)) #+END_SRC -** Initial frame +*** GNU/Linux These settings affect the first and subsequent frames spawned by Emacs in GNU/Linux. Frame transparency increases when focus is lost. @@ -727,6 +743,12 @@ Disable minibuffer scroll bar. (set-window-scroll-bars (minibuffer-window) nil nil) #+END_SRC +Save cursor location in visited buffer after closing it or Emacs. + +#+BEGIN_SRC emacs-lisp +(save-place-mode 1) +#+END_SRC + ** Clean up menus Originally, I wished to inhibit certain entries in the GUI menus. Not worth the diff --git a/blendoit/blendoit-sidebar.el b/blendoit/blendoit-sidebar.el new file mode 100644 index 0000000..03d1708 --- /dev/null +++ b/blendoit/blendoit-sidebar.el @@ -0,0 +1,23 @@ +;;; blendoit-sidebar.el --- Modern buffer list in sidebar
+
+;; Copyright (C) 2020 Marius Peter
+
+;; Author: Marius Peter <mpeter@ucla.edu>
+;; Version: 0.1
+;; Package-Requires: ((flange "1.0"))
+;; Keywords: multimedia, frobnicate
+;; URL: http://example.com/jrhacker/superfrobnicate
+
+...
+
+;; Commentary:
+
+;; This package provides an auto-hiding sidebar with a list of open buffers.
+
+;;;###autoload
+(define-minor-mode blendoit-sidebar-mode)
+
+
+(provide 'blendoit-sidebar)
+
+;;; blendoit-sidebar.el ends here
diff --git a/blendoit/init-bootstrap.el b/blendoit/init-bootstrap.el new file mode 100644 index 0000000..507ebda --- /dev/null +++ b/blendoit/init-bootstrap.el @@ -0,0 +1,13 @@ +;;; init-bootstrap.el --- load main Emacs config from USB drive. + +;;; Commentary: +;; This package enables the bootstrapping of a full `.emacs.d/' configuration +;; residing on a removable drive. It is copied over from init-bootstrap.el to +;; init.el, at a location the OS expects to find that file. Then, every time +;; Emacs is started, it will scan the top level of all typical mount points in +;; an effort to detect an existing `.emacs.d/'. + +;;; Code: + +(provide 'init-bootstrap) +;;; init-bootstrap.el ends here diff --git a/blendoit/test.el b/blendoit/test.el new file mode 100644 index 0000000..ca95879 --- /dev/null +++ b/blendoit/test.el @@ -0,0 +1 @@ +(when window-system (add-hook 'prog-mode-hook 'hl-line-mode)) diff --git a/blendoit/themes/blendoit-dark-theme.el b/blendoit/themes/blendoit-dark-theme.el deleted file mode 100644 index 432d745..0000000 --- a/blendoit/themes/blendoit-dark-theme.el +++ /dev/null @@ -1,85 +0,0 @@ -(deftheme blendoit-dark - "Created 2020-08-15.") - -(custom-theme-set-faces - 'blendoit-dark - '(variable-pitch ((t (:family "Liberation Sans")))) - '(escape-glyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown")))) - '(homoglyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown")))) - '(minibuffer-prompt ((t (:inherit org-meta-line)))) - '(highlight ((t (:background "deep sky blue" :foreground "white")))) - '(region ((t (:background "gainsboro")))) - '(shadow ((t (:foreground "dark slate gray")))) - '(secondary-selection ((((class color) (min-colors 88) (background light)) (:background "yellow1")) (((class color) (min-colors 88) (background dark)) (:background "SkyBlue4")) (((class color) (min-colors 16) (background light)) (:background "yellow")) (((class color) (min-colors 16) (background dark)) (:background "SkyBlue4")) (((class color) (min-colors 8)) (:foreground "black" :background "cyan")) (t (:inverse-video t)))) - '(trailing-whitespace ((((class color) (background light)) (:background "red1")) (((class color) (background dark)) (:background "red1")) (t (:inverse-video t)))) - '(font-lock-builtin-face ((t (:foreground "dark slate blue")))) - '(font-lock-comment-delimiter-face ((t (:foreground "dim gray" :inherit font-lock-comment-face)))) - '(font-lock-comment-face ((t (:slant italic :foreground "slate gray" :inherit variable-pitch)))) - '(font-lock-constant-face ((t (:foreground "dark cyan")))) - '(font-lock-function-name-face ((((class color) (min-colors 88) (background light)) (:foreground "Blue1")) (((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue")) (((class color) (min-colors 16) (background light)) (:foreground "Blue")) (((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue")) (((class color) (min-colors 8)) (:weight bold :foreground "blue")) (t (:weight bold :inverse-video t)))) - '(font-lock-keyword-face ((t (:foreground "slate blue")))) - '(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 "DodgerBlue1")))) - '(font-lock-type-face ((t (:foreground "ForestGreen")))) - '(font-lock-variable-name-face ((t (:foreground "sienna")))) - '(font-lock-warning-face ((t (:inherit (error))))) - '(fringe ((t (:background "grey95")))) - '(header-line ((t (:box nil :foreground "grey20" :background "grey90" :inherit (mode-line))))) - '(tooltip ((t (:foreground "black" :background "lightyellow" :inherit (variable-pitch))))) - '(mode-line ((t (:box (:line-width -1 :color nil :style released-button) :foreground "black" :background "grey75")))) - '(mode-line-buffer-id ((t (:weight bold)))) - '(mode-line-emphasis ((t (:weight bold)))) - '(mode-line-highlight ((t (:box (:line-width 2 :color "grey40" :style released-button))))) - '(mode-line-inactive ((t (:weight light :box (:line-width -1 :color "grey75" :style nil) :foreground "grey20" :background "grey90" :inherit (mode-line))))) - '(isearch ((t (:background "DodgerBlue1" :foreground "white")))) - '(isearch-fail ((t (:background "RosyBrown1")))) - '(lazy-highlight ((t (:foreground "DodgerBlue1" :box 2)))) - '(match ((t (:background "yellow1")))) - '(next-error ((t (:inherit region)))) - '(query-replace ((t (:inherit (isearch))))) - '(org-formula ((t (:inherit org-table)))) - '(org-meta-line ((t (:foreground "white" :family "Hermit")))) - '(org-document-title ((t (:weight bold :height 2.0)))) - '(org-footnote ((t (:inherit link)))) - '(org-tag ((t (:inherit org-meta-line :weight bold)))) - '(org-document-info-keyword ((t (:inherit org-meta-line)))) - '(org-code ((t (:background "light grey" :foreground "black")))) - '(org-checkbox-statistics-todo ((t (:foreground "tomato" :inherit org-checkbox)))) - '(org-checkbox-statistics-done ((t (:foreground "ForestGreen" :inherit org-checkbox)))) - '(org-verbatim ((t (:inherit shadow)))) - '(font-lock-doc-face ((t (:Family "Liberation Sans" :inherit font-lock-string-face)))) - '(cursor ((t (:background "red")))) - '(org-document-info ((t (:weight bold)))) - '(fixed-pitch ((t (:family "Hack")))) - '(org-table ((t (:inherit fixed-pitch :foreground "dark slate gray" :box (:line-width 1 :color "light slate gray"))))) - '(org-block ((t (:family "Hermit")))) - '(org-special-keyword ((t (:inherit org-meta-line)))) - '(org-level-1 ((t (:foreground "white smoke" :weight bold :height 1.6)))) - '(org-level-2 ((t (:foreground "gainsboro" :weight bold :height 1.4)))) - '(org-level-3 ((t (:foreground "light gray" :weight bold :height 1.2)))) - '(org-level-4 ((t (:foreground "gray" :weight bold :height 1.1)))) - '(org-level-5 ((t (:foreground "dark gray" :weight bold :height 1.0)))) - '(org-level-6 ((t (:inherit org-level-5)))) - '(org-level-7 ((t (:inherit org-level-5)))) - '(org-level-8 ((t (:inherit org-level-5)))) - '(org-checkbox ((t (:inherit org-meta-line :weight bold)))) - '(org-todo ((t (:background "tomato" :foreground "White" :weight bold :height 1.2 :family "Hermit")))) - '(org-done ((t (:background "ForestGreen" :foreground "White" :weight bold :height 1.2 :family "Hermit")))) - '(org-date ((t (:inherit org-tag)))) - '(swiper-match-face-1 ((t (:inherit lazy-highlight)))) - '(swiper-match-face-2 ((t (:inherit (isearch))))) - '(swiper-match-face-4 ((t (:inherit isearch)))) - '(swiper-match-face-3 ((t (:inherit isearch)))) - '(ivy-minibuffer-match-face-1 ((t (:inherit lazy-highlight)))) - '(ivy-minibuffer-match-face-2 ((t (:inherit isearch)))) - '(ivy-minibuffer-match-face-3 ((t (:inherit lazy-highlight)))) - '(ivy-minibuffer-match-face-4 ((t (:inherit isearch)))) - '(ivy-minibuffer-match-highlight ((t (:inherit highlight)))) - '(Info-quoted ((t (:inherit org-block)))) - '(org-priority ((t (:weight bold :inherit org-meta-line)))) - '(default ((t (:background "gray20" :foreground "White" :height 120 :family "Hack"))))) - -(provide-theme 'blendoit-dark) diff --git a/blendoit/themes/blendoit-light-theme.el b/blendoit/themes/blendoit-light-theme.el index ae3f14f..033881a 100644 --- a/blendoit/themes/blendoit-light-theme.el +++ b/blendoit/themes/blendoit-light-theme.el @@ -1,8 +1,10 @@ (deftheme blendoit-light - "Created 2020-08-16.") + "Created 2020-08-22.") (custom-theme-set-faces 'blendoit-light + '(cursor ((t (:background "red")))) + '(fixed-pitch ((t (:family "Hack")))) '(variable-pitch ((t (:family "Liberation Sans")))) '(escape-glyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown")))) '(homoglyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown")))) @@ -40,28 +42,35 @@ '(match ((t (:background "yellow1")))) '(next-error ((t (:inherit region)))) '(query-replace ((t (:inherit (isearch))))) + '(swiper-match-face-1 ((t (:inherit lazy-highlight)))) + '(swiper-match-face-2 ((t (:inherit (isearch))))) + '(swiper-match-face-3 ((t (:inherit isearch)))) + '(swiper-match-face-4 ((t (:inherit isearch)))) + '(ivy-minibuffer-match-face-1 ((t (:inherit swiper-match-face-1)))) + '(ivy-minibuffer-match-face-2 ((t (:inherit swiper-match-face-2)))) + '(ivy-minibuffer-match-face-3 ((t (:inherit swiper-match-face-3)))) + '(ivy-minibuffer-match-face-4 ((t (:inherit swiper-match-face-4)))) + '(ivy-minibuffer-match-highlight ((t (:inherit highlight)))) '(org-formula ((t (:inherit org-table)))) - '(org-meta-line ((t (:foreground "steel blue" :family "Hermit")))) - '(org-document-title ((t (:weight bold :height 2.0 :family "Hack")))) + '(org-meta-line ((t (:foreground "SteelBlue" :family "Hermit")))) + '(org-document-title ((t (:weight bold :height 2.0)))) '(org-footnote ((t (:inherit link)))) - '(org-tag ((t (:foreground "steel blue" :underline t :weight bold :family "Hermit")))) + '(org-tag ((t (:foreground "SteelBlue" :underline t :weight bold :family "Hermit")))) '(org-document-info-keyword ((t (:inherit org-meta-line)))) - '(org-code ((t (:background "light grey" :foreground "black")))) + '(org-code ((t (:background "light grey" :foreground "black" :family "Hack")))) '(org-checkbox-statistics-todo ((t (:foreground "tomato" :inherit org-checkbox)))) '(org-checkbox-statistics-done ((t (:foreground "ForestGreen" :inherit org-checkbox)))) '(org-verbatim ((t (:inherit shadow)))) '(font-lock-doc-face ((t (:Family "Liberation Sans" :inherit font-lock-string-face)))) - '(cursor ((t (:background "red")))) '(org-document-info ((t (:weight bold)))) - '(fixed-pitch ((t (:family "Hack")))) '(org-table ((t (:foreground "SteelBlue" :inherit fixed-pitch)))) '(org-block ((t (:family "Hermit")))) '(org-special-keyword ((t (:inherit org-meta-line)))) - '(org-level-1 ((t (:foreground "dim gray" :weight bold :height 1.6 :family "Hack")))) - '(org-level-2 ((t (:foreground "dark gray" :weight bold :height 1.4 :family "Hack")))) - '(org-level-3 ((t (:foreground "gray" :weight bold :height 1.2 :family "Hack")))) - '(org-level-4 ((t (:foreground "light gray" :weight bold :height 1.1 :family "Hack")))) - '(org-level-5 ((t (:foreground "gainsboro" :weight bold :height 1.0 :family "Hack")))) + '(org-level-1 ((t (:foreground "black" :weight bold :height 1.6)))) + '(org-level-2 ((t (:foreground "gray30" :weight bold :height 1.4)))) + '(org-level-3 ((t (:foreground "gray45" :weight bold :height 1.2)))) + '(org-level-4 ((t (:foreground "gray60" :weight bold :height 1.1)))) + '(org-level-5 ((t (:foreground "gray75" :weight bold :height 1.0)))) '(org-level-6 ((t (:inherit org-level-5)))) '(org-level-7 ((t (:inherit org-level-5)))) '(org-level-8 ((t (:inherit org-level-5)))) @@ -69,17 +78,8 @@ '(org-todo ((t (:background "tomato" :foreground "White" :weight bold :height 1.2 :family "Hermit")))) '(org-done ((t (:background "ForestGreen" :foreground "White" :weight bold :height 1.2 :family "Hermit")))) '(org-date ((t (:inherit org-tag)))) - '(swiper-match-face-1 ((t (:inherit lazy-highlight)))) - '(swiper-match-face-2 ((t (:inherit (isearch))))) - '(swiper-match-face-4 ((t (:inherit isearch)))) - '(swiper-match-face-3 ((t (:inherit isearch)))) - '(ivy-minibuffer-match-face-1 ((t (:inherit lazy-highlight)))) - '(ivy-minibuffer-match-face-2 ((t (:inherit isearch)))) - '(ivy-minibuffer-match-face-3 ((t (:inherit lazy-highlight)))) - '(ivy-minibuffer-match-face-4 ((t (:inherit isearch)))) - '(ivy-minibuffer-match-highlight ((t (:inherit highlight)))) '(Info-quoted ((t (:inherit org-block)))) '(org-priority ((t (:weight bold :inherit org-meta-line)))) - '(default ((t (:background "white" :foreground "black" :height 120 :family "Hack"))))) + '(default ((t (:background "white" :foreground "black" :height 140 :family "Hack"))))) (provide-theme 'blendoit-light) |