Rename "common" modules to be base modules

7 files changed, 21 insertions, 21 deletions

diff --git a/tw/home/common.scm b/tw/home.scm
index 17b00666..cc97308c 100644
--- a/tw/home/common.scm
+++ b/tw/home.scm
@@ -1,4 +1,4 @@
-(define-module (tw home common)
+(define-module (tw home)
   #:use-module (ice-9 string-fun)
   #:use-module (gnu)
   #:use-module (gnu home services)
@@ -7,7 +7,7 @@
   #:use-module (gnu home services ssh)
   #:use-module (guix gexp)
   #:use-module (tw packages shell)
-  #:use-module (tw system common))
+  #:use-module (tw system))
 
 (use-package-modules admin compression curl databases disk dns file finance
                      gnupg graphviz imagemagick less linux lisp maths
@@ -40,7 +40,7 @@
    (simple-service 'gnupg-config home-files-service-type
      `(;; GnuPG config files must be in ~/.local/share/gnupg, not ~/.config,
        ;; so we can't use `home-xdg-configuration-files-service-type'.
-       (".local/share/gnupg/gpg.conf" ,(local-file "files/gpg.conf"))
+       (".local/share/gnupg/gpg.conf" ,(local-file "home/files/gpg.conf"))
        (".local/share/gnupg/gpg-agent.conf"
         ,(mixed-text-file "gpg-agent.conf" "\
 pinentry-program " (if gui-pinentry?
@@ -71,21 +71,21 @@ auto-expand-secmem
   (list
    (service home-zsh-service-type
      (home-zsh-configuration
-      (zshrc (list (local-file "files/zshrc")
-                   (local-file "files/prompt.zsh")))))
+      (zshrc (list (local-file "home/files/zshrc")
+                   (local-file "home/files/prompt.zsh")))))
 
    (simple-service 'common-config home-xdg-configuration-files-service-type
-     `(("git/config" ,(local-file "files/gitconfig"))
-       ("htop/htoprc" ,(local-file "files/htoprc"))
-       ("lesskey" ,(local-file "files/lesskey"))
-       ("ranger/rc.conf" ,(local-file "files/ranger.conf"))
-       ("tmux/tmux.conf" ,(local-file "files/tmux.conf"))
+     `(("git/config" ,(local-file "home/files/gitconfig"))
+       ("htop/htoprc" ,(local-file "home/files/htoprc"))
+       ("lesskey" ,(local-file "home/files/lesskey"))
+       ("ranger/rc.conf" ,(local-file "home/files/ranger.conf"))
+       ("tmux/tmux.conf" ,(local-file "home/files/tmux.conf"))
        ("user-dirs.locale" ,(plain-file "user-dirs.locale" "C"))  ; Not sure if this is needed. Arch has it.
-       ("user-dirs.dirs" ,(local-file "files/user-dirs.dirs"))))
+       ("user-dirs.dirs" ,(local-file "home/files/user-dirs.dirs"))))
 
    (simple-service 'common-scripts home-files-service-type
      ;; With #:recursive? #t, Guix keeps the files' permission bits, i.e. makes them executable.
-     `((".local/bin/ppscm" ,(local-file "files/ppscm" #:recursive? #t))))  ; pretty-print scheme files
+     `((".local/bin/ppscm" ,(local-file "home/files/ppscm" #:recursive? #t))))  ; pretty-print scheme files
 
    (simple-service 'common-environment home-environment-variables-service-type
      `(;; Path to my own package definitions. If invoking `guix home'
diff --git a/tw/home/lap.scm b/tw/home/lap.scm
index 68b9f2d3..424d64a8 100644
--- a/tw/home/lap.scm
+++ b/tw/home/lap.scm
@@ -24,7 +24,7 @@
   #:use-module (guix gexp)
   #:use-module ((nongnu packages messaging)
                 #:select (signal-desktop zoom))
-  #:use-module (tw home common)
+  #:use-module (tw home)
   #:use-module (tw home emacs)
   #:use-module (tw packages alice)
   #:use-module (tw packages catppuccin)
diff --git a/tw/home/lud.scm b/tw/home/server.scm
index 44cd0c2b..95d860e5 100644
--- a/tw/home/lud.scm
+++ b/tw/home/server.scm
@@ -1,6 +1,6 @@
 (define-module (tw home lud)
   #:use-module (gnu home)
-  #:use-module (tw home common)
+  #:use-module (tw home)
   #:use-module (tw home emacs))
 
 (home-environment
diff --git a/tw/system/common.scm b/tw/system.scm
index 1eb48c52..8734885b 100644
--- a/tw/system/common.scm
+++ b/tw/system.scm
@@ -1,4 +1,4 @@
-(define-module (tw system common)
+(define-module (tw system)
   #:use-module (ice-9 format)
   #:use-module (ice-9 regex)
   #:use-module (ice-9 string-fun)
@@ -39,7 +39,7 @@
                ;; See: '(guix)Invoking guix deploy' info node.
                "guixdeploy ALL = NOPASSWD: ALL\n")))
 
-;; This is used for the servers, and also by (tw home common) to generate the
+;; This is used for the servers, and also by (tw home) to generate the
 ;; appropriate ~/.ssh/config.
 (define-public %ssh-ports
   '(("lud.twilken.net" . 22022)
@@ -57,8 +57,8 @@
       (accepted-environment '("LANG" "LC_*"))
       (authorized-keys
        `(("timo"
-          ,(local-file "files/timo.pub")
-          ,(local-file "files/timo-phone-gpg.pub"))))))
+          ,(local-file "system/files/timo.pub")
+          ,(local-file "system/files/timo-phone-gpg.pub"))))))
 
    ;; Prometheus node exporter
    (service prometheus-node-exporter-service-type
diff --git a/tw/system/lap.scm b/tw/system/lap.scm
index 29d59843..de879e9e 100644
--- a/tw/system/lap.scm
+++ b/tw/system/lap.scm
@@ -17,7 +17,7 @@
   #:use-module (nongnu packages scanner)
   #:use-module (nongnu system linux-initrd)
   #:use-module (nonguix licenses)
-  #:use-module (tw system common))
+  #:use-module (tw system))
 
 (use-package-modules android certs cups disk docker file-systems gnome
                      kerberos linux mtools pulseaudio search shells wm xorg)
diff --git a/tw/system/lud.scm b/tw/system/lud.scm
index 0e32305b..f4827f8a 100644
--- a/tw/system/lud.scm
+++ b/tw/system/lud.scm
@@ -5,7 +5,7 @@
   #:use-module (gnu system nss)
   #:use-module (guix gexp)
   #:use-module (tw packages php)
-  #:use-module (tw system common))
+  #:use-module (tw system))
 
 (use-package-modules admin bash certs databases linux man php python rsync
                      shells tor video)
diff --git a/tw/system/vin.scm b/tw/system/vin.scm
index b6275b5a..3a5a6b62 100644
--- a/tw/system/vin.scm
+++ b/tw/system/vin.scm
@@ -4,7 +4,7 @@
   #:use-module (gnu system locale)
   #:use-module (gnu system nss)
   #:use-module (guix gexp)
-  #:use-module (tw system common))
+  #:use-module (tw system))
 
 ;; The device's BIOS does not support UEFI, sadly.  It also doesn't recognise
 ;; NVME devices, so we can only use SATA hard disks, not the M.2 SSD.