Nix Package Overlay -> Straight

main.org

@@ -9,38 +9,59 @@
 
 * Initialization
 
+** Straight.el
+
+Package management to be a little more fien/precise and work outside
+of Nix (as much as it would be nice to work inside of Nix too)
+
+#+begin_src elisp :tangle yes :exports code
+(defvar bootstrap-version)
+(let ((bootstrap-file
+       (expand-file-name
+        "straight/repos/straight.el/bootstrap.el"
+        (or (bound-and-true-p straight-base-dir)
+            user-emacs-directory)))
+      (bootstrap-version 7))
+  (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))
+#+end_src
+
 ** Leaf.el
 
 We must initialize =leaf.el=, which we use as a use-package
 replacement for defining configs and relations between packages etc.
 
 #+begin_src elisp :tangle yes :exports code
-(eval-and-compile
-  (customize-set-variable
-   'package-archives '(("org" . "https://orgmode.org/elpa/")
-		       ("melpa" . "https://melpa.org/packages/")
-		       ("gnu" . "https://elpa.gnu.org/packages/")))
-  (package-initialize)
-  (unless (package-installed-p 'leaf)
-    (package-refresh-contents)
-    (package-install 'leaf))
+  (eval-and-compile
+    (customize-set-variable
+     'package-archives '(("org" . "https://orgmode.org/elpa/")
+  		       ("melpa" . "https://melpa.org/packages/")
+  		       ("gnu" . "https://elpa.gnu.org/packages/")))
+    (package-initialize)
+    (unless (package-installed-p 'leaf)
+      (package-refresh-contents)
+      (package-install 'leaf))
 
-  (leaf leaf-keywords
-    :ensure t
-    :init
-    (leaf el-get :ensure t)
-    (leaf hydra :ensure t)
-    (leaf blackout :ensure t)
+    (leaf leaf-keywords
+      :init
+      (straight-use-package 'leaf-keywords)
+      :custom
+      (leaf-alias-keyword-alist .'((:ensure . :straight)))
+      :config
+      ;; initialize leaf-keywords.el
+      (leaf-keywords-init)))
 
-    :config
-    ;; initialize leaf-keywords.el
-    (leaf-keywords-init)))
-
-(leaf leaf-tree :ensure t)
-(leaf leaf-convert :ensure t)
-(leaf transient-dwim :ensure t
-  :require t ;; Needed so that org-roam may unobstructively depend on this
-  :bind (("M-=" . transient-dwim-dispatch)))
+  (leaf leaf-tree :ensure t)
+  (leaf leaf-convert :ensure t)
+  (leaf transient-dwim :ensure t
+    :require t ;; Needed so that org-roam may unobstructively depend on this
+    :bind (("M-=" . transient-dwim-dispatch)))
 #+end_src
 
 ** MacOS Specific
@@ -310,13 +331,16 @@ For when we aren't nix'ing things, and want some nice poetry.
 
 Who even needs C++, not me, no way, no how.
 
-#+begin_src elisp :tangle yes :exports code
+#+begin_src elisp :tangle no :exports code
 (leaf c-config
-  :hook c-mode-hook c++-mode-hook
   :config
-  (leaf company-ctags :ensure t)
-  (leaf company-c-headers :ensure t)
-  (leaf meson-mode :ensure t))
+;  (leaf company-ctags :ensure t
+;      :hook c-mode-hook c++-mode-hook)
+;  (leaf company-c-headers :ensure t
+;      :hook c-mode-hook c++-mode-hook)
+;  (leaf meson-mode :ensure t
+;      :hook c-mode-hook c++-mode-hook)
+  )
 #+end_src
 
 * Haskell