diff --git a/init.el b/init.el index 2d503d1..96d354e 100644 --- a/init.el +++ b/init.el @@ -94,7 +94,7 @@ ;; If there is more than one, they won't work right. '(font-lock-constant-face ((((type graphic)) (:foreground "#dfaf8f")) (((min-colors 256)) (:foreground "brightred")) (t (:foreground "brightred")))) '(font-lock-type-face ((t (:foreground "#ffcb6b" :family "JetBrains Mono")))) - '(markdown-code-face ((t (:inherit fixed-pitch :family "JetBrains Mono")))) + '(markdown-code-face ((t (:inherit fixed-pitch :family "IBM Plex Mono")))) '(mmm-default-submode-face ((t nil)))) ;; Restore GC to normal, but still high diff --git a/lang/elixir.el b/lang/elixir.el index df2319f..86adc9f 100644 --- a/lang/elixir.el +++ b/lang/elixir.el @@ -14,7 +14,7 @@ " ^ Elixir actions ^^^^^^^^-------------------------------------------------------------------------------------------- -Buffer: _r_: Reload _f_: Format _i_: Indent +Buffer: _r_: Reload _f_: Format _i_: Indent _e_: Show Errors Other: _m_: iMenu ^^ " @@ -22,6 +22,7 @@ Other: _m_: iMenu ("r" revert-buffer-no-confirm) ("i" mark-and-indent-whole-buffer) ("f" elixir-format) + ("e" flycheck-list-errors) ("m" lsp-ui-imenu)) (defun activate-elixir-mode () diff --git a/pkg/fonts.el b/pkg/fonts.el index a597156..f11cf8a 100644 --- a/pkg/fonts.el +++ b/pkg/fonts.el @@ -12,18 +12,41 @@ ;; Set font face ;;;;;;;;;;;;;;;;;;;;;; Font configuration ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(defun +custom-set-lsp-ui-font-hook () + "Reset LSP IO font to specified +custom-font and +custom-font-size." + (setq lsp-ui-doc-frame-hook nil) + (add-hook 'lsp-ui-doc-frame-hook + (lambda (frame _w) + (set-face-attribute + 'default frame :font + (format "%s %d" +custom-font (- +custom-font-size 2)))))) + (defun set-font (name size) "Set font to NAME and its SIZE to X pixels." (interactive "sNew font: \nnEnter size for %s: ") + (defvar +custom-font name) + (defvar +custom-font-size size) + (set-face-attribute 'default nil :font (format "%s %d" name size)) - ;; Set modeline font to be 1 pixel point smaller than the general font + + ;; Set comletion and modeline font to be 1 pixel point smaller than + ;; the general font + ;; (set-face-attribute 'markdown-code-face nil :font (format "%s %d" name (- size 1))) + (set-face-attribute 'tooltip nil :font (format "%s %d" name (- size 1))) + (set-face-attribute 'company-tooltip nil :font (format "%s %d" name (- size 1))) + (set-face-attribute 'company-tooltip-annotation nil :font (format "%s %d" name (- size 1))) + (set-face-attribute 'company-tooltip-mouse nil :font (format "%s %d" name (- size 1))) (set-face-attribute 'mode-line nil :font (format "%s %d" name (- size 1))) - (set-face-attribute 'mode-line-inactive nil :font - (format "%s %d" name (- size 1)))) + (set-face-attribute 'mode-line-inactive nil :font (format "%s %d" name (- size 1))) + + ;; Call LSP-UI hook + (+custom-set-lsp-ui-font-hook)) ;; (defconst +custom-font "Iosevka Term") ;; (defconst +custom-font "JetBrains Mono") -(defconst +custom-font "IBM Plex Mono") +(defvar +custom-font "IBM Plex Mono") +(defvar +custom-font-size 14) + (defun set-font-to-screen () "Automatically set font size to suit the monitor." diff --git a/pkg/themes.el b/pkg/themes.el index c0c1653..92efec4 100644 --- a/pkg/themes.el +++ b/pkg/themes.el @@ -14,17 +14,21 @@ (use-package flatui-theme :straight t :defer t) (use-package planet-theme :straight t :defer t) (use-package apropospriate-theme :straight t :defer t) +(use-package material-theme :straight t :defer t) ;; Disable cursor blinking (blink-cursor-mode 0) ;; Light themes +(load-theme 'material-light t) +(load-theme 'base16-zenburn t) (load-theme 'base16-atelier-forest-light t t) (load-theme 'base16-harmonic-light t t) (load-theme 'apropospriate-light t t) (load-theme 'base16-humanoid-light t t) ;; Dark themes +(load-theme 'material t) (load-theme 'base16-solarflare t t) (load-theme 'base16-snazzy t t) (load-theme 'base16-gruvbox-dark-hard t t) @@ -32,9 +36,7 @@ (if (display-graphic-p) (progn (sml/apply-theme 'respectful) - (enable-theme (nth - (random 2) - '(base16-humanoid-light base16-harmonic-light)))) + (enable-theme 'base16-harmonic-light)) (progn (defvar base16-theme-256-color-source "base16-shell") (enable-theme 'apropospriate-light)))