Migrate from using Borg to ELPA

[~bandali/configs] / lisp / bandali-theme.el

diff --git a/lisp/bandali-theme.el b/lisp/bandali-theme.el
index 87fc231..13929cb 100644 (file)
--- a/lisp/bandali-theme.el
+++ b/lisp/bandali-theme.el
@@ -24,24 +24,20 @@
 
 ;;; Code:
 
-(use-package refinery-theme
-  :demand
-  :config
+(with-eval-after-load 'package
+  (require 'refinery-theme)
   (load-theme 'refinery t))
 
-(use-package smart-mode-line
-  :commands (sml/apply-theme)
-  :demand
-  :config
-  ;; thanks, but no thnaks; don't make fixed-width fills.
-  (defun sml/fill-for-buffer-identification () "")
-  (setq sml/theme 'respectful)
-  (sml/setup)
-  (smart-mode-line-enable))
+;; (require 'smart-mode-line)
+;; ;; thanks, but no thanks; don't make fixed-width fills.
+;; (defun sml/fill-for-buffer-identification nil "")
+;; (setq sml/theme 'respectful)
+;; (let ((sml/no-confirm-load-theme t))
+;;   (sml/setup)
+;;   (smart-mode-line-enable))
 
-(use-package minions
-  :demand
-  :config (minions-mode))
+;; (require 'minions)
+;; (minions-mode)
 
 (defvar b/org-mode-font-lock-keywords
   '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
@@ -51,7 +47,8 @@
   "For use with the `doom-tomorrow-night' theme.")
 
 (eval-when-compile
-  (declare-function exwm-systemtray--refresh "exwm-systemtray"))
+  (declare-function exwm-systemtray--refresh "exwm-systemtray")
+  (declare-function erc-hl-nicks-reset-face-table "erc-hl-nicks"))
 
 (defun b/lights-on ()
   "Enable my favourite light theme."
@@ -59,7 +56,8 @@
   (mapc #'disable-theme custom-enabled-themes)
   (load-theme 'refinery t)
   (when (featurep 'smart-mode-line)
-    (sml/apply-theme 'bandali))
+    (let ((sml/no-confirm-load-theme t))
+      (sml/apply-theme 'respectful)))
   (font-lock-remove-keywords
    'org-mode b/org-mode-font-lock-keywords)
   (when (featurep 'erc-hl-nicks)
@@ -71,9 +69,10 @@
   "Go dark."
   (interactive)
   (mapc #'disable-theme custom-enabled-themes)
-  (load-theme 'tango-dark t)
+  (load-theme 'refinery-dark t)
   (when (featurep 'smart-mode-line)
-    (sml/apply-theme 'automatic))
+    (let ((sml/no-confirm-load-theme t))
+      (sml/apply-theme 'dark)))
   (font-lock-add-keywords
    'org-mode b/org-mode-font-lock-keywords t)
   (when (featurep 'erc-hl-nicks)
@@ -81,9 +80,8 @@
   (when (featurep 'exwm-systemtray)
     (exwm-systemtray--refresh)))
 
-(bind-keys
- ("C-c t d" . b/lights-off)
- ("C-c t l" . b/lights-on))
+(global-set-key (kbd "C-c t d") #'b/lights-off)
+(global-set-key (kbd "C-c t l") #'b/lights-on)
 
 (provide 'bandali-theme)
 ;;; bandali-theme.el ends here