From 2128ddbaf07f657e3487f52786ff7a8f3a55d3a1 Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marekpasnikowski@protonmail.com>
Date: Thu, 3 Nov 2022 19:34:03 +0100
Subject: Fix Emacs geiser configuration

---
 emacs.el                 | 13 +++++--------
 home-configuration.scm   |  5 ++++-
 system-configuration.scm |  3 +--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/emacs.el b/emacs.el
index 1ce49d0..88c754a 100644
--- a/emacs.el
+++ b/emacs.el
@@ -38,9 +38,11 @@
 	  'ac-geiser-setup)
 (add-hook 'geiser-repl-mode-hook
 	  'ac-geiser-setup)
-(eval-after-load "auto-complete"
-  '(add-to-list 'ac-modes
-		'geiser-repl-mode))
+(with-eval-after-load 'auto-complete
+  (add-to-list 'ac-modes
+	       'geiser-repl-mode-hook))
+(with-eval-after-load 'geiser-guile
+  (add-to-list 'geiser-guile-load-path "~/src/aisaka"))
 
 ;; Edit the code based on the S-expression structure
 (require 'paredit)
@@ -96,8 +98,3 @@
 ;; Enable the column-80 line
 (global-display-fill-column-indicator-mode 1)
 (setq-default display-fill-column-indicator-column 79)
-
-;;; Import GUIX repository
-;;; https://guix.gnu.org/manual/en/html_node/The-Perfect-Setup.html
-(with-eval-after-load 'geiser-guile
-  (add-to-list 'geiser-guile-load-path "~/src/aisaka"))
diff --git a/home-configuration.scm b/home-configuration.scm
index 78cac4c..b0db84c 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -13,11 +13,12 @@
 (define home-packages
   '("cpupower"
     "dconf-editor"
-    "emacs-no-x"
+    "emacs"
     "emacs-ac-geiser"
     "emacs-aggressive-indent"
     "emacs-geiser"
     "emacs-geiser-guile"
+    "emacs-guix"
     "emacs-iedit"
     "emacs-multiple-cursors"
     "emacs-paredit"
@@ -27,6 +28,8 @@
     "gnome-shell-extension-forge"
     "gnome-tweaks"
     "gnupg"
+    "guile"
+    "guile-spec"
     "icecat"
     "jami"
     "libreoffice"
diff --git a/system-configuration.scm b/system-configuration.scm
index ad248d2..1b9099e 100644
--- a/system-configuration.scm
+++ b/system-configuration.scm
@@ -53,8 +53,7 @@
 	   specification->package+output))
 
 (define system-packages
-  '("guile-spec"
-    "netcat-openbsd"
+  '("netcat-openbsd"
     "nss-certs"
     "trezord"
     "trezord-udev-rules"))
-- 
cgit v1.2.3