From 4923e7e2ca0ed664bdecddaf83d3f99f4a991e1f Mon Sep 17 00:00:00 2001
From: "Collin J. Doering" <collin@rekahsoft.ca>
Date: Sun, 24 Dec 2023 14:50:29 -0500
Subject: [PATCH] home: Update guix and nonguix channels, adjusting to
 compensate

* .guix/rekahsoft/guix-config/home.scm: Remove emacs-org-babel-eval-in-repl as its dependency
'emacs-ess' does not currently build, which blocks updates.
* channels.scm: Update guix and nonguix channels.
* user-config/emacs/.emacs.d/config.org: Remove eval-in-repl configuration (I honestly did
not really use this much anyways).
---
 .guix/rekahsoft/guix-config/home.scm  |  1 -
 channels.scm                          |  4 ++--
 user-config/emacs/.emacs.d/config.org | 32 ---------------------------
 3 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/.guix/rekahsoft/guix-config/home.scm b/.guix/rekahsoft/guix-config/home.scm
index dac386f..b940ee8 100644
--- a/.guix/rekahsoft/guix-config/home.scm
+++ b/.guix/rekahsoft/guix-config/home.scm
@@ -93,7 +93,6 @@ single certifcate used for local development with caddy.")
       emacs-lsp-haskell
       emacs-mu4e-dashboard
       emacs-mu4e-maildirs-extension
-      emacs-org-babel-eval-in-repl
       emacs-org-html-theme-darksun
       emacs-org-html-themes
       emacs-org-projectile
diff --git a/channels.scm b/channels.scm
index 4c54f2d..c7913ec 100644
--- a/channels.scm
+++ b/channels.scm
@@ -3,7 +3,7 @@
         (url "https://git.savannah.gnu.org/git/guix.git")
         (branch "master")
         (commit
-          "952a0ce2800e4fe9165184151412858ed8d34760")
+          "25b83bd9e4ceb77f08c0caee3ecdc48263b53a46")
         (introduction
           (make-channel-introduction
             "9edb3f66fd807b096b48283debdcddccfea34bad"
@@ -14,7 +14,7 @@
         (url "https://gitlab.com/nonguix/nonguix")
         (branch "master")
         (commit
-          "bb184bd0a8f91beec3a00718759e96c7828853de")
+          "71a53faf2e1925a309b480f17e5b836740ce54bc")
         (introduction
           (make-channel-introduction
             "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
diff --git a/user-config/emacs/.emacs.d/config.org b/user-config/emacs/.emacs.d/config.org
index e9a98c9..1b80039 100644
--- a/user-config/emacs/.emacs.d/config.org
+++ b/user-config/emacs/.emacs.d/config.org
@@ -2336,38 +2336,6 @@ via the customize variable ~org-roam-encrypt-files~.
       (org-super-agenda-mode)))
 #+end_src
 
-*** TODO Setup [[https://github.com/diadochos/org-babel-eval-in-repl][org-babel-eval-in-repl]]
-
-#+begin_src emacs-lisp
-  (use-package eval-in-repl)
-  (use-package eval-in-repl-shell
-    :after eval-in-repl
-    :config
-    (setq eir-shell-type 'vterm
-          eir-shell-term-program (executable-find "zsh")
-          eir-shell-buffer-name "*vterm*"))
-
-  (use-package org-babel-eval-in-repl
-    :after eval-in-repl org
-    :config
-    ;; TODO: this doesn't seem to work correctly
-    ;; Taken from: https://github.com/diadochos/org-babel-eval-in-repl/wiki#example-2-one-magic-key
-    (defun org-meta-return-around (org-fun &rest args)
-      "Run `ober-eval-in-repl' if in source code block,
-  `ober-eval-block-in-repl' if at header,
-  and `org-meta-return' otherwise."
-      (if (org-in-block-p '("src"))
-          (let* ((point (point))
-                 (element (org-element-at-point))
-                 (area (org-src--contents-area element))
-                 (beg (copy-marker (nth 0 area))))
-            (if (< point beg)
-                (ober-eval-block-in-repl)
-              (ober-eval-in-repl)))
-        (apply org-fun args)))
-    (advice-add 'org-meta-return :around #'org-meta-return-around))
-#+end_src
-
 ** treemacs
 
 #+begin_src emacs-lisp