From 11b4efac6b4318706042c6ac44879a5df0432e31 Mon Sep 17 00:00:00 2001
From: Raul Benencia <raul@thousandeyes.com>
Date: Sat, 25 Nov 2023 07:51:52 -0800
Subject: emacs: minor bootstrap fixes

---
 .emacs.d/init.el                             |  7 +------
 .emacs.d/rul-init.d/flycheck.el              |  6 ++++--
 .emacs.d/rul-init.d/fonts.el                 | 11 ++++++-----
 .emacs.d/rul-init.d/hydra.el                 |  1 +
 .emacs.d/rul-init.d/notmuch.el               |  9 ++++++---
 .emacs.d/rul-init.d/themes.el                |  1 +
 .emacs.d/rul-init.d/vterm.el                 |  1 +
 .emacs.d/rul-lisp/packages/rul-completion.el |  4 ++++
 .emacs.d/rul-lisp/packages/rul-dart.el       |  7 -------
 .emacs.d/rul-lisp/packages/rul-elfeed.el     |  5 +++--
 .emacs.d/rul-lisp/packages/rul-media.el      |  3 ++-
 .emacs.d/rul-lisp/packages/rul-org.el        | 11 ++++++-----
 .emacs.d/rul-lisp/packages/rul-prog.el       | 13 +++++++++++++
 13 files changed, 48 insertions(+), 31 deletions(-)
 delete mode 100644 .emacs.d/rul-lisp/packages/rul-dart.el
 create mode 100644 .emacs.d/rul-lisp/packages/rul-prog.el

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 007fa9c..99485a5 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,8 +1,3 @@
-;; Debian packages: elpa-use-package elpa-fill-column-indicator fonts-hack
-
-(require 'package)
-(require 'fill-column-indicator)
-
 (add-to-list 'package-archives
              '("melpa-stable" . "https://stable.melpa.org/packages/") t)
 
@@ -154,7 +149,7 @@
 (pixel-scroll-precision-mode 1)
 
 (require 'rul-completion)
-(require 'rul-dart)
+(require 'rul-prog)
 (require 'rul-elfeed)
 (require 'rul-modeline)
 (require 'rul-media)
diff --git a/.emacs.d/rul-init.d/flycheck.el b/.emacs.d/rul-init.d/flycheck.el
index 6662c06..006081e 100644
--- a/.emacs.d/rul-init.d/flycheck.el
+++ b/.emacs.d/rul-init.d/flycheck.el
@@ -1,4 +1,6 @@
-;; Debian-packages: elpa-flycheck python3-proselint
+(use-package flycheck
+  :ensure t
+  :config
 
 (flycheck-define-checker proselint
   "A linter for prose."
@@ -17,4 +19,4 @@
   :hook (message-mode . flycheck-languagetool-setup)
   :init
   (setq flycheck-languagetool-url "http://localhost:8010")
-)
+))
diff --git a/.emacs.d/rul-init.d/fonts.el b/.emacs.d/rul-init.d/fonts.el
index 6013b4e..a7cb255 100644
--- a/.emacs.d/rul-init.d/fonts.el
+++ b/.emacs.d/rul-init.d/fonts.el
@@ -1,6 +1,7 @@
-;; elpa-packages: fontaine
-
-(setq fontaine-presets
+(use-package fontaine
+  :ensure t
+  :config
+  (setq fontaine-presets
       '((tiny
          :default-height 100)
         (small
@@ -25,5 +26,5 @@
          :default-height 140
          :variable-pitch-family "Iosevka Aile")))
 
-;; Set desired style from `fontaine-presets'
-(fontaine-set-preset 'medium)
+  ;; Set desired style from `fontaine-presets'
+  (fontaine-set-preset 'medium))
diff --git a/.emacs.d/rul-init.d/hydra.el b/.emacs.d/rul-init.d/hydra.el
index 8afe86f..0b81da2 100644
--- a/.emacs.d/rul-init.d/hydra.el
+++ b/.emacs.d/rul-init.d/hydra.el
@@ -1,4 +1,5 @@
 (use-package hydra
+  :ensure t
   :defer 1)
 
 ;; projectile
diff --git a/.emacs.d/rul-init.d/notmuch.el b/.emacs.d/rul-init.d/notmuch.el
index 19ea823..e8e4d9d 100644
--- a/.emacs.d/rul-init.d/notmuch.el
+++ b/.emacs.d/rul-init.d/notmuch.el
@@ -1,10 +1,10 @@
 ;; --------
 ;; notmuch mode
 ;; --------
-(require 'notmuch)
-(require 'notmuch-indicator)
 (require 'rul-config-mail)
-
+(use-package notmuch
+:ensure t
+:config
 ;;;; General UI
 (setq notmuch-show-logo nil
       notmuch-column-control 1.0
@@ -131,3 +131,6 @@ pairs in `binds' of the form ( ... (argfunc arg) body)."
 (make-binds notmuch-hello-mode-map
             notmuch-hello-tree-searches
             notmuch-search)
+)
+
+(use-package notmuch-indicator :ensure t)
diff --git a/.emacs.d/rul-init.d/themes.el b/.emacs.d/rul-init.d/themes.el
index c94d4a1..d5c591a 100644
--- a/.emacs.d/rul-init.d/themes.el
+++ b/.emacs.d/rul-init.d/themes.el
@@ -1,3 +1,4 @@
+(use-package modus-themes :ensure t)
 (use-package ef-themes :ensure t)
 
 (setq
diff --git a/.emacs.d/rul-init.d/vterm.el b/.emacs.d/rul-init.d/vterm.el
index 1292569..b3bed95 100644
--- a/.emacs.d/rul-init.d/vterm.el
+++ b/.emacs.d/rul-init.d/vterm.el
@@ -1,4 +1,5 @@
 (use-package multi-vterm
+:ensure t
 :after (consult)
 :config
 
diff --git a/.emacs.d/rul-lisp/packages/rul-completion.el b/.emacs.d/rul-lisp/packages/rul-completion.el
index 8803fc0..9a5cbc8 100644
--- a/.emacs.d/rul-lisp/packages/rul-completion.el
+++ b/.emacs.d/rul-lisp/packages/rul-completion.el
@@ -1,5 +1,8 @@
+(use-package orderless :ensure t)
+
 ;; Enable vertico
 (use-package vertico
+  :ensure t
   :init
   (vertico-mode)
 
@@ -21,6 +24,7 @@
 
 ;; Enable rich annotations using the Marginalia package
 (use-package marginalia
+  :ensure t
   ;; Bind `marginalia-cycle' locally in the minibuffer.  To make the binding
   ;; available in the *Completions* buffer, add it to the
   ;; `completion-list-mode-map'.
diff --git a/.emacs.d/rul-lisp/packages/rul-dart.el b/.emacs.d/rul-lisp/packages/rul-dart.el
deleted file mode 100644
index 36bfd47..0000000
--- a/.emacs.d/rul-lisp/packages/rul-dart.el
+++ /dev/null
@@ -1,7 +0,0 @@
-(setq dart-server-format-on-save t)
-(add-hook 'dart-mode-hook 'lsp)
-
-(setq gc-cons-threshold (* 100 1024 1024)
-      read-process-output-max (* 1024 1024))
-
-(provide 'rul-dart)
diff --git a/.emacs.d/rul-lisp/packages/rul-elfeed.el b/.emacs.d/rul-lisp/packages/rul-elfeed.el
index 34713db..22aacdd 100644
--- a/.emacs.d/rul-lisp/packages/rul-elfeed.el
+++ b/.emacs.d/rul-lisp/packages/rul-elfeed.el
@@ -1,5 +1,6 @@
 (use-package elfeed
-  :config
-  (require 'rul-config-elfeed))
+:ensure t
+:config
+(require 'rul-config-elfeed))
 
 (provide 'rul-elfeed)
diff --git a/.emacs.d/rul-lisp/packages/rul-media.el b/.emacs.d/rul-lisp/packages/rul-media.el
index 0f954d8..b2f8db1 100644
--- a/.emacs.d/rul-lisp/packages/rul-media.el
+++ b/.emacs.d/rul-lisp/packages/rul-media.el
@@ -1,5 +1,6 @@
 (use-package empv
-  :config
+:ensure t
+:config
   (bind-key "C-x m" empv-map)
   (setq empv-radio-channels
       '(
diff --git a/.emacs.d/rul-lisp/packages/rul-org.el b/.emacs.d/rul-lisp/packages/rul-org.el
index d4ed503..e9068b1 100644
--- a/.emacs.d/rul-lisp/packages/rul-org.el
+++ b/.emacs.d/rul-lisp/packages/rul-org.el
@@ -1,12 +1,9 @@
-;; Debian packages: elpa-org elpa-org-bullets
+;; Debian packages: elpa-org
 ;; Elpa packages: org-modern
 (require 'org)
 (require 'org-capture)
 (require 'org-protocol)
 (require 'org-habit)
-(require 'org-bullets)
-
-(require 'org-modern)
 
 (require 'rul-config-org)
 
@@ -14,15 +11,19 @@
 (require 'rul-org-journal)
 (require 'rul-org-roam)
 
+
 (setq org-cycle-separator-lines 0)
 (setq org-startup-indented t)
 (setq org-hide-leading-stars nil)
 
+(use-package org-modern
+  :ensure t
+         )
+
 (add-hook 'org-mode-hook 'turn-off-auto-fill)
 (add-hook 'org-mode-hook 'visual-line-mode)
 
 (setq org-startup-indented t
-      org-bullets-bullet-list '(" ") ;; no bullets, needs org-bullets package
       org-pretty-entities nil
       org-hide-emphasis-markers t
       ;; show actually italicized text instead of /italicized text/
diff --git a/.emacs.d/rul-lisp/packages/rul-prog.el b/.emacs.d/rul-lisp/packages/rul-prog.el
new file mode 100644
index 0000000..f7a8660
--- /dev/null
+++ b/.emacs.d/rul-lisp/packages/rul-prog.el
@@ -0,0 +1,13 @@
+(use-package eglot :ensure t)
+
+;; Dart
+(setq dart-server-format-on-save t)
+(add-hook 'dart-mode-hook 'lsp)
+
+(setq gc-cons-threshold (* 100 1024 1024)
+      read-process-output-max (* 1024 1024))
+
+;; Python
+(use-package blacken :ensure t)
+
+(provide 'rul-prog)
-- 
cgit v1.2.3