[emacs] Assimilate 3 drones (geiser & guix & a dep)

Assimilate bui    v1.2.1-1-g508577a
Assimilate geiser  0.10-30-ga6a2f2c
Assimilate guix   v0.5-16-gfe0a6c9

diff --git a/.gitmodules b/.gitmodules
index 38f657d..eb57246 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,6 +26,9 @@
 [submodule "boxquote"]
        path = lib/boxquote
        url = git@github.com:davep/boxquote.el.git
 [submodule "boxquote"]
        path = lib/boxquote
        url = git@github.com:davep/boxquote.el.git

+[submodule "bui"]
+       path = lib/bui
+       url = git@github.com:alezost/bui.el.git

 [submodule "closql"]
        path = lib/closql
        url = git@github.com:emacscollective/closql.git
 [submodule "closql"]
        path = lib/closql
        url = git@github.com:emacscollective/closql.git


@@ -89,6 +92,14 @@
 [submodule "flycheck-haskell"]
        path = lib/flycheck-haskell
        url = git@github.com:flycheck/flycheck-haskell.git
 [submodule "flycheck-haskell"]
        path = lib/flycheck-haskell
        url = git@github.com:flycheck/flycheck-haskell.git

+[submodule "geiser"]
+       path = lib/geiser
+       url = git@gitlab.com:jaor/geiser.git
+       info-path = doc/
+       load-path = elisp
+       build-step = ./autogen.sh
+       build-step = ./configure
+       build-step = make

 [submodule "ghub"]
        path = lib/ghub
        url = git@github.com:magit/ghub.git
 [submodule "ghub"]
        path = lib/ghub
        url = git@github.com:magit/ghub.git


@@ -98,6 +109,14 @@
 [submodule "graphql"]
        path = lib/graphql
        url = git@github.com:vermiculus/graphql.el.git
 [submodule "graphql"]
        path = lib/graphql
        url = git@github.com:vermiculus/graphql.el.git

+[submodule "guix"]
+       path = lib/guix
+       url = git@github.com:alezost/guix.el.git
+       info-path = doc/
+       load-path = elisp
+       build-step = ./autogen.sh
+       build-step = ./configure
+       build-step = make

 [submodule "haskell-mode"]
        path = lib/haskell-mode
        url = git@github.com:haskell/haskell-mode.git
 [submodule "haskell-mode"]
        path = lib/haskell-mode
        url = git@github.com:haskell/haskell-mode.git

diff --git a/init.org b/init.org
index ebfdf83..5a3728c 100644 (file)
--- a/init.org
+++ b/init.org
@@ -1553,6 +1553,23 @@ treemacs
   :after (treemacs))
 #+end_src
 
   :after (treemacs))
 #+end_src
 

+** geiser
+
+#+begin_src emacs-lisp
+(use-package geiser)
+
+(use-package geiser-guile
+  :config
+  (setq geiser-guile-load-path "~/src/git/guix"))
+#+end_src
+
+** guix
+
+#+begin_src emacs-lisp
+(use-package guix
+  :load-path "lib/guix/elisp")
+#+end_src
+

 * Emacs Enhancements
 
 ** [[https://github.com/justbur/emacs-which-key][which-key]]
 * Emacs Enhancements
 
 ** [[https://github.com/justbur/emacs-which-key][which-key]]

diff --git a/lib/bui b/lib/bui
new file mode 160000 (submodule)
index 0000000..508577a
--- /dev/null
+++ b/lib/bui
@@ -0,0 +1 @@
+Subproject commit 508577a7225b3d07eaefa9444064410af2518675

diff --git a/lib/geiser b/lib/geiser
new file mode 160000 (submodule)
index 0000000..a6a2f2c
--- /dev/null
+++ b/lib/geiser
@@ -0,0 +1 @@
+Subproject commit a6a2f2c2194cdef97d67945aa1e7df81763ec34e

diff --git a/lib/guix b/lib/guix
new file mode 160000 (submodule)
index 0000000..fe0a6c9
--- /dev/null
+++ b/lib/guix
@@ -0,0 +1 @@
+Subproject commit fe0a6c937479bf75d636273eb2b61d4bcc563341