diff options
| -rw-r--r-- | .config/emacs/modules/bd--themes.el | 72 | ||||
| -rw-r--r-- | .config/guix/modules/packages/font-medieval-sharp.scm | 34 | ||||
| -rw-r--r-- | .config/guix/modules/packages/font-runa-mono.scm | 34 | ||||
| -rw-r--r-- | .config/guix/modules/packages/packages.scm | 8 |
4 files changed, 115 insertions, 33 deletions
diff --git a/.config/emacs/modules/bd--themes.el b/.config/emacs/modules/bd--themes.el index 5d7c6f9..69a1e5d 100644 --- a/.config/emacs/modules/bd--themes.el +++ b/.config/emacs/modules/bd--themes.el @@ -3,32 +3,6 @@ ;;; Code: -(defun bd/enable-variable-pitch-exempt () - "Text modes to exempt from variable pitch fonts." - (unless (derived-mode-p 'latex-mode 'mhtml-mode 'nxml-mode 'yaml-mode) - (variable-pitch-mode 1))) - -(defvar bd/enable-variable-pitch-in-hooks - '(text-mode-hook) - "List of hook symbols to add `variable-pitch-mode' -to.") - -(mapc - (lambda (hook) - (add-hook hook #'bd/enable-variable-pitch-exempt)) - bd/enable-variable-pitch-in-hooks) - -(set-face-attribute 'variable-pitch nil - :family "Dejavu Math TeX Gyre" - :height 110) -(set-face-attribute 'fixed-pitch nil - :family "Terminus" - :height 110) -(set-face-attribute 'default nil - :family "Terminus" - :height 140) - - (use-package modus-themes :load-path (lambda () (expand-file-name "themes/" data-directory)) :demand t @@ -49,7 +23,7 @@ and some other minor face changes." modus-themes-mixed-fonts t modus-themes-italic-constructs t modus-themes-bold-constructs t - modus-themes-variable-pitch-ui nil + modus-themes-variable-pitch-ui t modus-themes-prompts '(bold) modus-themes-headings '((0 variable-pitch regular 1.3) @@ -69,8 +43,8 @@ and some other minor face changes." (border-mode-line-active nil) (border-mode-line-inactive nil) (bg-tab-bar bg-main) - (bg-tab-current "#3b3d62") - (bg-tab-other bg-main) + (bg-tab-current bg-main) + (bg-tab-other "#3b3d62") (fg-heading-0 "#b2ebf2") (fg-heading-1 "#98fb98") @@ -105,10 +79,46 @@ and some other minor face changes." (variable "#98fb98") (docstring "#f0e68c") (constant "#fa80e6")))) - -(load-theme 'modus-vivendi-tinted :no-confirm) (run-hooks 'modus-themes-post-load-hook) +(defun bd/enable-variable-pitch-exempt () + "Text modes to exempt from variable pitch fonts." + (unless (derived-mode-p 'latex-mode 'mhtml-mode 'nxml-mode 'yaml-mode) + (variable-pitch-mode 1))) + +(defvar bd/enable-variable-pitch-in-hooks + '(text-mode-hook) + "List of hook symbols to add `variable-pitch-mode' +to.") + +(mapc + (lambda (hook) + (add-hook hook #'bd/enable-variable-pitch-exempt)) + bd/enable-variable-pitch-in-hooks) + +(set-face-attribute 'variable-pitch nil + :family "Dejavu Serif" + :height 110) +(set-face-attribute 'fixed-pitch nil + :family "Iosevka" + :height 120) +(set-face-attribute 'default nil + :family "Iosevka" + :height 140) +(set-face-attribute 'modus-themes-ui-variable-pitch nil + :family "MedievalSharp" + :height 130) +(mapc (lambda (x) (set-face-attribute x nil :family "MedievalSharp")) + '(modus-themes-heading-0 + modus-themes-heading-1 + modus-themes-heading-2 + modus-themes-heading-3 + modus-themes-heading-4 + modus-themes-heading-5 + modus-themes-heading-6 + modus-themes-heading-7 + modus-themes-heading-8)) + (provide 'bd--themes) ;;; bd--themes.el ends here diff --git a/.config/guix/modules/packages/font-medieval-sharp.scm b/.config/guix/modules/packages/font-medieval-sharp.scm new file mode 100644 index 0000000..93890c7 --- /dev/null +++ b/.config/guix/modules/packages/font-medieval-sharp.scm @@ -0,0 +1,34 @@ +(define-module (packages font-medieval-sharp) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) + #:use-module (guix packages) + #:use-module (gnu packages autotools) + #:use-module (guix gexp) + #:use-module (guix build-system font) + #:use-module (guix download) + #:export (font-medieval-sharp)) + +;;; Commentary: +;;; provides the medieval-sharp font +;;; Code: + +(define-public font-medieval-sharp + ;; Upstream doesn't provide any version numbers. It may be desirable to + ;; mirror this elsewhere to avoid suddenly losing the current source file. + (package + (name "font-medieval-sharp") + (version "20200401") + (source (origin + (method url-fetch) + (uri "https://fontlibrary.org/assets/downloads/medievalsharp/a03760934a82973ef127071373557645/medievalsharp.zip") + (sha256 + (base32 + "1z7gp1q6j3zra22r9clccr7a77wzgyhyip5gjd1y7x58ipglhrw1")))) + (build-system font-build-system) + (home-page "https://fontlibrary.org/en/font/medievalsharp") + (synopsis "A font created for inscriptions on stone, based on gothic letters.") + (description + "A font created for inscriptions on stone, based on gothic letters.") + (license license:silofl1.1))) + +;;; font-medieval-sharp.scm ends here diff --git a/.config/guix/modules/packages/font-runa-mono.scm b/.config/guix/modules/packages/font-runa-mono.scm new file mode 100644 index 0000000..5ef3f12 --- /dev/null +++ b/.config/guix/modules/packages/font-runa-mono.scm @@ -0,0 +1,34 @@ +(define-module (packages font-runa-mono) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) + #:use-module (guix packages) + #:use-module (gnu packages autotools) + #:use-module (guix gexp) + #:use-module (guix build-system font) + #:use-module (guix download) + #:export (font-runa-mono)) + +;;; Commentary: +;;; provides the runa-mono font +;;; Code: + +(define-public font-runa-mono + ;; Upstream doesn't provide any version numbers. It may be desirable to + ;; mirror this elsewhere to avoid suddenly losing the current source file. + (package + (name "font-runa-mono") + (version "20151014") + (source (origin + (method url-fetch) + (uri "https://fontlibrary.org/assets/downloads/runa-mono/cd1ea272ab14c2f15d42b474db5573a1/runa-mono.zip") + (sha256 + (base32 + "14l5rhdrcw4p43qzv06jzl5bcbpg5n7ai6gf4bikq2ads3bxyi1m")))) + (build-system font-build-system) + (home-page "https://fontlibrary.org/en/font/runa-mono") + (synopsis "A font created to provide typography for runic characters.") + (description + "RunaMono is a free font project created mainly to provide typography for runic characters (Unicode: 16A0-16F8) and to map runic characters with standard latin alphabet.") + (license license:silofl1.1))) + +;;; font-runa-mono.scm ends here diff --git a/.config/guix/modules/packages/packages.scm b/.config/guix/modules/packages/packages.scm index 8a3b9ee..8c94187 100644 --- a/.config/guix/modules/packages/packages.scm +++ b/.config/guix/modules/packages/packages.scm @@ -4,6 +4,8 @@ #:use-module (guix gexp) #:use-module (guix packages) #:use-module (packages python-austin) + #:use-module (packages font-medieval-sharp) + #:use-module (packages font-runa-mono) #:use-module (packages offlineimap-patched) #:use-module (packages bdwm) #:export (bd-packages-system @@ -31,7 +33,7 @@ databases ;; recutils engineering ;; rizin, cutter emulators ;; mupen64plus*, bsnes, mgba - fonts ;; font-terminus, font-awesome + fonts ;; font-terminus fontutils ;; fontconfig games ;; nethack gdb ;; gdb @@ -98,7 +100,9 @@ ffmpeg flameshot fontconfig - font-terminus + font-iosevka + font-medieval-sharp + font-runa-mono gnupg graphviz imagemagick |