diff --git a/modules/ui/pretty-code/autoload/iosevka.el b/modules/ui/pretty-code/autoload/iosevka.el index 670f6fd67..bcd482605 100644 --- a/modules/ui/pretty-code/autoload/iosevka.el +++ b/modules/ui/pretty-code/autoload/iosevka.el @@ -1,6 +1,5 @@ ;;; ui/pretty-code/autoload/iosevka.el -*- lexical-binding: t; -*- -;;;###autoload (defvar +pretty-code--iosevka-font-names '( "iosevka-custom-lightoblique.ttf" @@ -26,29 +25,12 @@ "iosevka-custom-regular.ttf")) ;;;###autoload -(defun +pretty-code/install-iosevka-font (&optional pfx) - "Helper function to download and install Iosevka font based on OS. -When PFX is non-nil, ignore the prompt and just install" +(defun +pretty-code/install-iosevka-font (&optional prefix) + "Download and install Iosevka font based on OS. +When prefix is non-nil, ignore the prompt and just install." (interactive "P") - (when (or pfx (yes-or-no-p "This will download and install the Iosevka fonts, are you sure you want to do this?")) - (let* ((url-format "https://github.com/jsravn/iosevka-emacs/raw/master/%s") - (font-dest (cl-case window-system - (x (concat (or (getenv "XDG_DATA_HOME") ;; Default Linux install directories - (concat (getenv "HOME") "/.local/share")) - "/fonts/")) - (mac (concat (getenv "HOME") "/Library/Fonts/" )) - (ns (concat (getenv "HOME") "/Library/Fonts/" )))) ;; Default MacOS install directory - (known-dest? (stringp font-dest)) - (font-dest (or font-dest (read-directory-name "Font installation directory: " "~/")))) - - (unless (file-directory-p font-dest) (mkdir font-dest t)) - - (dolist (font +pretty-code--iosevka-font-names) - (url-copy-file (format url-format font) (expand-file-name font font-dest) t)) - - (when known-dest? - (message "Font downloaded, updating font cache... ") - (shell-command-to-string (format "fc-cache -f -v"))) - (message "Successfully %s `Iosevka' fonts to `%s'!" - (if known-dest? "installed" "downloaded") - font-dest)))) + (+pretty-code--install-font + prefix + "Iosevka" + "https://github.com/jsravn/iosevka-emacs/raw/master/%s" + +pretty-code--iosevka-font-names)) diff --git a/modules/ui/pretty-code/config.el b/modules/ui/pretty-code/config.el index a1f942bc0..bb378e39a 100644 --- a/modules/ui/pretty-code/config.el +++ b/modules/ui/pretty-code/config.el @@ -95,3 +95,38 @@ Otherwise it builds `prettify-code-symbols-alist' according to (load! "+hasklig")) ((featurep! +pragmata-pro) (load! "+pragmata-pro"))) + +(defun +pretty-code--install-font (prefix name url-format fonts-alist) + "Install fonts to the local system. + +If PREFIX is nil, will prompt whether or not to download. NAME is informational only. +URL-FORMAT is a format string that should be a url and have a single %s, which is expanded +for each font in FONTS-ALIST. FONTS-ALIST should be the filename of each font. It is used +as the source and destination filename. +" + (when (or prefix (yes-or-no-p + (format "This will download and install the %s fonts, are you sure you want to do this?" name))) + (let* ((font-dest (cl-case window-system + ;; Linux + (x (concat (or (getenv "XDG_DATA_HOME") + (concat (getenv "HOME") "/.local/share")) + "/fonts/")) + ;; MacOS + (mac (concat (getenv "HOME") "/Library/Fonts/" )) + (ns (concat (getenv "HOME") "/Library/Fonts/" )))) + (known-dest? (stringp font-dest)) + (font-dest (or font-dest (read-directory-name "Font installation directory: " "~/")))) + + (unless (file-directory-p font-dest) (mkdir font-dest t)) + + (dolist (font fonts-alist) + (url-copy-file (format url-format font) (expand-file-name font font-dest) t)) + + (when known-dest? + (message "Font downloaded, updating font cache... ") + (shell-command-to-string (format "fc-cache -f -v"))) + (message "Successfully %s `%s' fonts to `%s'!" + (if known-dest? "installed" "downloaded") + name + font-dest))) + )