diff --git a/.gitignore b/.gitignore
index 72e090f..5ee21da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 /auto-save-list/
 /backups/
 /etc/
-/straight/
+/straight/*
+!/straight/versions
 /tutorial/
 /var/
 tramp
diff --git a/main.org b/main.org
index 4af9bfe..7ab9a6e 100644
--- a/main.org
+++ b/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
diff --git a/straight/versions/default.el b/straight/versions/default.el
new file mode 100644
index 0000000..a767d76
--- /dev/null
+++ b/straight/versions/default.el
@@ -0,0 +1,102 @@
+(("ace-window" . "77115afc1b0b9f633084cf7479c767988106c196")
+ ("auctex" . "1a97d6a424a8cb45700a382fa0db5e597fdc2951")
+ ("avy" . "933d1f36cca0f71e4acb5fac707e9ae26c536264")
+ ("biblio.el" . "b700f0f2929829b2ca971511c5ebe61c67027e9f")
+ ("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470")
+ ("cfrs" . "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121")
+ ("cider" . "ee35c30d58bffe08dab080ec5135e23b9dfcf508")
+ ("citeproc-el" . "54184baaff555b5c7993d566d75dd04ed485b5c0")
+ ("clojure-mode" . "eabe29b076fff19db552d36d4babaa36ecf0b704")
+ ("company-ghci" . "a1d25652583ab4666c5a78cac18cd8039776b50d")
+ ("company-mode" . "8d599ebc8a9aca27c0a6157aeb31c5b7f05ed0a3")
+ ("compat" . "a0444eab265888bcc33c1ddaae8592e56e96e348")
+ ("d2-mode" . "e1fc7d6c1915acaf476060c0f79b8bdef6bd1952")
+ ("dap-mode" . "56e92dd86b526c191275cf7813208baad14e0c5d")
+ ("dart-mode" . "6229941ec5df40690142301cf7f3dd2e96ee7b91")
+ ("dash.el" . "fcb5d831fc08a43f984242c7509870f30983c27c")
+ ("el-get" . "ec5cba8d965980b2c47a8a11dce30dd5e845ed2a")
+ ("eldoc" . "b25e80819b2faaa329744215baf7e1f07ade5aa1")
+ ("emacs-async" . "b99658e831bc7e7d20ed4bb0a85bdb5c7dd74142")
+ ("emacs-direnv" . "c0bf3b81c7a97e2a0d06d05495e86848254fcc1f")
+ ("emacs-htmlize" . "8e3841c837b4b78bd72ad7f0436e919f39315a46")
+ ("emacs-request" . "c22e3c23a6dd90f64be536e176ea0ed6113a5ba6")
+ ("emacs-web-server" . "3982c55e9061475038a3ccd61aecb2de3d407cec")
+ ("emacs-websocket" . "40c208eaab99999d7c1e4bea883648da24c03be3")
+ ("emacs-which-key" . "38d4308d1143b61e4004b6e7a940686784e51500")
+ ("emacsmirror-mirror" . "93134bfec109035db8fd47f23a7084d95ccc8415")
+ ("emacsql" . "f111b0acc79eadeeb3c6c1332d943f11fd6932ff")
+ ("esup" . "4b49c8d599d4cc0fbf994e9e54a9c78e5ab62a5f")
+ ("exec-path-from-shell" . "4896a797252fbfdac32fb77508500ac7d220f717")
+ ("f.el" . "931b6d0667fe03e7bf1c6c282d6d8d7006143c52")
+ ("flycheck" . "b9db1379dcc3e59238dc1fdd7db368c66e8734ba")
+ ("gcmh" . "0089f9c3a6d4e9a310d0791cf6fa8f35642ecfd9")
+ ("geiser" . "c1c27072a46a959fa28f963c5e381e219916f85a")
+ ("gnu-elpa-mirror" . "d794ff622f3ee2f57131e6c42e488f8018bd7806")
+ ("gnuplot" . "d2c035592568f08a58eff2391903bfeffa9f7733")
+ ("haskell-mode" . "2ada981f2447039c070441d37d28cd32cc2906ca")
+ ("helm" . "d4fa6096759f27b47005e6f571015d2d3c479619")
+ ("helm-bibtex" . "6064e8625b2958f34d6d40312903a85c173b5261")
+ ("ht.el" . "1c49aad1c820c86f7ee35bf9fff8429502f60fef")
+ ("hydra" . "59a2a45a35027948476d1d7751b0f0215b1e61aa")
+ ("imenu-list" . "76f2335ee6f2f066d87fe4e4729219d70c9bc70d")
+ ("jsonrpc" . "444cafedd091815e674b6c93458ba97a55a76928")
+ ("leaf-convert.el" . "da86654f1021445cc42c1a5a9195f15097352209")
+ ("leaf-keywords.el" . "82ec27e3441900daedeaaebca509181f964da81f")
+ ("leaf-tree.el" . "89c3b8842df067bba67663d309f43aa311acdccd")
+ ("leaf.el" . "69c9b057cdeee560450c1d04a9a058235ecff0f7")
+ ("let-alist" . "35a1dae3c540705433a510c13c8af80206b29b5f")
+ ("llama" . "48e5bc4919a4a29665362832d59ade8e248b0c3e")
+ ("lsp-dart" . "2170823139269b77c39e3bf7600ff6c751a73b0d")
+ ("lsp-docker" . "3960c73349e5658220f0f48587894ac098e62b97")
+ ("lsp-haskell" . "cd0f5d251c14e90f2896d26d18de8ace462e011b")
+ ("lsp-mode" . "3d8d006bad721acf1ed99c28378e1b6f99192107")
+ ("lsp-treemacs" . "2495abd9df2f19335b4a280d9db641e02e2ddcfa")
+ ("lsp-ui" . "09d40806429fadc01a12d9a1841b49430f58adb5")
+ ("magit" . "752fce52350c38c9265e5483e7207d718a3645f0")
+ ("map" . "016e8711dea9ddbd26016711a64fbe78cba55668")
+ ("markdown-mode" . "d2d960bec164e91e1a3315b176e2bcc324e63c95")
+ ("melpa" . "4ca1824396b1b4b0069ef5bdb8dc026331a9d9da")
+ ("nix-mode" . "719feb7868fb567ecfe5578f6119892c771ac5e5")
+ ("nongnu-elpa" . "8576fdb9e1d8208836989a96e26ade0f976d17a0")
+ ("org" . "6daeb5da622a7a2a4ab81a145dfcb9f100132a89")
+ ("org-ref" . "edbb80863ef63ef52ef04fce3239e063843f8d30")
+ ("org-reveal" . "f55c851bf6aeb1bb2a7f6cf0f2b7bd0e79c4a5a0")
+ ("org-roam" . "db4170a459cba06bd3d36fb6dc748364774ec204")
+ ("org-roam-bibtex" . "b065198f2c3bc2a47ae520acd2b1e00e7b0171e6")
+ ("org-roam-ui" . "5ac74960231db0bf7783c2ba7a19a60f582e91ab")
+ ("ox-pandoc" . "34e6ea97b586e20529d07158a73af3cf33cdd1d5")
+ ("parsebib" . "735e308fc5b7aaed975764f6c7139d1c4bf28d0c")
+ ("parseclj" . "6af22372e0fe14df882dd300b22b12ba2d7e00b0")
+ ("parseedn" . "3407e4530a367b6c2b857dae261cdbb67a440aaa")
+ ("pdf-tools" . "30b50544e55b8dbf683c2d932d5c33ac73323a16")
+ ("pfuture" . "19b53aebbc0f2da31de6326c495038901bffb73c")
+ ("php-mode" . "5b6cc1c068ba759dcf30067ad1e048b3693a40d7")
+ ("poetry.el" . "1dff0d4a51ea8aff5f6ce97b154ea799902639ad")
+ ("posframe" . "12f540c9ad5da09673b2bca1132b41f94c134e82")
+ ("ppp.el" . "d5d854c3006dfd268e62c7f91c2aad6f86a505b5")
+ ("project" . "f8123159622f09c60c4d0be6c4c773b57c2a010d")
+ ("python-mode" . "7a4a93e972152ae224e88c25183115fb64ab87d0")
+ ("pyvenv" . "31ea715f2164dd611e7fc77b26390ef3ca93509b")
+ ("queue" . "8df1334d54d4735d2f821790422a850dfaaa08ef")
+ ("racket" . "22e56ce80389544d3872cf4beb4008fb514b2218")
+ ("rainbow-delimiters" . "f40ece58df8b2f0fb6c8576b527755a552a5e763")
+ ("rainbow-mode" . "2e6b18609c2fdd1a2dc513937a64d276fd6cf24c")
+ ("rust-mode" . "efd830806c8519bb7f614504eac6bdfdbbac1247")
+ ("s.el" . "dda84d38fffdaf0c9b12837b504b402af910d01d")
+ ("seq" . "da86da9bf111f68fb81efd466d76d53af5aebc00")
+ ("sesman" . "7bca68dbbab0af26a6a23be1ff5fa97f9a18e022")
+ ("slint-mode" . "168a6cfb90b5e36360074c83f80d5bbac2f0287e")
+ ("spinner" . "fa117f0893788f3fe24673715a6b83bb34d238dd")
+ ("straight.el" . "483b205efb2eaa6be7c0dc7078b8c9dafcffb318")
+ ("string-inflection" . "617df25e91351feffe6aff4d9e4724733449d608")
+ ("tablist" . "fcd37147121fabdf003a70279cf86fbe08cfac6f")
+ ("transient" . "52f737a696cad846d528a5a06e412f740a1de38a")
+ ("transient-dwim.el" . "cb5e0d35729fc6448553b7a17fc5c843f00e8c1d")
+ ("treemacs" . "32bb3dd02ddfca85661614b3b227e770fab821e2")
+ ("web-mode" . "be2d59c8fa02b1a45ae54ce4079e502e659cefe6")
+ ("wfnames" . "164e4efa2a96bed201a0a5402e137ebeef15bcc6")
+ ("with-editor" . "ca902ae02972bdd6919a902be2593d8cb6bd991b")
+ ("xref" . "b547cca3ccf85e564f14d1bc8344f58c15d3185c")
+ ("yaml-mode" . "d91f878729312a6beed77e6637c60497c5786efa")
+ ("yaml.el" . "f99ef76c80e6fc3fcf650c4fe34e10726594a4c4"))
+:gamma