system.scm: Remove unused variables and functions

1 files changed, 23 insertions, 68 deletions

diff --git a/src/guix/system.scm b/src/guix/system.scm
index 31900f1..b50e9af 100644
--- a/src/guix/system.scm
+++ b/src/guix/system.scm
@@ -38,77 +38,32 @@
 
 (define (path s)
   ;; src/guix/system.scm + ../../../ = ./
-  (string-append (dirname (dirname (dirname (current-filename)))) "/" s))
+  (pkg:str (dirname (dirname (dirname (current-filename)))) "/" s))
 
 (define +users+
   `(("andreh" "EuAndreh" ("wheel") ,(path "src/keys/SSH/andreh.pub.txt"))))
 
 
-(define working-dir
-  (dirname (dirname (dirname (current-filename)))))
 
-
-(define (str . rest)
-  (apply string-append rest))
-
-(define (fmt . rest)
-  (apply format #f rest))
-
-(define (path s)
-  (str working-dir "/" s))
-
-(define (slurp s)
-  (call-with-input-file
-   s
-   textual-ports:get-string-all))
-
-(define (file s)
-  (slurp (path s)))
-
-(define (script name content)
-  (package
-    (name name)
-    (version "latest")
-    (source #f)
-    (build-system trivial-build-system)
-    (arguments
-      (list
-       #:modules '((guix build utils))
-       #:builder
-       #~(begin
-           (use-modules (guix build utils))
-           (let* ((bin  (string-append %output "/bin"))
-                  (prog (string-append bin "/" #$name)))
-             (mkdir-p bin)
-             (call-with-output-file prog
-              (lambda (port)
-                (display #$content port)))
-             (chmod prog #o755)))))
-    (home-page #f)
-    (synopsis #f)
-    (description #f)
-    (license #f)))
-
-
-(define ns (fmt "ns1.~a." tld))
-(define mail (fmt "hostmaster.~a." tld))
+(define ns (pkg:fmt "ns1.~a." tld))
+(define mail (pkg:fmt "hostmaster.~a." tld))
 (define dkim-selector "dkimproxyout")
 (define dkim-public-key-path "/var/lib/dkimproxyout/public.key")
 
-(define dkim-name (str dkim-selector "._domainkey"))
+(define dkim-name (pkg:str dkim-selector "._domainkey"))
 (define dkim-public-key
   (if (file-exists? dkim-public-key-path)
     (string-join (reverse
                   (cdr
                    (reverse
                     (cdr
-                     (string-split (slurp dkim-public-key-path)
+                     (string-split (pkg:slurp dkim-public-key-path)
                                    #\newline)))))
                  "")
     "stub-public-key-for-building"))
 
 (define ipv4-reverse-domain
-  (str
+  (pkg:str
    (string-join (reverse
                  (string-split ipv4
                                #\.))
@@ -116,17 +71,17 @@
    ".in-addr.arpa"))
 
 (define ipv6-reverse-domain
-  (str
+  (pkg:str
    (string-join (reverse
-                 (map (lambda (s) (fmt "~a" s))
+                 (map (lambda (s) (pkg:fmt "~a" s))
                       (string->list
                        (string-delete #\: ipv6))))
                 ".")
    ".ip6.arpa"))
 
 (define-zone-entries tld-zone
-  ("@"         ""   "IN"   "NS"    (fmt "ns1.~a." tld))
-  ("@"         ""   "IN"   "NS"    (fmt "ns2.~a." tld))
+  ("@"         ""   "IN"   "NS"    (pkg:fmt "ns1.~a." tld))
+  ("@"         ""   "IN"   "NS"    (pkg:fmt "ns2.~a." tld))
   ("ns1"       ""   "IN"   "A"     ipv4)
   ("ns1"       ""   "IN"   "AAAA"  ipv6)
   ("ns2"       ""   "IN"   "A"     ipv4)
@@ -142,20 +97,20 @@
   ("mta-sts"   ""   "IN"   "A"     ipv4)
   ("mta-sts"   ""   "IN"   "AAAA"  ipv6)
   ("_mta-sts"  ""   "IN"   "TXT"   "\"v=STSv1; id=20230314\"")
-  ("@"         ""   "IN"   "MX"    (fmt "10 ~a." tld))
+  ("@"         ""   "IN"   "MX"    (pkg:fmt "10 ~a." tld))
   ("_dmarc"    ""   "IN"   "TXT"   "\"v=DMARC1; p=quarantine\"")
-  ("@"         ""   "IN"   "TXT"   (fmt "\"v=spf1 a:~a -all\"" tld))
-  (dkim-name   ""   "IN"   "TXT"   (fmt "\"v=DKIM1; k=rsa; t=s; p=~a\"" dkim-public-key)))
+  ("@"         ""   "IN"   "TXT"   (pkg:fmt "\"v=spf1 a:~a -all\"" tld))
+  (dkim-name   ""   "IN"   "TXT"   (pkg:fmt "\"v=DKIM1; k=rsa; t=s; p=~a\"" dkim-public-key)))
 
 (define-zone-entries ipv4-reverse-domain-zone
-  ("@"         ""   "IN"   "PTR"   (str tld "."))
-  ("@"         ""   "IN"   "NS"    (fmt "ns1.~a." tld))
-  ("@"         ""   "IN"   "NS"    (fmt "ns2.~a." tld)))
+  ("@"         ""   "IN"   "PTR"   (pkg:str tld "."))
+  ("@"         ""   "IN"   "NS"    (pkg:fmt "ns1.~a." tld))
+  ("@"         ""   "IN"   "NS"    (pkg:fmt "ns2.~a." tld)))
 
 (define-zone-entries ipv6-reverse-domain-zone
-  ("@"         ""   "IN"   "PTR"   (str tld "."))
-  ("@"         ""   "IN"   "NS"    (fmt "ns1.~a." tld))
-  ("@"         ""   "IN"   "NS"    (fmt "ns2.~a." tld)))
+  ("@"         ""   "IN"   "PTR"   (pkg:str tld "."))
+  ("@"         ""   "IN"   "NS"    (pkg:fmt "ns1.~a." tld))
+  ("@"         ""   "IN"   "NS"    (pkg:fmt "ns2.~a." tld)))
 
 (define zones
   (list
@@ -234,8 +189,8 @@
             (list #$(git-command config)
                   "daemon" "--syslog" "--reuseaddr"
                   #$@(pkg:mklist (and export-all? "--export-all"))
-                  #$@(pkg:mklist (and base-path (string-append "--base-path=" base-path)))
-                  #$@(pkg:mklist (and user-path (string-append "--user-path=" user-path))))
+                  #$@(pkg:mklist (and base-path (pkg:str "--base-path=" base-path)))
+                  #$@(pkg:mklist (and user-path (pkg:str "--user-path=" user-path))))
             #:user  #$user
             #:group #$group))
        (stop #~(make-kill-destructor SIGKILL))
@@ -307,8 +262,8 @@
                (server-name (list tld))
                (listen '("[::]:443 ssl http2" "443 ssl http2"))
                (root "/srv/www")
-               (ssl-certificate     (fmt "/etc/letsencrypt/live/~a/fullchain.pem" tld))
-               (ssl-certificate-key (fmt "/etc/letsencrypt/live/~a/privkey.pem"   tld))
+               (ssl-certificate     (pkg:fmt "/etc/letsencrypt/live/~a/fullchain.pem" tld))
+               (ssl-certificate-key (pkg:fmt "/etc/letsencrypt/live/~a/privkey.pem"   tld))
                (locations
                  (list
                   (nginx-location-configuration