Drop use-package again

I prefer my own manual approach, use-package feels too magical and
at times does too much for me.

1 files changed, 43 insertions, 54 deletions

diff --git a/.emacs.d/lisp/bandali-prog.el b/.emacs.d/lisp/bandali-prog.el
index f777f88..c732ab5 100644
--- a/.emacs.d/lisp/bandali-prog.el
+++ b/.emacs.d/lisp/bandali-prog.el
@@ -24,41 +24,35 @@
 
 ;;; Code:
 
-(use-package elisp-mode
-  :bind
-  ("C-c e e" . eval-last-sexp))
-
-(use-package pp
-  :bind
-  ("C-c e m" . pp-macroexpand-last-sexp))
-
-(use-package lisp-mode
-  :hook
-  (lisp-interaction-mode . (lambda () (setq-local indent-tabs-mode nil))))
-
-(use-package alloy-mode
-  :disabled
-  :load-path "lisp/alloy-mode"
-  :mode "\\.\\(als\\|dsh\\)\\'"
-  :hook
-  (alloy-mode . (lambda nil (setq-local indent-tabs-mode nil)))
-  :init
-  (defun b/alloy-simple-indent (start end)
-    (interactive "r")
-    ;; (if (region-active-p)
-    ;;     (indent-rigidly start end alloy-basic-offset)
-    ;;   (if (bolp)
-    ;;       (indent-rigidly (line-beginning-position)
-    ;;                       (line-end-position)
-    ;;                       alloy-basic-offset)))
-    (indent-to (+ (current-column) alloy-basic-offset)))
-  :bind
-  (:map
-   alloy-mode-map
-   (;; ("TAB" . b/alloy-simple-indent)
-    "RET" . electric-newline-and-maybe-indent))
-  :custom
-  (alloy-basic-offset 2))
+;; `elisp-mode'
+(b/keymap-global-set "C-c e e" #'eval-last-sexp)
+
+;; `pp'
+(b/keymap-global-set "C-c e m" #'pp-macroexpand-last-sexp)
+
+;; `lisp-mode'
+(add-hook
+ 'lisp-interaction-mode-hook #'b/setq-local-indent-tabs-mode-nil)
+
+;; (add-to-list 'load-path (b/lisp "alloy-mode"))
+;; (with-eval-after-load 'alloy-mode
+;;   (setq alloy-basic-offset 2)
+;;   (defun b/alloy-simple-indent (start end)
+;;     (interactive "r")
+;;     ;; (if (region-active-p)
+;;     ;;     (indent-rigidly start end alloy-basic-offset)
+;;     ;;   (if (bolp)
+;;     ;;       (indent-rigidly (line-beginning-position)
+;;     ;;                       (line-end-position)
+;;     ;;                       alloy-basic-offset)))
+;;     (indent-to (+ (current-column) alloy-basic-offset)))
+;;   (define-key alloy-mode-map (kbd "RET") #'electric-newline-and-maybe-indent)
+;;   ;; (define-key alloy-mode-map (kbd "TAB") #'b/alloy-simple-indent)
+;;   (define-key alloy-mode-map (kbd "TAB") #'indent-for-tab-command))
+;; (unless (fboundp 'alloy-mode)
+;;   (autoload #'alloy-mode "alloy-mode" nil t))
+;; (add-to-list 'auto-mode-alist '("\\.\\(als\\|dsh\\)\\'" . alloy-mode))
+;; (add-hook 'alloy-mode-hook #'b/setq-local-indent-tabs-mode-nil)
 
 ;; (eval-when-compile (defvar lean-mode-map))
 ;; (run-with-idle-timer 0.4 nil #'require 'lean-mode)
@@ -73,28 +67,23 @@
 ;;   ;; local key bindings
 ;;   (define-key lean-mode-map (kbd "S-SPC") #'company-complete))
 
-(use-package sgml-mode
-  :defer t
-  :custom
-  (sgml-basic-offset 0))
+(with-eval-after-load 'sgml-mode
+  (setopt sgml-basic-offset 0))
 
-(use-package css-mode
-  :defer t
-  :custom
-  (css-indent-offset 2))
+(with-eval-after-load 'css-mode
+  (setopt css-indent-offset 2))
 
-(use-package cmake-mode
-  :mode
-  (("CMakeLists\\.txt\\'" . cmake-mode)
-   ("\\.cmake\\'" . cmake-mode)))
+;; `cmake-mode'
+(with-eval-after-load 'cmake-mode
+  (add-to-list 'load-path (b/emacs.d "lisp/cmake-font-lock"))
+  (require 'cmake-font-lock))
+(unless (fboundp 'cmake-mode)
+  (autoload #'cmake-mode "cmake-mode" nil t))
+(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode))
+(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode))
 
-(use-package cmake-font-lock
-  :after cmake-mode
-  :load-path "lisp/cmake-font-lock")
-
-(use-package reftex
-  :hook
-  (latex-mode . reftex-mode))
+;; `reftex'
+(add-hook 'latex-mode-hook #'reftex-mode)
 
 (provide 'bandali-prog)
 ;;; bandali-prog.el ends here