From 6c71969991ade981fd961a1b0873114470a4ff38 Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marekpasnikowski@protonmail.com>
Date: Mon, 31 Oct 2022 00:22:49 +0100
Subject: Home configuration: break out config-prefix home-bash-service

---
 home-configuration.scm | 111 ++++++++++++++++++++++++++-----------------------
 1 file changed, 58 insertions(+), 53 deletions(-)

diff --git a/home-configuration.scm b/home-configuration.scm
index 28793de..9d89c30 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -6,6 +6,36 @@
   #:use-module (gnu services)
   #:use-module (guix gexp))
 
+(define config-prefix
+  "/home/marek/src/guix-config/")
+
+(define home-bash-service
+  (service home-bash-service-type
+	   (home-bash-configuration (environment-variables '(("EDITOR" . "emacs")
+							     ("NVM_DIR" . "$HOME/src/nvm")
+							     ("GUILE_AUTO_COMPILE" . "0")))
+				    (aliases `(("grep" . "grep --color=auto")
+					       ("ll" . "ls -l")
+					       ("ls" . "ls -p --color=auto")
+					       ("pull-guix" . "guix pull")
+					       ("pull-guix-" . "pull-guix --allow-downgrades --disable-authentication")
+					       ("reconfigure-home" . (string-append "guix home reconfigure "
+										    ,config-prefix
+										    "home-configuration.scm"))
+					       ("reconfigure-home-" . "reconfigure-home --allow-downgrades")
+					       ("reconfigure-system" . (string-append "sudo guix system reconfigure "
+										      ,config-prefix
+										      "system-configuration.scm"))
+					       ("reconfigure-system-" . "reconfigure-system --allow-downgrades")
+					       ("system-update" . "pull-guix && reconfigure-system && reconfigure-home")
+					       ("system-update-" . "pull-guix- && reconfigure-system- && reconfigure-home-")))
+				    (bash-profile `(,(local-file (string-append config-prefix
+										".bash_profile")
+								 "bash_profile")))
+				    (bashrc `(,(local-file (string-append config-prefix
+									  ".bashrc")
+							   "bashrc"))))))
+
 (define home-files
   `((".config/guix/shell-authorized-directories" ,(local-file "g-sh-auth-dir"))
     (".emacs" ,(local-file "emacs.el"))
@@ -16,56 +46,31 @@
 		  home-files-service-type
 		  home-files))
 
-(let ([config-prefix "/home/marek/src/guix-config/"])
-  (home-environment (packages (map (compose list
-					    specification->package+output)
-				   '("cpupower"
-				     "dconf-editor"
-				     "emacs-no-x"
-				     "emacs-ac-geiser"
-				     "emacs-aggressive-indent"
-				     "emacs-geiser"
-				     "emacs-geiser-guile"
-				     "emacs-iedit"
-				     "emacs-multiple-cursors"
-				     "emacs-paredit"
-				     "font-google-noto"
-				     "git"
-				     "git-lfs"
-				     "gnome-tweaks"
-				     "gnupg"
-				     "icecat"
-				     "jami"
-				     "libreoffice"
-				     "pwgen"
-				     "seahorse"
-				     "sicp"
-				     "trezor-agent"
-				     "unzip"
-				     "zip")))
-		    (services `(,(service home-bash-service-type
-					  (home-bash-configuration (environment-variables '(("EDITOR" . "emacs")
-											    ("NVM_DIR" . "$HOME/src/nvm")
-											    ("GUILE_AUTO_COMPILE" . "0")))
-								   (aliases `(("grep" . "grep --color=auto")
-									      ("ll" . "ls -l")
-									      ("ls" . "ls -p --color=auto")
-									      ("pull-guix" . "guix pull")
-									      ("pull-guix-" . "pull-guix --allow-downgrades --disable-authentication")
-									      ("reconfigure-home" . (string-append "guix home reconfigure "
-														   ,config-prefix
-														   "home-configuration.scm"))
-									      ("reconfigure-home-" . "reconfigure-home --allow-downgrades")
-									      ("reconfigure-system" . (string-append "sudo guix system reconfigure "
-														     ,config-prefix
-														     "system-configuration.scm"))
-									      ("reconfigure-system-" . "reconfigure-system --allow-downgrades")
-									      ("system-update" . "pull-guix && reconfigure-system && reconfigure-home")
-									      ("system-update-" . "pull-guix- && reconfigure-system- && reconfigure-home-")))
-								   (bash-profile `(,(local-file (string-append config-prefix
-													       ".bash_profile")
-												"bash_profile")))
-								   (bashrc `(,(local-file (string-append config-prefix
-													 ".bashrc")
-											  "bashrc")))))
-				,dot-files-service))))
+(home-environment (packages (map (compose list
+					  specification->package+output)
+				 '("cpupower"
+				   "dconf-editor"
+				   "emacs-no-x"
+				   "emacs-ac-geiser"
+				   "emacs-aggressive-indent"
+				   "emacs-geiser"
+				   "emacs-geiser-guile"
+				   "emacs-iedit"
+				   "emacs-multiple-cursors"
+				   "emacs-paredit"
+				   "font-google-noto"
+				   "git"
+				   "git-lfs"
+				   "gnome-tweaks"
+				   "gnupg"
+				   "icecat"
+				   "jami"
+				   "libreoffice"
+				   "pwgen"
+				   "seahorse"
+				   "sicp"
+				   "trezor-agent"
+				   "unzip"
+				   "zip")))
+		  (services `(,home-bash-service
+			      ,dot-files-service)))
-- 
cgit v1.2.3