From bf90b046b8fcc416dacefd3ea64b57a104aa9596 Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej@sosek.net>
Date: Sat, 27 Jul 2024 10:35:26 +0300
Subject: [PATCH] Move themes

---
 lisp/icejam-custom-init.el                         | 12 ++++++++----
 lisp/icejam-deft.el                                |  4 ++--
 pkg/diminish.el => lisp/icejam-diminish.el         |  6 +++---
 pkg/fonts.el => lisp/icejam-fonts.el               |  6 +++---
 lisp/icejam-ivy.el                                 |  7 +++----
 pkg/keys-mode.el => lisp/icejam-keys-mode.el       |  6 +++---
 lisp/icejam-sys-specific.el                        |  2 +-
 pkg/themes.el => lisp/icejam-themes.el             | 14 +++++---------
 .../themes/icejam-base16-harmonic-light.el         |  4 ++--
 .../themes/icejam-base16-not-harmonic.el           |  6 ++----
 .../themes/icejam-base16-summerfruit-light.el      |  4 ++--
 .../themes/icejam-base16-zenburn.el                |  5 ++---
 .../themes/icejam-tronesque.el                     |  3 ++-
 13 files changed, 38 insertions(+), 41 deletions(-)
 rename pkg/diminish.el => lisp/icejam-diminish.el (86%)
 rename pkg/fonts.el => lisp/icejam-fonts.el (97%)
 rename pkg/keys-mode.el => lisp/icejam-keys-mode.el (93%)
 rename pkg/themes.el => lisp/icejam-themes.el (81%)
 rename themes/base16-harmonic-light-modified.el => lisp/themes/icejam-base16-harmonic-light.el (89%)
 rename themes/themes-base16-not-harmonic.el => lisp/themes/icejam-base16-not-harmonic.el (95%)
 rename themes/base16-summerfruit-light-modified-theme.el => lisp/themes/icejam-base16-summerfruit-light.el (89%)
 rename themes/base16-zenburn-modified.el => lisp/themes/icejam-base16-zenburn.el (93%)
 rename themes/themes-tronesque.el => lisp/themes/icejam-tronesque.el (99%)

