Reordered home configuration to section host-specific services.

1 files changed, 24 insertions, 23 deletions

diff --git a/.config/guix-builds/bdunahu-config.scm b/.config/guix-builds/bdunahu.scm
index db3f443..65e5886 100644
--- a/.config/guix-builds/bdunahu-config.scm
+++ b/.config/guix-builds/bdunahu.scm
@@ -1,10 +1,8 @@
-;; This "home-environment" file can be passed to 'guix home reconfigure'
-;; to reproduce the content of your profile.  This is "symbolic": it only
-;; specifies package names.  To reproduce the exact same profile, you also
-;; need to capture the channels being used, as returned by "guix describe".
-;; See the "Replicating Guix" section in the manual.
+;; add this directory to the load path.
+(add-to-load-path (dirname (current-filename)))
 
-(use-modules (gnu home)
+(use-modules (host-instance)
+             (gnu home)
              (gnu packages)
              (gnu packages gnupg)
              (gnu services)
@@ -18,8 +16,8 @@
              (gnu home services ssh))
 
 (home-environment
- ;; Below is the list of packages that will show up in your
- ;; Home profile, under ~/.guix-home/profile.
+ ;; List of packages that will show up
+ ;; under ~/.guix-home/profile.
  (packages (specifications->packages (list "aspell"
                                            "aspell-dict-en"
                                            ;; "dmenu"
@@ -39,7 +37,6 @@
                                            "flameshot"
                                            "gimp"
                                            "gnupg"
-                                           ;; "htop"
                                            "icecat"
                                            "libnotify"
                                            ;; "mpc"
@@ -84,11 +81,6 @@
                   (bashrc (list (local-file
                                  "/home/bdunahu/.config/guix-builds//.bashrc"
                                  "bashrc")))))
-        (service home-batsignal-service-type
-                 (home-batsignal-configuration
-                  (warning-level 35)
-                  (critical-level 15)
-                  (danger-level 5)))
         (service home-openssh-service-type
                  (home-openssh-configuration
                   (hosts
@@ -101,17 +93,26 @@
                          (openssh-host (name "perch")
                                        (host-name "perch.cs.colostate.edu")
                                        (user "bdunahu"))))))
-        (service home-xmodmap-service-type
-                 (home-xmodmap-configuration
-                  (key-map '(("remove Lock" . "Caps_Lock")
-                             ("remove Control" . "Control_L")
-                             ("keysym Control_L" ."Caps_Lock")
-                             ("keysym Caps_Lock" . "Control_L")
-                             ("add Lock" . "Caps_Lock")
-                             ("add Control" . "Control_L")))))
         (service home-gpg-agent-service-type
                  (home-gpg-agent-configuration
                   (pinentry-program
                    (file-append pinentry-emacs "/bin/pinentry-emacs"))
                   (ssh-support? #t)))
-        (service home-shepherd-service-type))))
+        (service home-shepherd-service-type)
+
+
+        (if (equal? host-name "vali")
+            (service home-batsignal-service-type
+                     (home-batsignal-configuration
+                      (warning-level 35)
+                      (critical-level 15)
+                      (danger-level 5)))
+            (service home-xmodmap-service-type
+                     (home-xmodmap-configuration
+                      (key-map '(("remove Lock" . "Caps_Lock")
+                                 ("remove Control" . "Control_L")
+                                 ("keysym Control_L" ."Caps_Lock")
+                                 ("keysym Caps_Lock" . "Control_L")
+                                 ("add Lock" . "Caps_Lock")
+                                 ("add Control" . "Control_L"))))))
+        )))