X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/c31b1ac02d0c0b4c375384dc72cc26073ecb526c..06c562baad41e2a5aee6441437e0239b3df5b2f8:/init.org?ds=inline diff --git a/init.org b/init.org index 3cf7343..60031a4 100644 --- a/init.org +++ b/init.org @@ -9,10 +9,10 @@ :END: This org file is my literate configuration for GNU Emacs, and is -tangled to [[./init.el][init.el]]. Packages are installed and managed using -[[https://github.com/emacscollective/borg][Borg]]. Over the years, I've taken inspiration from configurations of -many different people. Some of the configurations that I can remember -off the top of my head are: +tangled to [[./init.el][init.el]]. Packages are installed and managed using +[[https://github.com/raxod502/straight.el][straight.el]]. Over the years, I've taken inspiration from +configurations of many different people. Some of the configurations +that I can remember off the top of my head are: - [[https://github.com/dieggsy/dotfiles][dieggsy/dotfiles]]: literate Emacs and dotfiles configuration, uses straight.el for managing packages @@ -28,25 +28,9 @@ off the top of my head are: I'd like to have a fully reproducible Emacs setup (part of the reason why I store my configuration in this repository) but unfortunately out of the box, that's not achievable with =package.el=, not currently -anyway. So, I've opted to use Borg. For what it's worth, I briefly -experimented with [[https://github.com/raxod502/straight.el][straight.el]], but found that it added about 2 seconds -to my init time; which is unacceptable for me: I use Emacs as my -window manager (via EXWM) and coming from bspwm, I'm too used to -having fast startup times. - -** Installation - -To use this config for your Emacs, first you need to clone this repo, -then bootstrap Borg, tell Borg to retrieve package submodules, and -byte-compiled the packages. Something along these lines should work: - -#+begin_src sh :tangle no -git clone https://github.com/aminb/dotfiles ~/.emacs.d -cd ~/.emacs.d -make bootstrap-borg -make bootstrap -make build -#+end_src +anyway. So, I've opted to use =straight.el=. I also used Borg for a +few months, but decided to try =straight.el= which allows direct use +of the various package archives. * Contents :toc_1:noexport: @@ -215,20 +199,33 @@ hacker. =straight.el= allows me to have a fully reproducible Emacs setup. #+begin_src emacs-lisp +;; Main engine start... + (setq straight-repository-branch "develop") -(defvar bootstrap-version) -(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)) +(defun a/bootstrap-straight () + (defvar bootstrap-version) + (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))) + +;; Solid rocket booster ignition... + +(defun a/build-init () + (a/bootstrap-straight) + (byte-compile-file "init.el")) + +(a/bootstrap-straight) + +;; We have lift off! (setq straight-use-package-by-default t) #+end_src @@ -243,38 +240,7 @@ integration, we will define a =use-feature= for plain ole (declare (indent defun)) `(use-package ,name :straight nil -,@args)) -#+end_src - -*** COMMENT Borg - -#+begin_quote -Assimilate Emacs packages as Git submodules -#+end_quote - -[[https://github.com/emacscollective/borg][Borg]] is at the heart of package management of my Emacs setup. In -short, it creates a git submodule in =lib/= for each package, which -can then be managed with the help of Magit or other tools. - -#+begin_src emacs-lisp -(setq user-init-file (or load-file-name buffer-file-name) - user-emacs-directory (file-name-directory user-init-file)) -(add-to-list 'load-path - (expand-file-name "lib/borg" user-emacs-directory)) -(require 'borg) -(borg-initialize) - -;; (require 'borg-nix-shell) -;; (setq borg-build-shell-command 'borg-nix-shell-build-command) - -(with-eval-after-load 'bind-key - (bind-keys - :package borg - ("C-c b A" . borg-activate) - ("C-c b a" . borg-assimilate) - ("C-c b b" . borg-build) - ("C-c b c" . borg-clone) - ("C-c b r" . borg-remove))) + ,@args)) #+end_src *** =use-package= @@ -300,7 +266,7 @@ and without compromising on performance. (setq use-package-always-defer t) #+end_src -*** COMMENT Epkg +*** Epkg #+begin_quote Browse the Emacsmirror package database @@ -311,13 +277,14 @@ database, low-level functions for querying the database, and a =package.el=-like user interface for browsing the available packages. #+begin_src emacs-lisp +(require 'bind-key) (use-package epkg - :defer t + :commands (epkg-list-packages epkg-describe-package) :bind - (("C-c b d" . epkg-describe-package) - ("C-c b p" . epkg-list-packages) - ("C-c b u" . epkg-update)) + (("C-c P e d" . epkg-describe-package) + ("C-c P e p" . epkg-list-packages)) :config + (setq epkg-repository "~/.emacs.d/straight/repos/epkgs/") (eval-when-compile (defvar ivy-initial-inputs-alist)) (with-eval-after-load 'ivy (add-to-list @@ -729,7 +696,6 @@ for this. ** Bindings #+begin_src emacs-lisp -(require 'bind-key) (bind-keys ("C-c a i" . ielm) @@ -880,6 +846,7 @@ And here's where my actual Org configurations begin: t)) (use-feature ox-beamer + :demand :after ox) #+end_src @@ -897,10 +864,10 @@ file. (defvar a/show-async-tangle-time nil "Show the time spent tangling the file.") - (defvar a/async-tangle-post-compile nil + (defvar a/async-tangle-post-compile "make bi" "If non-nil, pass to `compile' after successful tangle.") - (defvar a/async-tangle-byte-recompile t + (defvar a/async-tangle-byte-recompile nil "If non-nil, byte-recompile the file on successful tangle.") (defun a/async-babel-tangle () @@ -1411,7 +1378,8 @@ Automatically save place in each file. ** [[https://coq.inria.fr][Coq]] (with [[https://github.com/ProofGeneral/PG][Proof General]]) #+begin_src emacs-lisp -(use-package proof-general) +(use-package proof-site + :straight proof-general) #+end_src ** [[https://leanprover.github.io][Lean]] (with [[https://github.com/leanprover/lean-mode][lean-mode]]) @@ -1797,7 +1765,9 @@ Emacs package that displays available keybindings in popup ;; prefixes for my personal bindings "C-c a" "applications" "C-c a s" "shells" - "C-c b" "borg" + "C-c P" "package-management" + "C-c P e" "package-management/epkg" + "C-c P s" "package-management/straight.el" "C-c c" "compile-and-comments" "C-c e" "eval" "C-c f" "files" @@ -2014,7 +1984,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. #+begin_src emacs-lisp (use-package shrink-path - :after eshell + :defer 2 :config (setq eshell-prompt-regexp "\\(.*\n\\)*λ " eshell-prompt-function #'+eshell/prompt) @@ -2045,6 +2015,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. #+begin_src emacs-lisp (use-package eshell-up + :commands eshell-up :after eshell) #+end_src @@ -2324,6 +2295,7 @@ Convenient footnotes in =message-mode=. #+begin_src emacs-lisp (use-package ebdb + :straight (:host github :repo "girzel/ebdb") :after gnus :bind (:map gnus-group-mode-map ("e" . ebdb)) :config @@ -2350,6 +2322,7 @@ Convenient footnotes in =message-mode=. (use-feature ebdb-gnus :after ebdb + :demand :custom (ebdb-gnus-window-configuration '(article @@ -2361,6 +2334,7 @@ Convenient footnotes in =message-mode=. (use-feature ebdb-mua :after ebdb + :demand ;; :custom (ebdb-mua-pop-up nil) )