Delete {themes,wallpaper}.el
After my CI build for Emacs failed because the .local/share/wallpaper directory was missing I had two options: A. include .local/share/wallpaper in default.nix, which is cumbersome B. drop support for managing system wallpaper from Emacs I chose option B.
This commit is contained in:
William Carroll
parent
aa1b927ad2
commit
711820411c
3 changed files with 4 additions and 246 deletions
|
|
@ -1,151 +0,0 @@
|
||||||
;;; themes.el --- Functions for working with my themes. -*- lexical-binding: t -*-
|
|
||||||
;; Author: William Carroll <wpcarro@gmail.com>
|
|
||||||
|
|
||||||
;;; Commentary:
|
|
||||||
|
|
||||||
;; Because I couldn't get cycle-themes to work, I'm writing my own version.
|
|
||||||
;;
|
|
||||||
;; Terminology:
|
|
||||||
;; - colorscheme: determines the colors used by syntax highlighting and other
|
|
||||||
;; Emacs UI elements.
|
|
||||||
;; - theme: Structural representation of a "theme" that includes colorscheme
|
|
||||||
;; (see above), font, wallpaper. "theme" is a superset of "colorscheme".
|
|
||||||
;;
|
|
||||||
;; Wishlist:
|
|
||||||
;; - TODO: Support Rick & Morty theme.
|
|
||||||
;; - TODO: Support retro/arcade/80s theme.
|
|
||||||
|
|
||||||
;;; Code:
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
;; Dependencies
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
(require 'prelude)
|
|
||||||
(require 'alist)
|
|
||||||
(require 'symbol)
|
|
||||||
(require 'f)
|
|
||||||
(require 'wallpaper)
|
|
||||||
(require 'fonts)
|
|
||||||
(require 'cycle)
|
|
||||||
(require 'symbol)
|
|
||||||
(require 'random)
|
|
||||||
(require 'colorscheme)
|
|
||||||
(require 'dotted)
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
;; Library
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
;; The theme struct couples a font, a wallpaper, and a colorschemes.
|
|
||||||
(cl-defstruct theme font wallpaper colorscheme)
|
|
||||||
|
|
||||||
(defvar themes/current nil
|
|
||||||
"Store the name of the currently enabled theme.")
|
|
||||||
|
|
||||||
(defconst themes/preferred-font "JetBrainsMono"
|
|
||||||
"The font I currently favor.")
|
|
||||||
|
|
||||||
(defconst themes/themes
|
|
||||||
(list (dotted/new "Forest"
|
|
||||||
(make-theme
|
|
||||||
:font themes/preferred-font
|
|
||||||
:wallpaper "forest_8k.jpg"
|
|
||||||
:colorscheme 'doom-peacock))
|
|
||||||
(dotted/new "Geometry"
|
|
||||||
(make-theme
|
|
||||||
:font themes/preferred-font
|
|
||||||
:wallpaper "geometric_4k.jpg"
|
|
||||||
:colorscheme 'doom-molokai))
|
|
||||||
(dotted/new "Shapely Patterns"
|
|
||||||
(make-theme
|
|
||||||
:font themes/preferred-font
|
|
||||||
:wallpaper "geometric_dark_4k.jpg"
|
|
||||||
:colorscheme 'doom-vibrant))
|
|
||||||
;; TODO: Support setting backgrounds as solid colors.
|
|
||||||
(dotted/new "Gruvbox"
|
|
||||||
(make-theme
|
|
||||||
:font themes/preferred-font
|
|
||||||
:wallpaper "forest_8k.jpg"
|
|
||||||
:colorscheme 'doom-gruvbox))
|
|
||||||
(dotted/new "Solarized Light"
|
|
||||||
(make-theme
|
|
||||||
:font themes/preferred-font
|
|
||||||
:wallpaper "solarized_light_thinkpad.jpg"
|
|
||||||
:colorscheme 'doom-solarized-light))
|
|
||||||
(dotted/new "Fantasy Tree"
|
|
||||||
(make-theme
|
|
||||||
:font themes/preferred-font
|
|
||||||
:wallpaper "fantasy_tree_4k.jpg"
|
|
||||||
:colorscheme 'doom-outrun-electric)))
|
|
||||||
"Predefined themes to suit my whims.")
|
|
||||||
|
|
||||||
;; TODO: Choose between plural and singular names for Elisp modules. For
|
|
||||||
;; example, why have themes.el and colorscheme.el. I think singular is
|
|
||||||
;; preferable.
|
|
||||||
;; TODO: Decide between "message", "show", "print", "inspect" for naming
|
|
||||||
;; commands that output human-readable information to the "*Messages*" buffer.
|
|
||||||
;; TODO: Is there a idiomatic CL/Elisp way to print struct information?
|
|
||||||
(defun themes/print (name)
|
|
||||||
"Print a human-readable description of theme named NAME."
|
|
||||||
(let* ((theme (alist/get name themes/themes))
|
|
||||||
(f (theme-font theme))
|
|
||||||
(w (theme-wallpaper theme))
|
|
||||||
(c (theme-colorscheme theme)))
|
|
||||||
(message (string/format
|
|
||||||
"[themes] Name: %s. Font: %s. Wallpaper: %s. Colorscheme: %s"
|
|
||||||
name f w c))))
|
|
||||||
|
|
||||||
;; TODO: Make this into a proper test.
|
|
||||||
(defun themes/debug ()
|
|
||||||
"Print a human-readable description of theme named NAME."
|
|
||||||
(interactive)
|
|
||||||
(let ((theme (alist/get themes/current themes/themes)))
|
|
||||||
(prelude/assert (equal (theme-font theme)
|
|
||||||
(fonts/current)))
|
|
||||||
(prelude/assert (equal (theme-wallpaper theme)
|
|
||||||
(f-filename (wallpaper/current))))
|
|
||||||
(prelude/assert (equal (theme-colorscheme theme)
|
|
||||||
(colorscheme/current)))
|
|
||||||
(message "[themes] Debug couldn't find any inconsistencies. All good!")))
|
|
||||||
|
|
||||||
;; TODO: Assert that all of the dependencies exist before attempting to load
|
|
||||||
;; theme.
|
|
||||||
;; TODO: Provide a friendlier way to define themes.
|
|
||||||
(defun themes/ivy-select ()
|
|
||||||
"Use ivy to interactively load a theme."
|
|
||||||
(interactive)
|
|
||||||
(let* ((name (ivy-read "Theme: " (alist/keys themes/themes))))
|
|
||||||
(message (string/format "name: %s" name))
|
|
||||||
(themes/set name)))
|
|
||||||
|
|
||||||
(defun themes/load (theme)
|
|
||||||
"Load the struct, THEME."
|
|
||||||
(colorscheme/disable-all)
|
|
||||||
(let* ((font (theme-font theme))
|
|
||||||
(wallpaper (theme-wallpaper theme))
|
|
||||||
(colorscheme (theme-colorscheme theme)))
|
|
||||||
(fonts/whitelist-set font)
|
|
||||||
(wallpaper/whitelist-set (f-join wallpaper/path-to-dir wallpaper))
|
|
||||||
(colorscheme/whitelist-set colorscheme)))
|
|
||||||
|
|
||||||
(defun themes/set (name)
|
|
||||||
"Set the currently enabled theme to the theme named NAME.
|
|
||||||
NAME needs to a key defined in `themes/themes'."
|
|
||||||
(prelude/assert (alist/has-key? name themes/themes))
|
|
||||||
(themes/load (alist/get name themes/themes))
|
|
||||||
(setq themes/current name))
|
|
||||||
|
|
||||||
(defun themes/print-current ()
|
|
||||||
"Print the currently enabled theme."
|
|
||||||
(interactive)
|
|
||||||
(themes/print themes/current))
|
|
||||||
|
|
||||||
(defun themes/random ()
|
|
||||||
"Return the name of a randomly selected theme in `themes/themes'."
|
|
||||||
(->> themes/themes
|
|
||||||
alist/keys
|
|
||||||
random/choice))
|
|
||||||
|
|
||||||
(provide 'themes)
|
|
||||||
;;; themes.el ends here
|
|
||||||
|
|
@ -1,92 +0,0 @@
|
||||||
;;; wallpaper.el --- Control Linux desktop wallpaper -*- lexical-binding: t -*-
|
|
||||||
;; Author: William Carroll <wpcarro@gmail.com>
|
|
||||||
|
|
||||||
;;; Commentary:
|
|
||||||
;; Functions for setting desktop wallpaper.
|
|
||||||
|
|
||||||
;;; Code:
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
;; Dependencies
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
(require 'prelude)
|
|
||||||
(require 'fs)
|
|
||||||
(require 'cycle)
|
|
||||||
(require 'string)
|
|
||||||
(require 'general)
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
;; Library
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
(defcustom wallpaper/keybindings? t
|
|
||||||
"If non-nil, install the keybindings.")
|
|
||||||
|
|
||||||
(defcustom wallpaper/path-to-dir
|
|
||||||
(f-expand "~/.local/share/wallpaper")
|
|
||||||
"Path to the images that will be used as the wallpaper.")
|
|
||||||
|
|
||||||
(defconst wallpaper/whitelist
|
|
||||||
(cycle/from-list
|
|
||||||
(fs/ls wallpaper/path-to-dir t))
|
|
||||||
"My preferred computer wallpapers.")
|
|
||||||
|
|
||||||
(defun wallpaper/set (path)
|
|
||||||
"Set computer wallpaper to image at `PATH' using `feh` under-the-hood.
|
|
||||||
`PATH' can be absolute or relative since `f-expand' is called in the function
|
|
||||||
body to ensure feh can resolve the path."
|
|
||||||
(prelude/start-process
|
|
||||||
:name "wallpaper/set"
|
|
||||||
:command (string/format "feh --bg-scale --no-feh-bg %s" (f-expand path))))
|
|
||||||
|
|
||||||
(defun wallpaper/whitelist-set (wallpaper)
|
|
||||||
"Focuses the WALLPAPER in the `wallpaper/whitelist' cycle."
|
|
||||||
(cycle/focus (lambda (x) (equal x wallpaper)) wallpaper/whitelist)
|
|
||||||
(wallpaper/set (wallpaper/current)))
|
|
||||||
|
|
||||||
(defun wallpaper/next ()
|
|
||||||
"Cycles to the next wallpaper."
|
|
||||||
(interactive)
|
|
||||||
(let ((wallpaper (cycle/next wallpaper/whitelist)))
|
|
||||||
(wallpaper/set wallpaper)
|
|
||||||
(message (string/format "Active wallpaper: %s" (f-filename wallpaper)))))
|
|
||||||
|
|
||||||
(defun wallpaper/prev ()
|
|
||||||
"Cycles to the previous wallpaper."
|
|
||||||
(interactive)
|
|
||||||
(let ((wallpaper (cycle/prev wallpaper/whitelist)))
|
|
||||||
(wallpaper/set wallpaper)
|
|
||||||
(message (string/format "Active wallpaper: %s" (f-filename wallpaper)))))
|
|
||||||
|
|
||||||
;; TODO: Define a macro that handles, next, prev, select, current for working
|
|
||||||
;; with cycles, since this is a common pattern.
|
|
||||||
|
|
||||||
(defun wallpaper/print-current ()
|
|
||||||
"Message the currently enabled wallpaper."
|
|
||||||
(interactive)
|
|
||||||
(message
|
|
||||||
(cycle/current wallpaper/whitelist)))
|
|
||||||
|
|
||||||
(defun wallpaper/current ()
|
|
||||||
"Return the currently enabled wallpaper."
|
|
||||||
(cycle/current wallpaper/whitelist))
|
|
||||||
|
|
||||||
(defun wallpaper/ivy-select ()
|
|
||||||
"Use `counsel' to select and set a wallpaper from the `wallpaper/whitelist'."
|
|
||||||
(interactive)
|
|
||||||
(wallpaper/whitelist-set
|
|
||||||
(ivy-read "Select wallpaper: " (cycle/to-list wallpaper/whitelist))))
|
|
||||||
|
|
||||||
;; TODO: Create macro-based module system that will auto-namespace functions,
|
|
||||||
;; constants, etc. with the filename like `wallpaper'.
|
|
||||||
|
|
||||||
(when wallpaper/keybindings?
|
|
||||||
(general-define-key
|
|
||||||
:prefix "<SPC>"
|
|
||||||
:states '(normal)
|
|
||||||
"Fw" #'wallpaper/next
|
|
||||||
"Pw" #'wallpaper/prev))
|
|
||||||
|
|
||||||
(provide 'wallpaper)
|
|
||||||
;;; wallpaper.el ends here
|
|
||||||
|
|
@ -12,7 +12,8 @@
|
||||||
|
|
||||||
(require 'prelude)
|
(require 'prelude)
|
||||||
(require 'alist)
|
(require 'alist)
|
||||||
(require 'themes)
|
(require 'fonts)
|
||||||
|
(require 'colorscheme)
|
||||||
(require 'device)
|
(require 'device)
|
||||||
(require 'laptop-battery)
|
(require 'laptop-battery)
|
||||||
(require 'modeline)
|
(require 'modeline)
|
||||||
|
|
@ -176,8 +177,8 @@
|
||||||
(when (device/work-laptop?)
|
(when (device/work-laptop?)
|
||||||
(laptop-battery/display))
|
(laptop-battery/display))
|
||||||
|
|
||||||
;; Load a theme
|
(fonts/whitelist-set "JetBrainsMono")
|
||||||
(themes/set "Solarized Light")
|
(colorscheme/whitelist-set 'doom-solarized-light)
|
||||||
|
|
||||||
(modeline/setup)
|
(modeline/setup)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue