From 583dbf635db06aabcc819b10563e30bb54eb0dab Mon Sep 17 00:00:00 2001
From: Tim McCarthy <thoomfish@gmail.com>
Date: Fri, 5 Apr 2024 11:21:11 -0700
Subject: [PATCH] Start migrating thoom-emacs away from org

---
 thoom-emacs/.gitignore                  |   3 +-
 thoom-emacs/ThoomEmacs.org              | 248 ++++++------------------
 thoom-emacs/modules/thoom-completion.el | 168 ++++++++++++++++
 thoom-emacs/modules/thoom-elpaca.el     |  44 +++++
 thoom-emacs/modules/thoom-os.el         |  20 ++
 thoom-emacs/modules/thoom-theme.el      |  29 +++
 thoom-emacs/thoom-emacs.el              | 110 +++++++++++
 7 files changed, 434 insertions(+), 188 deletions(-)
 create mode 100644 thoom-emacs/modules/thoom-completion.el
 create mode 100644 thoom-emacs/modules/thoom-elpaca.el
 create mode 100644 thoom-emacs/modules/thoom-os.el
 create mode 100644 thoom-emacs/modules/thoom-theme.el
 create mode 100644 thoom-emacs/thoom-emacs.el

diff --git a/thoom-emacs/.gitignore b/thoom-emacs/.gitignore
index fc59801..997f0e9 100644
--- a/thoom-emacs/.gitignore
+++ b/thoom-emacs/.gitignore
@@ -1,4 +1,5 @@
 *
 !.gitignore
 !*.org
-!*.el
\ No newline at end of file
+!*.el
+!modules
diff --git a/thoom-emacs/ThoomEmacs.org b/thoom-emacs/ThoomEmacs.org
index 0bc08ee..bb30be7 100644
--- a/thoom-emacs/ThoomEmacs.org
+++ b/thoom-emacs/ThoomEmacs.org
@@ -1,23 +1,52 @@
 #+title: Thoom Emacs
 #+PROPERTY: header-args:emacs-lisp :tangle ./init.el :mkdirp yes
 #+STARTUP: content
-* Prelude
-** Package Management
+* DONE Prelude
+** Package Management - Elpaca
 #+BEGIN_SRC emacs-lisp