diff --git a/lisp/icejam-custom-init.el b/lisp/icejam-custom-init.el
index 97986db..be9f261 100644
--- a/lisp/icejam-custom-init.el
+++ b/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 '+custom-pkg-fonts "$HOME/.emacs.d/pkg/fonts.el")
+(require 'icejam-themes)
+(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)
diff --git a/lisp/icejam-deft.el b/lisp/icejam-deft.el
index 171f50f..583a2ca 100644
--- a/lisp/icejam-deft.el
+++ b/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
diff --git a/pkg/diminish.el b/lisp/icejam-diminish.el
similarity index 86%
rename from pkg/diminish.el
rename to lisp/icejam-diminish.el
index 14ae3d5..b0855b4 100644
--- a/pkg/diminish.el
+++ b/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)
-;;; diminish.el ends here
+(provide 'icejam-diminish)
+;;; icejam-diminish.el ends here
diff --git a/pkg/fonts.el b/lisp/icejam-fonts.el
similarity index 97%
rename from pkg/fonts.el
rename to lisp/icejam-fonts.el
index d2235d1..8e365e5 100644
--- a/pkg/fonts.el
+++ b/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)
-;;; fonts.el ends here
+(provide 'icejam-fonts)
+;;; icejam-fonts.el ends here
diff --git a/lisp/icejam-ivy.el b/lisp/icejam-ivy.el
index 6d47911..0841116 100644
--- a/lisp/icejam-ivy.el
+++ b/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)
diff --git a/pkg/keys-mode.el b/lisp/icejam-keys-mode.el
similarity index 93%
rename from pkg/keys-mode.el
rename to lisp/icejam-keys-mode.el
index e388d75..fac9a33 100644
--- a/pkg/keys-mode.el
+++ b/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)
-;;; keys-mode.el ends here
+(provide 'icejam-keys-mode)
+;;; icejam-keys-mode.el ends here
diff --git a/lisp/icejam-sys-specific.el b/lisp/icejam-sys-specific.el
index b0cfb1b..292cfd8 100644
--- a/lisp/icejam-sys-specific.el
+++ b/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."
diff --git a/pkg/themes.el b/lisp/icejam-themes.el
similarity index 81%
rename from pkg/themes.el
rename to lisp/icejam-themes.el
index 4943a4a..83171eb 100644
--- a/pkg/themes.el
+++ b/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
-         "$HOME/.emacs.d/themes/base16-zenburn-modified.el")
-
-(require 'base16-harmonic-light-modified-theme
-         "$HOME/.emacs.d/themes/base16-harmonic-light-modified.el")
+(require 'icejam-base16-zenburn)
+(require 'icejam-base16-harmonic-light)
 
 (spaceline-emacs-theme)
-
 (enable-theme 'base16-zenburn-modified)
 
-(provide '+custom-pkg-themes)
-;;; themes.el ends here
+(provide 'icejam-themes)
+;;; icejam-themes.el ends here
diff --git a/themes/base16-harmonic-light-modified.el b/lisp/themes/icejam-base16-harmonic-light.el
similarity index 89%
rename from themes/base16-harmonic-light-modified.el
rename to lisp/themes/icejam-base16-harmonic-light.el
index 6c21eb8..e5b4d0f 100644
--- a/themes/base16-harmonic-light-modified.el
+++ b/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)
-;;; base16-harmonic-light-modified-theme.el ends here
+(provide 'icejam-base16-harmonic-light)
+;;; icejam-base16-harmonic-light.el ends here
diff --git a/themes/themes-base16-not-harmonic.el b/lisp/themes/icejam-base16-not-harmonic.el
similarity index 95%
rename from themes/themes-base16-not-harmonic.el
rename to lisp/themes/icejam-base16-not-harmonic.el
index d54ef6e..3719dd5 100644
--- a/themes/themes-base16-not-harmonic.el
+++ b/lisp/themes/icejam-base16-not-harmonic.el
@@ -55,7 +55,5 @@
 
 ;; Mark the theme as provided
 (provide-theme 'base16-not-harmonic)
-
-(provide 'base16-not-harmonic-theme)
-
-;;; base16-not-harmonic-theme.el ends here
+(provide 'icejam-base16-not-harmonic)
+;;; icejam-base16-not-harmonic.el ends here
diff --git a/themes/base16-summerfruit-light-modified-theme.el b/lisp/themes/icejam-base16-summerfruit-light.el
similarity index 89%
rename from themes/base16-summerfruit-light-modified-theme.el
rename to lisp/themes/icejam-base16-summerfruit-light.el
index 4c3818d..dba356b 100644
--- a/themes/base16-summerfruit-light-modified-theme.el
+++ b/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)
-;;; base16-summerfruit-light-modified-theme.el ends here
+(provide 'icejam-base16-summerfruit-light)
+;;; icejam-base16-summerfruit-light.el ends here
diff --git a/themes/base16-zenburn-modified.el b/lisp/themes/icejam-base16-zenburn.el
similarity index 93%
rename from themes/base16-zenburn-modified.el
rename to lisp/themes/icejam-base16-zenburn.el
index 0b0f939..2ba0acb 100644
--- a/themes/base16-zenburn-modified.el
+++ b/lisp/themes/icejam-base16-zenburn.el
@@ -46,6 +46,5 @@
 
 ;; Mark the theme as provided
 (provide-theme 'base16-zenburn-modified)
-
-(provide 'base16-zenburn-modified-theme)
-;;; base16-zenburn-modified-theme.el ends here
+(provide 'icejam-base16-zenburn)
+;;; icejam-base16-zenburn.el ends here
diff --git a/themes/themes-tronesque.el b/lisp/themes/icejam-tronesque.el
similarity index 99%
rename from themes/themes-tronesque.el
rename to lisp/themes/icejam-tronesque.el
index 2ee9c3b..71b998f 100644
--- a/themes/themes-tronesque.el
+++ b/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