Setup namespaced modules

7 files changed, 16 insertions, 16 deletions

diff --git a/.config/guix/hati.scm b/.config/guix/hati.scm
index f714c54..a9b1e03 100644
--- a/.config/guix/hati.scm
+++ b/.config/guix/hati.scm
@@ -4,8 +4,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (hati)
-  #:use-module (base)
-  #:use-module (desktop)
   #:use-module (gnu)
   #:use-module (gnu home)
   #:use-module (gnu home services)
@@ -15,8 +13,10 @@
   #:use-module (gnu services)
   #:use-module (gnu services guix)
   #:use-module (guix gexp)
-  #:use-module (mpd)
-  #:use-module (ymir))
+  #:use-module (modules base)
+  #:use-module (modules desktop)
+  #:use-module (modules mpd)
+  #:use-module (modules ymir))
 
 
 (define home
diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm
index 4ebbc8c..7f35e44 100644
--- a/.config/guix/modules/base.scm
+++ b/.config/guix/modules/base.scm
@@ -5,7 +5,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(define-module (base)
+(define-module (modules base)
   #:use-module (gnu)
   #:use-module (gnu home services)
   #:use-module (gnu home services dict)
@@ -14,9 +14,9 @@
   #:use-module (gnu home services shepherd)
   #:use-module (gnu home services ssh)
   #:use-module (gnu home services xdg)
-  #:use-module (emacs)
   #:use-module (gnu system)
   #:use-module (guix gexp)
+  #:use-module (modules emacs)
   #:export (bd-base-system-packages
             bd-base-system-services
             bd-base-home-services))
@@ -97,7 +97,7 @@
             (home-bash-configuration
              (aliases '(("cp" . "cp -i")
                         ("grep" . "grep --color=auto")
-                        ("guix-rcfg" . "sudo guix system -L ${HOME}/.config/guix/modules/ reconfigure ${HOME}/.config/guix/${HOSTNAME}.scm")
+                        ("guix-rcfg" . "sudo guix system -L ${HOME}/.config/guix/ reconfigure ${HOME}/.config/guix/${HOSTNAME}.scm")
                         ("ll" . "ls -l")
                         ("ls" . "ls -p --color=auto")
                         ("mkd" . "mkdir -pv")
diff --git a/.config/guix/modules/desktop.scm b/.config/guix/modules/desktop.scm
index 55a78df..de07aa2 100644
--- a/.config/guix/modules/desktop.scm
+++ b/.config/guix/modules/desktop.scm
@@ -4,7 +4,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(define-module (desktop)
+(define-module (modules desktop)
   #:use-module (gnu)
   #:use-module (gnu home services)
   #:use-module (gnu home services desktop)
diff --git a/.config/guix/modules/emacs.scm b/.config/guix/modules/emacs.scm
index 40890b5..b78c2d5 100644
--- a/.config/guix/modules/emacs.scm
+++ b/.config/guix/modules/emacs.scm
@@ -7,7 +7,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(define-module (emacs)
+(define-module (modules emacs)
   #:use-module (gnu)
   #:use-module (gnu home services)
   #:use-module (gnu services)
diff --git a/.config/guix/modules/mpd.scm b/.config/guix/modules/mpd.scm
index 45f8b76..9a4e5a0 100644
--- a/.config/guix/modules/mpd.scm
+++ b/.config/guix/modules/mpd.scm
@@ -1,8 +1,8 @@
-(define-module (mpd)
+(define-module (modules mpd)
   #:use-module (gnu packages mpd)
   #:use-module (gnu services)
   #:use-module (gnu services audio)
-  #:use-module (ymir)
+  #:use-module (modules ymir)
   #:export (bd-mpd-package
             bd-mpd-service))
 
diff --git a/.config/guix/modules/ymir.scm b/.config/guix/modules/ymir.scm
index a46e2da..ecc3c7e 100644
--- a/.config/guix/modules/ymir.scm
+++ b/.config/guix/modules/ymir.scm
@@ -3,7 +3,7 @@
 ;; services for both of my machines.         ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (ymir)
+(define-module (modules ymir)
   #:use-module (gnu)
   #:use-module (gnu services desktop)
   #:use-module (gnu system)
diff --git a/.config/guix/vali.scm b/.config/guix/vali.scm
index 5cadbcc..517c199 100644
--- a/.config/guix/vali.scm
+++ b/.config/guix/vali.scm
@@ -4,8 +4,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (vali)
-  #:use-module (base)
-  #:use-module (desktop)
   #:use-module (gnu)
   #:use-module (gnu home)
   #:use-module (gnu home services)
@@ -15,8 +13,10 @@
   #:use-module (gnu services)
   #:use-module (gnu services guix)
   #:use-module (guix gexp)
-  #:use-module (mpd)
-  #:use-module (ymir))
+  #:use-module (modules base)
+  #:use-module (modules desktop)
+  #:use-module (modules mpd)
+  #:use-module (modules ymir))
 
 
 (define home