-(defvar bootstrap-version)
-(let ((bootstrap-file
-       (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
-      (bootstrap-version 6))
-  (unless (file-exists-p bootstrap-file)
-    (with-current-buffer
-    (url-retrieve-synchronously
-     "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el"
-     'silent 'inhibit-cookies)
-      (goto-char (point-max))
-      (eval-print-last-sexp)))
-  (load bootstrap-file nil 'nomessage))
+(defvar elpaca-installer-version 0.7)
+(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
+(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
+(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
+(defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
+                              :ref nil :depth 1
+                              :files (:defaults "elpaca-test.el" (:exclude "extensions"))
+                              :build (:not elpaca--activate-package)))
+(let* ((repo  (expand-file-name "elpaca/" elpaca-repos-directory))
+       (build (expand-file-name "elpaca/" elpaca-builds-directory))
+       (order (cdr elpaca-order))
+       (default-directory repo))
+  (add-to-list 'load-path (if (file-exists-p build) build repo))
+  (unless (file-exists-p repo)
+    (make-directory repo t)
+    (when (< emacs-major-version 28) (require 'subr-x))
+    (condition-case-unless-debug err
+        (if-let ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
+                 ((zerop (apply #'call-process `("git" nil ,buffer t "clone"
+                                                 ,@(when-let ((depth (plist-get order :depth)))
+                                                     (list (format "--depth=%d" depth) "--no-single-branch"))
+                                                 ,(plist-get order :repo) ,repo))))
+                 ((zerop (call-process "git" nil buffer t "checkout"
+                                       (or (plist-get order :ref) "--"))))
+                 (emacs (concat invocation-directory invocation-name))
+                 ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch"
+                                       "--eval" "(byte-recompile-directory \".\" 0 'force)")))
+                 ((require 'elpaca))
+                 ((elpaca-generate-autoloads "elpaca" repo)))
+            (progn (message "%s" (buffer-string)) (kill-buffer buffer))
+          (error "%s" (with-current-buffer buffer (buffer-string))))
+      ((error) (warn "%s" err) (delete-directory repo 'recursive))))
+  (unless (require 'elpaca-autoloads nil t)
+    (require 'elpaca)
+    (elpaca-generate-autoloads "elpaca" repo)
+    (load "./elpaca-autoloads")))
+(add-hook 'after-init-hook #'elpaca-process-queues)
+(elpaca `(,@elpaca-order))
 
-(straight-use-package 'use-package)
+(elpaca elpaca-use-package
+        (elpaca-use-package-mode))
+;; Wait for elpaca-use-package to finish installing before proceding
+(elpaca-wait)
 #+END_SRC
 ** Utility constants for checking operating system
 #+begin_src emacs-lisp
@@ -51,7 +80,7 @@ Emacs on macOS doesn't naturally find shell variables like PATH, so to help it o
 
 (add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'thoom/org-babel-tangle-config)))
 #+end_src
-* Basic UI Tweaks
+* DONE Basic UI Tweaks
 ** Theme
 #+begin_src emacs-lisp
 (use-package doom-themes
@@ -83,8 +112,8 @@ Disable a bunch of stuff we don't want to see.
 (scroll-bar-mode -1)
 
 ;; On a Mac, the menu bar doesn't take up screen real-estate, so leave it on
-(if (not ON-MAC)
-    (menu-bar-mode -1))
+(unless ON-MAC
+  (menu-bar-mode -1))
 #+END_SRC
 
 ** General Settings
@@ -145,9 +174,8 @@ Set a location for the custom file so it doesn't pollute this file.
 (require 'server)
 (unless (server-running-p) (server-start))
 #+end_src
-
 * Keybindings
-** Which-key
+** DONE Which-key
 #+begin_src emacs-lisp
 (use-package which-key
   :straight t
@@ -155,7 +183,7 @@ Set a location for the custom file so it doesn't pollute this file.
   (which-key-mode)
   (which-key-setup-side-window-bottom))
 #+end_src
-** Keybindings
+** WAIT Keybindings
 #+BEGIN_SRC emacs-lisp
 (use-package emacs
   :bind
@@ -202,7 +230,7 @@ Set a location for the custom file so it doesn't pollute this file.
   ;; mark-page is not very useful, and shadows project.el bindings in Meow keypad
   (unbind-key "C-x C-p"))
 #+END_SRC
-** Dired
+** DONE Dired
 #+begin_src emacs-lisp
 (use-package dired
   :bind (:map dired-mode-map
@@ -211,7 +239,7 @@ Set a location for the custom file so it doesn't pollute this file.
 #+end_src
 
 * Editing
-** Fancy Indenting
+** WAIT Fancy Indenting
 When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by single character increments and =h/l= to adjust by tab stops.
 
 #+begin_src emacs-lisp
@@ -221,159 +249,7 @@ When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by
 (define-key indent-rigidly-map (kbd "h") 'indent-rigidly-left-to-tab-stop)
 (define-key indent-rigidly-map (kbd "l") 'indent-rigidly-right-to-tab-stop)
 #+end_src
-** Meow
-#+begin_src emacs-lisp
-(defmacro thoom/meow-negate (meow-command)
-  `(lambda ()
-     (interactive)
-     (let ((current-prefix-arg -1))
-       (call-interactively ,meow-command))))
-
-(use-package meow
-  :straight t
-  :init
-  ;; TODO - make this unnecessary
-  (require 'meow)
-
-  ;; TODO - debug this. should make org headings into meow things
-  (meow-thing-register 'heading 'heading 'heading)
-  (setq meow-use-clipboard t
-    meow-char-thing-table '((?\( . round)
-                (?\) . round)
-                (?\[ . square)
-                (?\] . square)
-                (?\{ . curly)
-                (?\} . curly)
-                (?\" . string)
-                (?\' . string)
-                (?h . heading)
-                (?e . symbol)
-                (?w . window)
-                (?b . buffer)
-                (?p . paragraph)
-                (?l . line)
-                (?d . defun)
-                (?. . sentence))
-    meow-cheatsheet-layout meow-cheatsheet-layout-qwerty
-    meow-keypad-self-insert-undefined nil)
-
-  (add-to-list 'meow-mode-state-list '(eshell-mode . insert) t)
-  (add-hook 'git-commit-mode-hook 'meow-insert)
-
-  (meow-motion-overwrite-define-key
-   '("j" . meow-next)
-   '("k" . meow-prev)
-   '("J" . meow-next-expand)
-   '("K" . meow-prev-expand)
-   '(":" . execute-extended-command)
-   '("<escape>" . ignore))
-
-  (meow-leader-define-key
-   ;; SPC j/k will run the original command in MOTION state.
-   '("j" . "H-j")
-   '("k" . "H-k")
-
-   ;; Use SPC (0-9) for digit arguments.
-   '("1" . meow-digit-argument)
-   '("2" . meow-digit-argument)
-   '("3" . meow-digit-argument)
-   '("4" . meow-digit-argument)
-   '("5" . meow-digit-argument)
-   '("6" . meow-digit-argument)
-   '("7" . meow-digit-argument)
-   '("8" . meow-digit-argument)
-   '("9" . meow-digit-argument)
-   '("0" . meow-digit-argument)
-   '("/" . meow-keypad-describe-key)
-   '("?" . meow-cheatsheet))
-
-  (meow-define-keys 'insert
-    '("C-g" . meow-insert-exit)
-    '("C-M-g" . meow-insert-exit))
-
-  (meow-normal-define-key
-   '("0" . meow-expand-0)
-   '("9" . meow-expand-9)
-   '("8" . meow-expand-8)
-   '("7" . meow-expand-7)
-   '("6" . meow-expand-6)
-   '("5" . meow-expand-5)
-   '("4" . meow-expand-4)
-   '("3" . meow-expand-3)
-   '("2" . meow-expand-2)
-   '("1" . meow-expand-1)
-   '("-" . negative-argument)
-
-   '(";" . meow-reverse)
-   '("," . meow-inner-of-thing)
-   '("." . meow-bounds-of-thing)
-   '("[" . meow-beginning-of-thing)
-   '("]" . meow-end-of-thing)
-   ;; Potential addition <, >
-
-   '("a" . meow-append)
-   '("A" . meow-open-below)
-   '("b" . meow-back-word)
-   '("B" . meow-back-symbol)
-   '("c" . meow-change)
-   ;; Potential addition
-   '("d" . meow-delete)
-   '("D" . meow-backward-delete)
-   '("e" . meow-next-word)
-   '("E" . meow-next-symbol)
-   '("f" . meow-find)
-   `("F" . ,(thoom/meow-negate 'meow-find))
-   '("g g" . meow-cancel-selection)
-   '("g d" . xref-find-definitions)
-   '("g u" . xref-find-references)
-   '("G" . meow-grab)
-   '("h" . meow-left)
-   '("H" . meow-left-expand)
-   '("i" . meow-insert)
-   '("I" . meow-open-above)
-   '("j" . meow-next)
-   '("J" . meow-next-expand)
-   '("k" . meow-prev)
-   '("K" . meow-prev-expand)
-   '("l" . meow-right)
-   '("L" . meow-right-expand)
-   '("m" . meow-join)
-   ;; Potential addition - M
-   '("n" . meow-search)
-   ;; Potential addition - N
-   '("o" . meow-block)
-   '("O" . meow-to-block)
-   '("p" . meow-yank)
-   '("P" . consult-yank-pop)
-   '("q" . meow-cancel-selection)
-   ;; Potential addition - Q
-   '("r" . meow-replace)
-   '("R" . meow-swap-grab)
-   '("s" . meow-kill)
-   ;; Potential addition - S
-   '("t" . meow-till)
-   `("T" . ,(thoom/meow-negate 'meow-till))
-   '("u" . meow-undo)
-   '("U" . meow-undo-in-selection)
-   '("v" . meow-visit)
-   `("V" . ,(thoom/meow-negate 'meow-visit))
-   '("w" . meow-mark-word)
-   '("W" . meow-mark-symbol)
-   '("x" . meow-line)
-   `("X" . ,(thoom/meow-negate 'meow-line))
-   '("y" . meow-save)
-   '("Y" . meow-sync-grab)
-   '("z" . meow-pop-selection)
-   ;; Potential addition - Z
-   '("'" . repeat)
-   '("/" . meow-comment)
-   '(":" . execute-extended-command)
-   '("=" . indent-region)
-   '("+" . indent-rigidly))
-
-  (meow-global-mode 1))
-#+end_src
-** Autocompletion
+** DONE Autocompletion
 #+begin_src emacs-lisp
 (use-package corfu
   :straight t
@@ -405,7 +281,7 @@ When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by
   :init
   (setq tab-always-indent 'complete))
 #+end_src
-** Dumb-Jump
+** DONE Dumb-Jump
 #+begin_src emacs-lisp
 (use-package dumb-jump
   :straight t
@@ -437,8 +313,7 @@ When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by
   :straight t
   :hook org-mode)
 #+end_src
-** Groceries
-
+** DONE Groceries
 #+begin_src emacs-lisp
 (defun thoom-org-clear-all ()
   (interactive)
@@ -449,9 +324,8 @@ When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by
   (flush-lines "CLOSED")
   (message "Entries cleared."))
 #+end_src
-
 * VMOCE
-** Vertico
+** DONE Vertico
 #+begin_src emacs-lisp
 (use-package vertico
   :straight (:files (:defaults "extensions/*"))
@@ -468,7 +342,7 @@ When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by
           ("C-h" . vertico-directory-delete-word)
           ("C-l" . vertico-directory-enter)))
 #+end_src
-** Marginalia
+** DONE Marginalia
 #+begin_src emacs-lisp
 (use-package marginalia
   :straight t
@@ -479,7 +353,7 @@ When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by
   :init
   (marginalia-mode))
 #+end_src
-** Orderless
+** DONE Orderless
 #+begin_src emacs-lisp
 (use-package orderless
   :straight t
@@ -491,7 +365,7 @@ When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by
     completion-category-defaults nil
     completion-category-overrides '((file (styles partial-completion)))))
 #+end_src
-** Consult
+** DONE Consult
 #+begin_src emacs-lisp
 (use-package consult
   :straight t
@@ -611,7 +485,7 @@ When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by
   ;; (setq consult-project-function (lambda (_) (locate-dominating-file "." ".git")))
   )
 #+end_src
-** Embark
+** DONE Embark
 #+begin_src emacs-lisp
 (use-package embark
   :straight t
@@ -643,7 +517,7 @@ When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by
   (embark-collect-mode . consult-preview-at-point-mode))
 #+end_src
 
-* Git
+* DONE Git
 #+begin_src emacs-lisp
 (use-package magit
   :straight t
@@ -653,7 +527,7 @@ When in indent-rigidly mode (=+= in normal state), use =H/L= to adjust indent by
      (":" . execute-extended-command)
      ("x" . magit-discard)))
 #+end_src
-* Direnv
+* DONE Direnv
 #+begin_src emacs-lisp
 (use-package direnv
   :straight t
diff --git a/thoom-emacs/modules/thoom-completion.el b/thoom-emacs/modules/thoom-completion.el
new file mode 100644
index 0000000..36bdc99
--- /dev/null
+++ b/thoom-emacs/modules/thoom-completion.el
@@ -0,0 +1,168 @@
+(provide 'thoom-completion)
+
+;; VMOCE
+(use-package vertico
+  :ensure t
+  :init
+  (vertico-mode))
+
+;; (use-package vertico-directory
+;;   :after vertico
+;;   :bind (:map vertico-map
+;;           ("C-h" . vertico-directory-delete-word)
+;;           ("C-l" . vertico-directory-enter)))
+
+
+(use-package marginalia
+  :ensure t
+  ;; Either bind `marginalia-cycle' globally or only in the minibuffer
+  :bind (:map minibuffer-local-map
+          ("M-A" . marginalia-cycle))
+
+  :init
+  (marginalia-mode))
+
+
+(use-package orderless
+  :ensure t
+  :init
+  ;; Configure a custom style dispatcher (see the Consult wiki)
+  ;; (setq orderless-style-dispatchers '(+orderless-dispatch)
+  ;;       orderless-component-separator #'orderless-escapable-split-on-space)
+  (setq completion-styles '(orderless basic)
+    completion-category-defaults nil
+    completion-category-overrides '((file (styles partial-completion)))))
+
+(use-package consult
+  :ensure t
+  ;; Replace bindings. Lazily loaded due by `use-package'.
+  :bind (;; C-c bindings (mode-specific-map)
+         ("C-c h" . consult-history)
+         ("C-c m" . consult-mode-command)
+         ("C-c k" . consult-kmacro)
+     ;; C-x bindings (ctl-x-map)
+         ("C-x M-:" . consult-complex-command)     ;; orig. repeat-complex-command
+         ("C-x C-b" . consult-buffer)
+         ("C-x b" . consult-buffer)                ;; orig. switch-to-buffer
+         ("C-x 4 b" . consult-buffer-other-window) ;; orig. switch-to-buffer-other-window
+         ("C-x 5 b" . consult-buffer-other-frame)  ;; orig. switch-to-buffer-other-frame
+         ("C-x r b" . consult-bookmark)            ;; orig. bookmark-jump
+         ("C-x p b" . consult-project-buffer)      ;; orig. project-switch-to-buffer
+     ;; Custom M-# bindings for fast register access
+         ("M-#" . consult-register-load)
+         ("M-'" . consult-register-store)          ;; orig. abbrev-prefix-mark (unrelated)
+         ("C-M-#" . consult-register)
+     ;; Other custom bindings
+         ("M-y" . consult-yank-pop)                ;; orig. yank-pop
+         ("<help> a" . consult-apropos)            ;; orig. apropos-command
+     ;; M-g bindings (goto-map)
+         ("M-g e" . consult-compile-error)
+         ("M-g f" . consult-flymake)               ;; Alternative: consult-flycheck
+         ("M-g g" . consult-goto-line)             ;; orig. goto-line
+         ("M-g M-g" . consult-goto-line)           ;; orig. goto-line
+         ("M-g o" . consult-outline)               ;; Alternative: consult-org-heading
+         ("M-g m" . consult-mark)
+         ("M-g k" . consult-global-mark)
+         ("M-g i" . consult-imenu)
+         ("M-g I" . consult-imenu-multi)
+     ;; M-s bindings (search-map)
+         ("M-s d" . consult-find)
+         ("M-s D" . consult-locate)
+         ("M-s g" . consult-grep)
+         ("M-s G" . consult-git-grep)
+         ("M-s r" . consult-ripgrep)
+         ("M-s l" . consult-line)
+         ("M-s L" . consult-line-multi)
+         ("M-s m" . consult-multi-occur)
+         ("M-s k" . consult-keep-lines)
+         ("M-s u" . consult-focus-lines)
+     ;; Isearch integration
+         ("M-s e" . consult-isearch-history)
+         :map isearch-mode-map
+         ("M-e" . consult-isearch-history)         ;; orig. isearch-edit-string
+         ("M-s e" . consult-isearch-history)       ;; orig. isearch-edit-string
+         ("M-s l" . consult-line)                  ;; needed by consult-line to detect isearch
+         ("M-s L" . consult-line-multi)            ;; needed by consult-line to detect isearch
+     ;; Minibuffer history
+         :map minibuffer-local-map
+         ("M-s" . consult-history)                 ;; orig. next-matching-history-element
+         ("M-r" . consult-history))                ;; orig. previous-matching-history-element
+
+  ;; Enable automatic preview at point in the *Completions* buffer. This is
+  ;; relevant when you use the default completion UI.
+  :hook (completion-list-mode . consult-preview-at-point-mode)
+
+  ;; The :init configuration is always executed (Not lazy)
+  :init
+
+  ;; Optionally configure the register formatting. This improves the register
+  ;; preview for `consult-register', `consult-register-load',
+  ;; `consult-register-store' and the Emacs built-ins.
+  (setq register-preview-delay 0.5
+    register-preview-function #'consult-register-format)
+
+  ;; Optionally tweak the register preview window.
+  ;; This adds thin lines, sorting and hides the mode line of the window.
+  (advice-add #'register-preview :override #'consult-register-window)
+
+  ;; Use Consult to select xref locations with preview
+  (setq xref-show-xrefs-function #'consult-xref
+    xref-show-definitions-function #'consult-xref)
+
+  ;; Configure other variables and modes in the :config section,
+  ;; after lazily loading the package.
+  :config
+
+  ;; Optionally configure preview. The default value
+  ;; is 'any, such that any key triggers the preview.
+  ;; (setq consult-preview-key 'any)
+  ;; (setq consult-preview-key (kbd "M-."))
+  ;; (setq consult-preview-key (list (kbd "<S-down>") (kbd "<S-up>")))
+  ;; For some commands and buffer sources it is useful to configure the
+  ;; :preview-key on a per-command basis using the `consult-customize' macro.
+  (consult-customize
+   consult-theme
+   :preview-key '(:debounce 0.2 any)
+   consult-ripgrep consult-git-grep consult-grep
+   consult-bookmark consult-recent-file consult-xref
+   consult--source-bookmark consult--source-recent-file
+   consult--source-project-recent-file
+   :preview-key (kbd "M-."))
+
+  ;; Optionally configure the narrowing key.
+  ;; Both < and C-+ work reasonably well.
+  (setq consult-narrow-key "<"))
+
+(use-package embark
+  :ensure t
+
+  :bind
+  (("C-." . embark-act)         ;; pick some comfortable binding
+   ("C-;" . embark-dwim)        ;; good alternative: M-.
+   ("C-h B" . embark-bindings)) ;; alternative for `describe-bindings'
+
+  :init
+  ;; Optionally replace the key help with a completing-read interface
+  (setq prefix-help-command #'embark-prefix-help-command)
+
+  :config
+  ;; Hide the mode line of the Embark live/completions buffers
+  (add-to-list 'display-buffer-alist
+           '("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*")
+         nil
+         (window-parameters (mode-line-format . none))))
+
+;; Consult users will also want the embark-consult package.
+(use-package embark-consult
+  :ensure t
+  :after (embark consult)
+  :demand t ; only necessary if you have the hook below
+  ;; if you want to have consult previews as you move around an
+  ;; auto-updating embark collect buffer
+  :hook
+  (embark-collect-mode . consult-preview-at-point-mode))
+
+(use-package corfu
+  :ensure t
+  :init
+  (global-corfu-mode))
diff --git a/thoom-emacs/modules/thoom-elpaca.el b/thoom-emacs/modules/thoom-elpaca.el
new file mode 100644
index 0000000..39eb755
--- /dev/null
+++ b/thoom-emacs/modules/thoom-elpaca.el
@@ -0,0 +1,44 @@
+(provide 'thoom-elpaca)
+
+(defvar elpaca-installer-version 0.7)
+(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
+(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
+(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
+(defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
+                              :ref nil :depth 1
+                              :files (:defaults "elpaca-test.el" (:exclude "extensions"))
+                              :build (:not elpaca--activate-package)))
+(let* ((repo  (expand-file-name "elpaca/" elpaca-repos-directory))
+       (build (expand-file-name "elpaca/" elpaca-builds-directory))
+       (order (cdr elpaca-order))
+       (default-directory repo))
+  (add-to-list 'load-path (if (file-exists-p build) build repo))
+  (unless (file-exists-p repo)
+    (make-directory repo t)
+    (when (< emacs-major-version 28) (require 'subr-x))
+    (condition-case-unless-debug err
+        (if-let ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
+                 ((zerop (apply #'call-process `("git" nil ,buffer t "clone"
+                                                 ,@(when-let ((depth (plist-get order :depth)))
+                                                     (list (format "--depth=%d" depth) "--no-single-branch"))
+                                                 ,(plist-get order :repo) ,repo))))
+                 ((zerop (call-process "git" nil buffer t "checkout"
+                                       (or (plist-get order :ref) "--"))))
+                 (emacs (concat invocation-directory invocation-name))
+                 ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch"
+                                       "--eval" "(byte-recompile-directory \".\" 0 'force)")))
+                 ((require 'elpaca))
+                 ((elpaca-generate-autoloads "elpaca" repo)))
+            (progn (message "%s" (buffer-string)) (kill-buffer buffer))
+          (error "%s" (with-current-buffer buffer (buffer-string))))
+      ((error) (warn "%s" err) (delete-directory repo 'recursive))))
+  (unless (require 'elpaca-autoloads nil t)
+    (require 'elpaca)
+    (elpaca-generate-autoloads "elpaca" repo)
+    (load "./elpaca-autoloads")))
+(add-hook 'after-init-hook #'elpaca-process-queues)
+(elpaca `(,@elpaca-order))
+
+(elpaca elpaca-use-package
+        (elpaca-use-package-mode))
+(elpaca-wait)
diff --git a/thoom-emacs/modules/thoom-os.el b/thoom-emacs/modules/thoom-os.el
new file mode 100644
index 0000000..c4a047c
--- /dev/null
+++ b/thoom-emacs/modules/thoom-os.el
@@ -0,0 +1,20 @@
+(provide 'thoom-os)
+
+(defconst ON-LINUX   (eq system-type 'gnu/linux))
+(defconst ON-MAC     (eq system-type 'darwin))
+(defconst ON-BSD     (or ON-MAC (eq system-type 'berkeley-unix)))
+(defconst ON-WINDOWS (memq system-type '(cygwin windows-nt ms-dos)))
+
+;; Emacs on macOS doesn't naturally find shell variables like PATH,
+;; so to help it out we run a shell and load some variables from the env command.
+(use-package exec-path-from-shell
+  :ensure t
+  :if (and ON-MAC (memq window-system '(mac ns)))
+  :config
+  (dolist (var '("NIX_SSL_CERT_FILE"
+                 "NIX_PATH"
+                 "NIX_PROFILES"))
+    (add-to-list 'exec-path-from-shell-variables var))
+  (exec-path-from-shell-initialize))
+
+(elpaca-wait)
diff --git a/thoom-emacs/modules/thoom-theme.el b/thoom-emacs/modules/thoom-theme.el
new file mode 100644
index 0000000..8989ca2
--- /dev/null
+++ b/thoom-emacs/modules/thoom-theme.el
@@ -0,0 +1,29 @@
+(provide 'thoom-theme)
+
+;; Theme
+(use-package doom-themes
+  :ensure t
+  :config
+  ;; Global settings (defaults)
+  (setq doom-themes-enable-bold t    ; if nil, bold is universally disabled
+        doom-themes-enable-italic t) ; if nil, italics is universally disabled
+  (load-theme 'doom-one t)
+
+  ;; Enable flashing mode-line on errors
+  (doom-themes-visual-bell-config)
+  ;; Corrects (and improves) org-mode's native fontification.
+  (doom-themes-org-config))
+
+;; Slightly transparent window
+(set-frame-parameter (selected-frame) 'alpha '(99 98))
+(add-to-list 'default-frame-alist '(alpha 99 98))
+
+;; Hide clutter
+(setq inhibit-startup-message t
+      use-dialog-box nil)
+(tool-bar-mode -1)
+(scroll-bar-mode -1)
+
+;; On a Mac, the menu bar doesn't take up screen real-estate, so leave it on
+(unless ON-MAC
+  (menu-bar-mode -1))
diff --git a/thoom-emacs/thoom-emacs.el b/thoom-emacs/thoom-emacs.el
new file mode 100644
index 0000000..fbd460d
--- /dev/null
+++ b/thoom-emacs/thoom-emacs.el
@@ -0,0 +1,110 @@
+
+(defvar thoom/dir (file-name-directory load-file-name)
+  "The root dir of the Thoom Emacs distribution.")
+(defvar thoom/modules-dir (expand-file-name  "modules" thoom/dir)
+  "This directory houses all of the built-in Prelude modules.")
+(add-to-list 'load-path thoom/modules-dir)
+
+;; Set a location for the custom file so it doesn't pollute this file.
+(setq custom-file (locate-user-emacs-file "custom-vars.el"))
+
+;; Elpaca package manager
+(require 'thoom-elpaca)
+(require 'thoom-os)
+(require 'thoom-completion)
+(require 'thoom-theme)
+
+;; When scrolling by page and hitting top/bottom, move cursor to top/bottom of buffer
+(setq-default scroll-error-top-bottom t)
+
+;; Revert buffers when the underlying file has changed
+(global-auto-revert-mode 1)
+
+;; Remember recent files
+(recentf-mode 1)
+
+;; Save what you enter into minibuffer prompts
+(setq history-length 25)
+(savehist-mode 1)
+
+;; Visually mark the line the cursor is on
+(global-hl-line-mode 1)
+
+;; Enable repeat mode. Keymaps are defined through use-package's :repeat-map directive.
+(repeat-mode 1)
+
+(tab-bar-mode)
+;; TODO - keybindings
+
+;; TODO - Decide whether to enable this
+;; (defalias 'yes-or-no-p 'y-or-n-p)
+
+;; tabs are for monsters
+(setq-default indent-tabs-mode nil)
+(setq-default tab-width 4)
+(setq-default sentence-end-double-space nil)
+
+(use-package hl-todo
+  :ensure t
+  :init
+  (global-hl-todo-mode))
+
+;; TODO https://github.com/jdtsmith/outli
+
+(use-package which-key
+  :ensure t
+  :init
+  (which-key-mode)
+  (which-key-setup-side-window-bottom))
+
+;; Dired
+;; (use-package dired
+;;   :bind (:map dired-mode-map
+;;               ("h" . dired-up-directory)
+;;               ("l" . dired-find-file)))
+
+;; Treesitter
+;; TODO https://github.com/renzmann/treesit-auto
+
+;; LSP
+;; TODO https://github.com/blahgeek/emacs-lsp-booster
+
+;; TODO Use right-option as regular option on Mac
+;; (setq ns-alternate-modifier 'meta)
+;; (setq ns-right-alternate-modifier 'none)
+
+;; TODO https://github.com/stsquad/emacs_chrome
+
+;; TODO https://github.com/astoff/devdocs.el
+
+;; TODO https://github.com/casouri/vundo
+;
+;; TODO https://karthinks.com/software/avy-can-do-anything/
+
+(defun thoom/org-clear-all ()
+  (interactive)
+  (goto-char 0)
+  (org-map-entries
+   (lambda ()
+     (org-todo "")))
+  (flush-lines "CLOSED")
+  (message "Entries cleared."))
+
+(use-package dumb-jump
+  :ensure t
+  :config
+  (add-hook 'xref-backend-functions #'dumb-jump-xref-activate)
+  (setq xref-show-definitions-function #'xref-show-definitions-completing-read))
+
+(use-package magit
+  :ensure t
+  :custom (magit-save-repository-buffers 'dontask)
+  :bind (("C-x g" . magit-status))
+     :map magit-mode-map
+     (":" . execute-extended-command)
+     ("x" . magit-discard))
+
+(use-package direnv
+  :ensure t
+  :config
+  (direnv-mode))