feat(wpcarro/emacs): Package theme.el

**TL;DR:**
- Rename `colorscheme.el` to `theme.el` to align with Emacs's nomenclature.
- Prune dependencies:
  - `cl-lib`
  - `>`
  - `prelude`

Change-Id: I15f225671b4096ab08913583b7b464e316c95298
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7412
Tested-by: BuildkiteCI
Reviewed-by: wpcarro <wpcarro@gmail.com>
This commit is contained in:
William Carroll 2022-11-25 10:36:02 -08:00 committed by wpcarro
parent 22c2c5ba46
commit 89e37ee877
5 changed files with 106 additions and 87 deletions

View file

@ -1,85 +0,0 @@
;;; colorscheme.el --- Syntax highlight and friends -*- lexical-binding: t -*-
;; Author: William Carroll <wpcarro@gmail.com>
;; Version: 0.0.1
;; Package-Requires: ((emacs "24.3"))
;;; Commentary:
;;
;; TODO: Clarify this.
;; Since I have my own definition of "theme", which couples wallpaper, font,
;; with Emacs's traditional notion of the word "theme", I'm choosing to use
;; "colorscheme" to refer to *just* the notion of syntax highlight etc.
;;; Code:
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Dependencies
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(require 'cycle)
(require '>)
(require 'cl-lib)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Library
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defcustom colorscheme-whitelist
(cycle-from-list
(->> (custom-available-themes)
(list-map #'symbol-name)
(list-filter (>-> (s-starts-with? "doom-")))
(list-map #'intern)))
"The whitelist of colorschemes through which to cycle.")
(defun colorscheme-current ()
"Return the currently enabled colorscheme."
(cycle-current colorscheme-whitelist))
(defun colorscheme-disable-all ()
"Disable all currently enabled colorschemes."
(interactive)
(->> custom-enabled-themes
(list-map #'disable-theme)))
(defun colorscheme-set (theme)
"Call `load-theme' with `THEME', ensuring that the line numbers are bright.
There is no hook that I'm aware of to handle this more elegantly."
(load-theme theme t)
(prelude-set-line-number-color "#da5468"))
(defun colorscheme-whitelist-set (colorscheme)
"Focus the COLORSCHEME in the `colorscheme-whitelist' cycle."
(cycle-focus! (lambda (x) (equal x colorscheme)) colorscheme-whitelist)
(colorscheme-set (colorscheme-current)))
(defun colorscheme-ivy-select ()
"Load a colorscheme using ivy."
(interactive)
(let ((theme (ivy-read "Theme: " (cycle-to-list colorscheme-whitelist))))
(colorscheme-disable-all)
(colorscheme-set (intern theme))))
(cl-defun colorscheme-cycle (&key forward?)
"Cycle next if `FORWARD?' is non-nil.
Cycle prev otherwise."
(disable-theme (cycle-current colorscheme-whitelist))
(let ((theme (if forward?
(cycle-next! colorscheme-whitelist)
(cycle-prev! colorscheme-whitelist))))
(colorscheme-set theme)
(message (s-concat "Active theme: " (symbol-to-string theme)))))
(defun colorscheme-next ()
"Disable the currently active theme and load the next theme."
(interactive)
(colorscheme-cycle :forward? t))
(defun colorscheme-prev ()
"Disable the currently active theme and load the previous theme."
(interactive)
(colorscheme-cycle :forward? nil))
(provide 'colorscheme)
;;; colorscheme.el ends here

View file

@ -17,11 +17,13 @@
(require 'prelude) (require 'prelude)
(require 'al) (require 'al)
(require 'fonts) (require 'fonts)
(require 'colorscheme) (require 'theme)
(require 'device) (require 'device)
(require 'laptop-battery) (require 'laptop-battery)
(require 'modeline) (require 'modeline)
(require 'general) (require 'general)
(require 'dash)
(require '>)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Configuration ;; Configuration
@ -162,7 +164,16 @@
;; during initialization? ;; during initialization?
(when (device-laptop?) (laptop-battery-display)) (when (device-laptop?) (laptop-battery-display))
(colorscheme-whitelist-set 'doom-peacock) (setq theme-whitelist
(->> (custom-available-themes)
(list-map #'symbol-name)
(list-filter (>-> (s-starts-with? "doom-")))
(list-map #'intern)
cycle-from-list))
(setq theme-linum-color-override "da5478")
(add-hook 'theme-after-change
(lambda () (prelude-set-line-number-color "#da5478")))
(theme-whitelist-set 'doom-flatwhite)
(when window-system (when window-system
;; On OSX, JetBrainsMono is installed as "JetBrains Mono", and I'm ;; On OSX, JetBrainsMono is installed as "JetBrains Mono", and I'm

View file

@ -53,6 +53,7 @@ let
string string
struct struct
symbol symbol
theme
tuple tuple
vterm-mgt vterm-mgt
zle zle

View file

@ -0,0 +1,14 @@
{ pkgs, depot, ... }:
pkgs.callPackage
({ emacsPackages }:
emacsPackages.trivialBuild {
pname = "theme";
version = "1.0.0";
src = ./theme.el;
packageRequires =
(with depot.users.wpcarro.emacs.pkgs; [
cycle
]);
})
{ }

View file

@ -0,0 +1,78 @@
;;; theme.el --- Colors and stuff -*- lexical-binding: t -*-
;; Author: William Carroll <wpcarro@gmail.com>
;; Version: 0.0.1
;; Package-Requires: ((emacs "24.3"))
;;; Commentary:
;;
;; Cycle through a whitelist of themes.
;;; Code:
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Dependencies
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(require 'cycle)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Library
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defgroup theme nil
"Customization options for `theme'."
:group 'theme)
(defcustom theme-whitelist
(cycle-from-list (custom-available-themes))
"The whitelist of themes through which to cycle."
:type '(cycle symbol)
:group 'theme)
(defcustom theme-after-change
nil
"Hook invoked after a new theme is loaded"
:type 'hook
:group 'theme)
(defun theme-whitelist-set (theme)
"Focus the THEME in the `theme-whitelist' cycle."
(cycle-focus! (lambda (x) (equal x theme)) theme-whitelist)
(theme--set (cycle-current theme-whitelist)))
(defun theme-select ()
"Load a theme using `completing-read'."
(interactive)
(let ((theme (completing-read "Theme: " (cycle-to-list theme-whitelist))))
(theme--disable-all)
(theme--set (intern theme))))
(defun theme-next ()
"Disable the currently active theme and load the next theme."
(interactive)
(disable-theme (cycle-current theme-whitelist))
(theme--set (cycle-next! theme-whitelist))
(message (format "Active theme: %s" (cycle-current theme-whitelist))))
(defun theme-prev ()
"Disable the currently active theme and load the previous theme."
(interactive)
(disable-theme (cycle-current theme-whitelist))
(theme--set (cycle-prev! theme-whitelist))
(message (format "Active theme: %s" (cycle-current theme-whitelist))))
(defun theme--disable-all ()
"Disable all currently enabled themes."
(interactive)
(dolist (x custom-enabled-themes)
(disable-theme x)))
(defun theme--set (theme)
"Call `load-theme' with `THEME', ensuring that the line numbers are bright.
There is no hook that I'm aware of to handle this more elegantly."
(load-theme theme t)
(run-hooks 'theme-after-change))
(provide 'theme)
;;; theme.el ends here