Update packages

init.el

@@ -1,3 +1,22 @@
+(setq
+ straight-profiles `((nil . ,(expand-file-name "straight.lock.el" user-emacs-directory)))
+ straight-use-package-by-default t)
+
+(let ((bootstrap-file
+       (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
+      (bootstrap-version 5))
+  (unless (file-exists-p bootstrap-file)
+    (with-current-buffer
+        (url-retrieve-synchronously
+         "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
+         'silent 'inhibit-cookies)
+      (goto-char (point-max))
+      (eval-print-last-sexp)))
+  (load bootstrap-file nil 'nomessage))
+
+(straight-use-package 'use-package)
+
 ;; Load bootstrap.org for actual setup
+(use-package org-contrib)
 (org-babel-load-file
  (locate-user-emacs-file (convert-standard-filename "uno/bootstrap.org")))

straight.lock.el

@@ -1,99 +1,103 @@
 (("ace-link" . "e1b1c91b280d85fce2194fea861a9ae29e8b03dd")
  ("ace-window" . "c7cb315c14e36fded5ac4096e158497ae974bec9")
- ("all-the-icons.el" . "e01eeb40858f971e45c014726a14c75556d8cc8f")
+ ("all-the-icons.el" . "483dba65e897071c156cefec937edcf51aa333db")
  ("annalist.el" . "134fa3f0fb91a636a1c005c483516d4b64905a6d")
- ("anzu" . "bdb3da5028935a4aea55c40769bc191a81afb54e")
+ ("anzu" . "5abb37455ea44fa401d5f4c1bdc58adb2448db67")
  ("avy" . "e92cb37457b43336b765630dbfbea8ba4be601fa")
  ("centered-cursor-mode.el" . "4093821cc9759ca5a3c6e527d4cc915fc3a5ad74")
- ("cfrs" . "2cb7f1cbf9292b0efe167ef372cfb5a7600564eb")
- ("closql" . "e2687e7ff958a19e6e5d6552c4e0b7b33c424bab")
- ("company-box" . "156f65cfbf690ed84e0e84f90277d665d873ff24")
- ("company-mode" . "87825c7891ccf4aefb88b9d49c7ff074cc74c53a")
- ("company-quickhelp" . "530b29380f0f95ae338cbe089693d786e6f53d86")
+ ("cfrs" . "c1f639d7bfd3e728cf85dbe224b06a4be76158f4")
+ ("closql" . "15f906c393db1a0fb6577afc3cf59466531eafef")
+ ("company-box" . "f9cbbc7df8efbb56a8d31a5b422d158660d9109e")
+ ("company-mode" . "eb9be0bff7c323c720198dcd539ee05fa2485cd3")
+ ("company-quickhelp" . "3ca2708b4e5190205aca01d65fe1b391963a53f9")
  ("company-restclient" . "e5a3ec54edb44776738c13e13e34c85b3085277b")
  ("company-statistics" . "e62157d43b2c874d2edbd547c3bdfb05d0a7ae5c")
- ("consult" . "56e1a69d39608a476e6533c2c3a0bf83d5c0e760")
- ("dash.el" . "2675596b9ac1c4b9d47b93e227f06f8ec6755ec6")
+ ("consult" . "0d0a2f335889f82e91d96f77d71884ebd554aa62")
+ ("dash.el" . "da167c51e9fd167a48d06c7c0ee8e3ac7abd9718")
  ("disable-mouse" . "cae3be9dd012727b40ad3b511731191f79cebe42")
- ("doom-modeline" . "ffb9e38828760938d7e56bc296a290de27f8ceef")
- ("editorconfig-emacs" . "375418d1d63f6ec780876593181b6d39054919da")
- ("el-get" . "463f5e985fc53300f87ab7eb054d1738fc6ac93b")
- ("elfeed" . "243add9e74003cd5718f33482b7bb8b4fe140fb5")
+ ("doom-modeline" . "36fed6d1a1614f72d425073d7c9e1529f622fe7a")
+ ("drag-stuff.el" . "6d06d846cd37c052d79acd0f372c13006aa7e7c8")
+ ("editorconfig-emacs" . "2ab86dc9a8ed7a669ca348252d4af46522b5c411")
+ ("el-get" . "960f3fb962c35d3196bab20b2a3f6d6228119277")
+ ("elfeed" . "162d7d545ed41c27967d108c04aa31f5a61c8e16")
  ("elfeed-org" . "268efdd0121fa61f63b722c30e0951c5d31224a4")
- ("elisp-refs" . "fdde21e34b1272783d566d8230b5ed2dc4749048")
- ("emacs-dashboard" . "3926b1b756fb0be5f84776f578a05d31a244d5d4")
- ("emacs-doom-themes" . "65fb964f36939cf412d03b3fe410618caf99c494")
- ("emacs-hide-mode-line" . "88888825b5b27b300683e662fa3be88d954b1cea")
- ("emacs-undo-fu" . "34b27c01da4c3eb8aa595f3613b7e2e1ed4e54be")
- ("emacs-which-key" . "cc84b2d0da629ecb62a92e3fd23cbee4ea20ce56")
+ ("elisp-refs" . "c06aec4486c034d0d4efae98cb7054749f9cc0ec")
+ ("emacs-dashboard" . "a19868f2fb8f7fc4132b4e9bfac5cdd65f245181")
+ ("emacs-doom-themes" . "96edc0ceb864b7d72218e58c8e9272cd96e5712c")
+ ("emacs-hide-mode-line" . "bc5d293576c5e08c29e694078b96a5ed85631942")
+ ("emacs-undo-fu" . "ab8bc10e424bccc847800c31ab41888db789d55d")
+ ("emacs-which-key" . "4790a14683a2f3e4f72ade197c78e4c0af1cdd4b")
  ("emacs-winum" . "c5455e866e8a5f7eab6a7263e2057aff5f1118b9")
- ("emacsmirror-mirror" . "cf4385804420024f63f41b1bc39c6e2c51e51a20")
+ ("emacsmirror-mirror" . "5bcbacbecf32c7615f53c9d5d5d4d3e8bf4070e5")
  ("emacsql" . "9dca5996168c4963eb67e61c7f17fdcb8228e314")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
- ("evil" . "dceb73603d397f7e42a541976d8ec0711248d38c")
+ ("evil" . "c28e42126c4ae349e2d77c80b38feb68bc1b5b78")
  ("evil-anzu" . "d3f6ed4773b48767bd5f4708c7f083336a8a8a86")
- ("evil-collection" . "3d990ce63e07c05a074b52125ac504b671f9f93a")
- ("evil-nerd-commenter" . "6bc41317ba4b8710d713a62e1b78047c3cc2d2d5")
- ("evil-org-mode" . "80ef38fb378541937f6ddfe836809e76eda1e355")
- ("exec-path-from-shell" . "bf4bdc8b8911e7a2c04e624b9a343164c3878282")
+ ("evil-collection" . "652d74acfb5789eacef36660c4ffc68905c8d741")
+ ("evil-nerd-commenter" . "63baf2d1c796edd11bbec5fe1dee711173d4155d")
+ ("evil-org-mode" . "c3ec94bc2fb79127826ea85509247f082bc394aa")
+ ("exec-path-from-shell" . "3a8d97c096c2c5714b667130fd8a80d5622ee067")
  ("f.el" . "50af874cd19042f17c8686813d52569b1025c76a")
- ("flycheck" . "21d52264aa80bfa4ede94c59e37a20fb6d033b0c")
- ("forge" . "93c8005ce72a765b8be189c43962cee084f51880")
+ ("flycheck" . "784f184cdd9f9cb4e3dbb997c09d93e954142842")
+ ("forge" . "41efa674cff0b447efbc103494fd61ec9b9156ae")
+ ("frame-cmds" . "7c9a30bae30c113e267dee3364e618a682fbaac8")
+ ("frame-fns" . "b675ee568c0133709c2c39a125395486cdf1c610")
  ("frame-local" . "7ee1106c3bcd4022f48421f8cb1ef4f995da816e")
  ("gcmh" . "0089f9c3a6d4e9a310d0791cf6fa8f35642ecfd9")
- ("general.el" . "a0b17d207badf462311b2eef7c065b884462cb7c")
- ("ghub" . "00a77b79c28e22db1b151c3f7857073ccbeff726")
- ("git-modes" . "433e1c57a63c88855fc41a942e29d7bc8c9c16c7")
- ("gnu-elpa-mirror" . "8ce05c546573f36c39b1e4a921de4fbf8613a98a")
+ ("general.el" . "26f1d4c4e258c40e6b70ce831a04800c914f29b3")
+ ("ghub" . "4d6a4b2bc1d88b993c09c1cb47b575a08eb264ea")
+ ("git-modes" . "62fbf2e5b84ca789e7bc2f87939386023b5ba3df")
+ ("gnu-elpa-mirror" . "870aae430e9eb6afb9097492cbd4076e87a677f5")
+ ("gnuplot" . "7138b139d2dca9683f1a81325c643b2744aa1ea3")
  ("goto-chg" . "3ce1389fea12edde4e343bc7d54c8da97a1a6136")
  ("graphviz-dot-mode" . "3642a0a5f41a80c8ecef7c6143d514200b80e194")
- ("helpful" . "7e4b1f0d5572a4e2b8ee7a9b084ef863d0315a73")
+ ("helpful" . "8df39c15d290cd499ef261de868191d3fc84f75a")
  ("ht.el" . "c4c1be487d6ecb353d07881526db05d7fc90ea87")
  ("hydra" . "2d553787aca1aceb3e6927e426200e9bb9f056f1")
- ("json-mode" . "0e819e519ae17a2686e0881c4ca51fa873fa9b83")
- ("json-reformat" . "8eb6668ed447988aea06467ba8f42e1f2178246f")
+ ("json-mode" . "eedb4560034f795a7950fa07016bd4347c368873")
  ("json-snatcher" . "b28d1c0670636da6db508d03872d96ffddbc10f2")
  ("keychain-environment" . "d3643196de6dc79ea77f9f4805028350fd76100b")
  ("know-your-http-well" . "3cc5ab6d2764ab7aacb1b6e026abaccbeb6c37f2")
- ("let-alist" . "6708ec0b2e6dff80ff5b64698aa009d9070a2ed2")
- ("ligature.el" . "3923baf1fb9bf509cc95b4b14d7d0e2f7c88e53c")
- ("lsp-mode" . "d904e8a4472b537f0bff1315a61fe3cf3b5ebcf5")
- ("lsp-ui" . "177c31e982345ba35dc7c5d90cb1f8e68585323a")
- ("magit" . "de1dc8e74bbfabf00ed20fceec2cb03c4493c510")
- ("markdown-mode" . "b3166c52551eb5d6d4598ab7b63721efe51b9dbe")
- ("melpa" . "949eb5d82e26e37685c3155b22b329e387f0fd59")
+ ("let-alist" . "d2d0cac92851d4480328bc3f41d30c518beb1f99")
+ ("ligature.el" . "d3426509cc5436a12484d91e48abd7b62429b7ef")
+ ("lsp-mode" . "a7effcc79114e91e74f06ef3a7e078bafba05c2a")
+ ("lsp-ui" . "dd4c181a22d19a28236c442cf6c9cd4bbd6d85f8")
+ ("magit" . "9413847c1a085899d8de6f8d978bd7265f65e5d8")
+ ("markdown-mode" . "c3c2f0d473a3f8ca8c4ffb2ecc094d5c3541769f")
+ ("melpa" . "db77988a14c8bdcc457bdae4bedd4e7535b4e3a6")
  ("mixed-pitch" . "519e05f74825abf04b7d2e0e38ec040d013a125a")
  ("ob-restclient.el" . "bfbc4d8e8a348c140f9328542daf5d979f0993e2")
- ("olivetti" . "032b3d779f7b374bd12f62b7fc717a310ea16bee")
- ("orderless" . "1a7011ac9c476dbb083c5ead88462a5f520ef8aa")
- ("org" . "3664447eb2417b38f0053674f248d2b0f1592ff0")
- ("org-contrib" . "fc81309cf6756607a836f93049a9393c2967c4e0")
+ ("olivetti" . "a31ac05a161a91fe5c157930b62a6c07037982ee")
+ ("orderless" . "62f71c34baca0b7d0adeab4a1c07d85ffcee80d9")
+ ("org" . "2bbac432a8c7d70c6ecd154fb3867c6cb2b4f4b2")
+ ("org-contrib" . "e14dfea59491f889f35868813122c5b8c0b4b3db")
  ("org-present" . "7414e406326622dbfb5aaf2905c4ac9f6696d6ed")
- ("org-roam" . "95afbc676a2317ae75d358ef6c71b97548505777")
- ("org-superstar-mode" . "9d64c42e5029910153ec74cb9b5747b074281140")
- ("page-break-lines" . "3b8549cd414d4d7ee0168ab9917124133566d3db")
- ("pdf-tools" . "5f77dae43eb8f71e52e10ba8cf994883f74c3fb7")
+ ("org-roam" . "d93423d4e11da95bcf177b2bc3c74cb1d1acf807")
+ ("org-superstar-mode" . "03be6c0a3081c46a59b108deb8479ee24a6d86c0")
+ ("pdf-tools" . "a8847b75d3487d60e27762816bdbdd23b6dc1c11")
  ("pfuture" . "d7926de3ba0105a36cfd00811fd6278aea903eef")
  ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
  ("pos-tip" . "179cc126b363f72ca12fab1e0dc462ce0ee79742")
- ("posframe" . "f97c4aff2c2c376ca62276d5597aa108546633a9")
- ("projectile" . "87f6078e3ef4ea47d839006bfe1ed9c96b56aa6f")
+ ("posframe" . "66b16a20a7b43f19c27487c475799200ad81b3bd")
+ ("projectile" . "31069dc31469e0d5cddb53126a2993432a22399b")
  ("restart-emacs" . "1607da2bc657fe05ae01f7fdf26f716eafead02c")
- ("restclient.el" . "176d9cb6552f04d98c33e29fc673862bdf3bca03")
+ ("restclient.el" . "f59a7f5abf366145a2c9c1e9f0a2184139d2adce")
  ("ripgrep.el" . "40e871dcc4519a70981e9f28acea304692a60978")
  ("s.el" . "08661efb075d1c6b4fa812184c1e5e90c08795a9")
  ("shrink-path.el" . "c14882c8599aec79a6e8ef2d06454254bb3e1e41")
- ("smartparens" . "1d7f8fbf5389f83f4c0ae72cd7fbb6fa3341beda")
+ ("smartparens" . "f59a40d54f35299007c396bd667ce3e9ec4714e3")
  ("spinner" . "34905eae12a236753fa88abc831eff1e41e8576e")
- ("straight.el" . "1e27b0590df77a5d478970ca58fd6606971692f5")
+ ("straight.el" . "af5437f2afd00936c883124d6d3098721c2d306c")
  ("tablist" . "faab7a035ef2258cc4ea2182f67e3aedab7e2af9")
- ("transient" . "e17e2b2f6d7cdf2e27729fd28e3d7600b76ad24a")
- ("treemacs" . "d9fc2995577b71d213f0201a66c8e2d90e7cd0ff")
+ ("transient" . "349116159f707a474926b47e5f6b6240e8997a4d")
+ ("treemacs" . "d00cc19cab8df4fec7ed6608e00bd16fe797369a")
  ("treepy.el" . "3ac940e97f3d03e48ca9d7fcd74916a9b01c72f3")
- ("typescript.el" . "b369d7d2518fa11760ac3908a383405350cd51d2")
+ ("typescript.el" . "13e6da6c5746187842d8ebb5323bf2d88d5759c2")
  ("use-package" . "a7422fb8ab1baee19adb2717b5b47b9c3812a84c")
- ("vertico" . "afa61c4ec056f611a61ee37ed47a42e7ae47e6e3")
- ("web-mode" . "8ef47935d638902ba35a557cae5edd6ab6ab1346")
- ("with-editor" . "5519b6a67ecd66865b4fdd5447425eee900c54f4")
- ("yaml-mode" . "63b637f846411806ae47e63adc06fe9427be1131"))
+ ("vertico" . "608d2ef213d0fd2018c5d9be54390a3dcfd9c0ff")
+ ("web-mode" . "61f057a6baeba6b3595e412ba79b3080dca17dcc")
+ ("with-editor" . "cfe70f43c551852125bc139df467e28e1b6087df")
+ ("yaml-mode" . "63b637f846411806ae47e63adc06fe9427be1131")
+ ("yaml.el" . "84b88c9ed178af16da18b230c1f61c57cefedf28")
+ ("zoom-frm" . "ca865f395a8c93f7180e152218ecf2a1e1091f50"))
 :beta

uno/bootstrap.org

@@ -53,37 +53,13 @@ Isolate or remove backup files for a clean structure.
     tramp-persistency-file-name (uno-cache-path "tramp/history"))
 #+END_SRC
 
-* Straight + Use Package
+* General
 
-Run bootstrap code for =straight= and have =use-package= ready.
+Set up generic and leader key binds that are used throughout. =general= is loaded first to set up integration with =evil= before setting up =general=.
 
 #+BEGIN_SRC emacs-lisp
-  (setq
-   straight-profiles `((nil . ,(uno-emacs-path "straight.lock.el")))
-   straight-use-package-by-default t)
-
-  (let ((bootstrap-file
-         (uno-emacs-path "straight/repos/straight.el/bootstrap.el"))
-        (bootstrap-version 5))
-    (unless (file-exists-p bootstrap-file)
-      (with-current-buffer
-          (url-retrieve-synchronously
-           "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
-           'silent 'inhibit-cookies)
-        (goto-char (point-max))
-        (eval-print-last-sexp)))
-    (load bootstrap-file nil 'nomessage))
-
-  (straight-use-package 'use-package)
-
   (use-package general)
-#+END_SRC
 
-* General
-
-Set up general and leader key binds that are used throughout.
-
-#+BEGIN_SRC emacs-lisp
   (use-package evil
     :custom
     (evil-want-keybinding nil)
@@ -120,6 +96,8 @@ Set up general and leader key binds that are used throughout.
 
 * Modules
 
+Traverse through modules and load each one.
+
 #+BEGIN_SRC emacs-lisp
   (let* ((uno-module-directory (uno-path "modules/"))
          (uno-module-files (directory-files-recursively

uno/modules/dev/git.org

@@ -76,17 +76,11 @@ Define Git dev package.
     (transient-values-file (uno-cache-path "transient/values.el")))
 #+END_SRC
 
-* Git Files
+* Git Modes
 
 #+BEGIN_SRC emacs-lisp
-  (use-package gitattributes-mode
+  (use-package git-modes
     :after (uno-dev-git uno-mode)
     :config
     (uno/add-prog-mode 'gitattributes-mode))
-
-  (use-package gitconfig-mode
-    :after uno-dev-git)
-
-  (use-package gitignore-mode
-    :after uno-dev-git)
 #+END_SRC

uno/modules/doc/+index.org

@@ -22,3 +22,10 @@ Use variable pitch font where applicable.
     :hook
     (uno-text-mode . mixed-pitch-mode))
 #+END_SRC
+
+* GNU Plot
+
+#+BEGIN_SRC emacs-lisp
+  (use-package gnuplot
+    :after uno-doc)
+#+END_SRC

uno/modules/doc/org.org

@@ -15,9 +15,8 @@ Define Org document package.
 * Org
 
 #+BEGIN_SRC emacs-lisp
-  (use-package org
-    :after uno-doc-org
-    :ensure org-plus-contrib
+  (use-package emacs
+    :after (uno-doc-org org)
     :custom
     (org-adapt-indentation nil)
     (org-ellipsis " ▼")
@@ -71,13 +70,9 @@ Define Org document package.
           '(org-level-6 ((t (:inherit outline-6 :height 1.15)))))))
     :config
     (require 'ox-beamer)
+    (require 'ox-groff)
     (require 'ox-md))
 
-  (use-package org-contrib
-    :after (uno-doc-org org)
-    :config
-    (require 'ox-groff))
-
   (use-package org-superstar
     :if (display-graphic-p)
     :after (uno-doc-org org)

uno/modules/ui/theme.org

@@ -41,7 +41,7 @@ Define UI theme package.
                             :family -fixed-font
                             :height (cond
                                      ((eq system-type 'darwin) 160)
-                                     (t 100))
+                                     (t 110))
                             :weight 'medium)
         (set-face-attribute 'fixed-pitch nil :family -fixed-font))
       (when (x-family-fonts -variable-font)