Move themes

lisp/icejam-custom-init.el

@@ -30,10 +30,14 @@
 
 (straight-use-package 'use-package)
 
+;; I don't know why this needs to be here and with a lisp specifier, but
+;; normal subdirs.el file doesn't work.
+(normal-top-level-add-to-load-path '("lisp/themes" "lisp/langs"))
+
 ;; (add-to-list 'load-path (concat user-emacs-directory "pkg"))
 
 ;; General configuration files.
-(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
+(require 'icejam-keys-mode)
 (require 'icejam-base)
 (require 'icejam-sys-specific)
 (require 'icejam-ivy)
@@ -52,8 +56,8 @@
 (require 'icejam-speed-type)
 
 ;; Themes
-(require '+custom-pkg-themes "$HOME/.emacs.d/pkg/themes.el")
+(require 'icejam-themes)
-(require '+custom-pkg-fonts "$HOME/.emacs.d/pkg/fonts.el")
+(require 'icejam-fonts)
 
 ;; Actual supported languages and file syntax.
 (require '+custom-lang-clang "$HOME/.emacs.d/lang/clang.el")
@@ -84,7 +88,7 @@
 (require '+custom-lang-ziglang "$HOME/.emacs.d/lang/ziglang.el")
 
 ;; Diminish modeline litter
-(require '+custom-pkg-diminish "$HOME/.emacs.d/pkg/diminish.el")
+(require 'icejam-diminish)
 
 ;; Restore GC to normal, but still high
 (setq gc-cons-threshold 100000000)

lisp/icejam-deft.el

@@ -1,9 +1,9 @@
-;;; pkg/deft.el -- summary -*- lexical-binding: t; -*-
+;;; icejam-deft.el -- summary -*- lexical-binding: t; -*-
 ;;; Commentary:
 ;;; Notational velocity, backed by OneDrive.
 ;;; Code:
 
-(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
+(require 'icejam-keys-mode)
 (require 'icejam-transient)
 
 (use-package deft

lisp/icejam-diminish.el

@@ -1,4 +1,4 @@
-;;; diminish.el --- summary -*- lexical-binding: t; -*-
+;;; icejam-diminish.el --- summary -*- lexical-binding: t; -*-
 
 ;; Author: Maciej Szlosarczyk
 ;; Maintainer: Maciej Szlosarczyk
@@ -23,5 +23,5 @@
 (eval-after-load "whitespace" '(diminish 'whitespace-mode))
 (eval-after-load "auto-revert-mode" '(diminish 'auto-revert-mode))
 
-(provide '+custom-pkg-diminish)
+(provide 'icejam-diminish)
-;;; diminish.el ends here
+;;; icejam-diminish.el ends here

lisp/icejam-fonts.el

@@ -1,4 +1,4 @@
-;;; fonts.el --- summary -*- lexical-binding: t; -*-
+;;; icejam-fonts.el --- summary -*- lexical-binding: t; -*-
 
 ;; Author: Maciej Szlosarczyk
 ;; Maintainer: Maciej Szlosarczyk
@@ -118,5 +118,5 @@
                     :foreground (face-foreground 'default)
                     :background (face-background 'default))
 
-(provide '+custom-pkg-fonts)
+(provide 'icejam-fonts)
-;;; fonts.el ends here
+;;; icejam-fonts.el ends here

lisp/icejam-ivy.el

@@ -1,10 +1,9 @@
-;;; pkg/ivy -- summary -*- lexical-binding: t; -*-
+;;; icejam-ivy -- Counsel, Swiper and Ivy. -*- lexical-binding: t; -*-
 ;;; Commentary:
-;;; Counsel, Swiper and Ivy.
+;;;
 ;;; Code:
 
-(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
+(require 'icejam-keys-mode)
-
 
 (use-package helpful :straight t :defer t)
 (use-package counsel :straight t :defer t :requires (helpful)

lisp/icejam-keys-mode.el

@@ -1,4 +1,4 @@
-;;; keys-mode.el --- summary -*- lexical-binding: t; -*-
+;;; icejam-keys-mode.el --- summary -*- lexical-binding: t; -*-
 
 ;; Author: Maciej Szlosarczyk
 ;; Maintainer: Maciej Szlosarczyk
@@ -51,5 +51,5 @@
 (define-key +custom-keys-mode-map [home] 'beginning-of-line)
 (define-key +custom-keys-mode-map [end] 'end-of-line)
 
-(provide '+custom-pkg-keys-mode)
+(provide 'icejam-keys-mode)
-;;; keys-mode.el ends here
+;;; icejam-keys-mode.el ends here

lisp/icejam-sys-specific.el

@@ -7,7 +7,7 @@
 (defconst IS-BSD (eq system-type 'berkeley-unix))
 (defconst IS-GNU (eq system-type 'gnu/linux))
 
-(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
+(require 'icejam-keys-mode)
 
 (defun +custom-function-delete-window ()
   "Kill a window."

lisp/icejam-themes.el

@@ -1,4 +1,4 @@
-;;; Themes -- summary -*- lexical-binding: t; -*-
+;;; icejam-themes.el -- Theme configuration -*- lexical-binding: t; -*-
 ;;; Commentary:
 ;;; Code:
 
@@ -43,15 +43,11 @@
 (load-theme 'sanityinc-tomorrow-night t t)
 
 ;; My own theme modifications:
-(require 'base16-zenburn-modified-theme
+(require 'icejam-base16-zenburn)
-         "$HOME/.emacs.d/themes/base16-zenburn-modified.el")
+(require 'icejam-base16-harmonic-light)
-
-(require 'base16-harmonic-light-modified-theme
-         "$HOME/.emacs.d/themes/base16-harmonic-light-modified.el")
 
 (spaceline-emacs-theme)
-
 (enable-theme 'base16-zenburn-modified)
 
-(provide '+custom-pkg-themes)
+(provide 'icejam-themes)
-;;; themes.el ends here
+;;; icejam-themes.el ends here

lisp/themes/icejam-base16-harmonic-light.el

@@ -36,5 +36,5 @@
 
 ;; Mark the theme as provided
 (provide-theme 'base16-harmonic-light-modified)
-(provide 'themes/base16-harmonic-light-modified-theme)
+(provide 'icejam-base16-harmonic-light)
-;;; base16-harmonic-light-modified-theme.el ends here
+;;; icejam-base16-harmonic-light.el ends here

lisp/themes/icejam-base16-not-harmonic.el

@@ -55,7 +55,5 @@
 
 ;; Mark the theme as provided
 (provide-theme 'base16-not-harmonic)
-
+(provide 'icejam-base16-not-harmonic)
-(provide 'base16-not-harmonic-theme)
+;;; icejam-base16-not-harmonic.el ends here
-
-;;; base16-not-harmonic-theme.el ends here

lisp/themes/icejam-base16-summerfruit-light.el

@@ -36,5 +36,5 @@
 
 ;; Mark the theme as provided
 (provide-theme 'base16-summerfruit-light-modified)
-(provide 'themes/base16-summerfruit-light-modified-theme)
+(provide 'icejam-base16-summerfruit-light)
-;;; base16-summerfruit-light-modified-theme.el ends here
+;;; icejam-base16-summerfruit-light.el ends here

lisp/themes/icejam-base16-zenburn.el

@@ -46,6 +46,5 @@
 
 ;; Mark the theme as provided
 (provide-theme 'base16-zenburn-modified)
-
+(provide 'icejam-base16-zenburn)
-(provide 'base16-zenburn-modified-theme)
+;;; icejam-base16-zenburn.el ends here
-;;; base16-zenburn-modified-theme.el ends here

lisp/themes/icejam-tronesque.el

@@ -384,4 +384,5 @@ More information on Tron: https://en.wikipedia.org/wiki/Tron")
                (file-name-as-directory (file-name-directory load-file-name))))
 
 (provide-theme 'tronesque)
-;;; tronesque-theme.el ends here
+(provide icejam-tronesque)
+;;; icejam-tronesque.el ends here