guix/config.scm: Remove unnecessary imports and refactor the imports. Add openntpd-service. Add (or: extend) special-files-service to include usr/bin/env and ksh. Add a couple more essential packages. Add berlin.guixsd.org as additional substitutes server.

Signed-off-by: Nils Gillmann <ng0@n0.is>

1 files changed, 35 insertions, 18 deletions

diff --git a/guix/config.scm b/guix/config.scm
index ca1769a..857fed1 100644
--- a/guix/config.scm
+++ b/guix/config.scm
@@ -1,27 +1,17 @@
 (use-modules 
  (srfi srfi-1)
  (gnu)
- (gnu services networking)
- (gnu services ssh)
- (gnu packages bootloaders)
- (gnu packages wget)
- (gnu packages base)
- (gnu packages certs)
- (gnu system nss)
- (gnu packages vim)
- (gnu packages cryptsetup))
-
-(use-package-modules certs screen text-editors tmux ssh)
+ (guix))
+(use-system-modules nss)
 (use-service-modules networking ssh version-control databases admin)
+(use-package-modules base bash shells)
 
 (operating-system
   (host-name "gv")
   (timezone "Europe/Paris")
   (locale "en_US.utf8")
   (initrd-modules (append (list "megaraid_sas")
-                          ;; FIXME: Is this dropped from Linux entirely
-                          ;; or is it a BUILT-IN now?
-                          ;; LTS of linux still has "shpchp"
+                                ;; "shpchp" is now a built-in)
                           %base-initrd-modules))
 
   (bootloader (bootloader-configuration
@@ -55,11 +45,14 @@
                        ;;  (type "ext4"))
                        %base-file-systems))
 
-  (packages (append (map specification->package '("nvi" "mg" "cryptsetup"
+  (packages (append (map specification->package '("mg" "cryptsetup"
                                                   "screen" "tmux" "wget"
-                                                  "vim" "openssh"
+                                                  "vim" "openssh" "openssl"
                                                   "postgresql" "certbot"
-                                                  "nss-certs"))
+                                                  "nss-certs"
+                                                  "curl" "gnutls-dane"
+                                                  "gitolite"
+                                                  "acme-client"))
                     %base-packages))
   (services (cons*
              (service static-networking-service-type
@@ -71,6 +64,16 @@
                         (gateway "147.87.255.209")
                         (name-servers '("8.8.8.8")))))
 
+             (service special-files-service-type
+                      ;; Using 'canonical-package' as bash and coreutils
+                      ;; canonical packages are already a part of
+                      ;; '%base-packages'.
+                      `(("/bin/sh" ,(file-append (canonical-package bash)
+                                                 "/bin/sh"))
+                        ("/usr/bin/env" ,(file-append (canonical-package coreutils)
+                                                      "/bin/env"))
+                        ("/bin/ksh" ,(file-append (canonical-package loksh)
+                                                  "/bin/ksh"))))
              (service openssh-service-type
                       (openssh-configuration
                        (x11-forwarding? #t)
@@ -83,7 +86,21 @@
              (git-daemon-service
               #:config (git-daemon-configuration
                         (user-path "git")))
-             %base-services))
+             (service openntpd-service-type
+                      (openntpd-configuration
+                       (listen-on '("127.0.0.1" "::1"))
+                       (sensor '("udcf0 correction 70000"))
+                       (constraint-from '("www.gnu.org"))
+                       (constraints-from '("https://www.google.com/"))
+                       (allow-large-adjustment? #t)))
+             (modify-services %base-services
+               (guix-service-type
+                config =>
+                (guix-configuration
+                 (inherit config)
+                 (substitute-urls
+                  (cons* "https://berlin.guixsd.org"
+                         %default-substitute-urls)))))))
              
   ;; Allow resolution of '.local' host names with mDNS.
   (name-service-switch %mdns-host-lookup-nss))