etc/guix/system.scm: Remove unused imports, use import macros

1 files changed, 31 insertions, 55 deletions

diff --git a/etc/guix/system.scm b/etc/guix/system.scm
index d95ceb3..14d215f 100644
--- a/etc/guix/system.scm
+++ b/etc/guix/system.scm
@@ -1,59 +1,35 @@
 (use-modules
-  (gnu)
-
-  (gnu packages cpio)
-  (gnu packages cups)
-  (gnu packages image)
-  (gnu packages package-management)
-
-  (gnu packages mail)
-  (gnu packages admin)
-  (guix download)
-  (guix build-system gnu)
   ((guix licenses) #:prefix license:)
-  (guix records)
-  (gnu services mail)
-  (gnu services shepherd)
-  (gnu system setuid)
-  (gnu packages dbm)
-  (gnu packages cyrus-sasl)
-  (gnu packages onc-rpc)
-  (gnu packages tls)
-  (gnu packages perl)
-  (gnu packages m4)
-  (guix utils)
-
-
-  ((nonguix licenses) #:prefix ng-license:)
-  ((xyz euandreh heredoc) #:prefix heredoc:)
+  ((nonguix licenses) #:prefix ng.license:)
+  ((nongnu packages linux) #:prefix ng.linux:)
+  ((nongnu system linux-initrd) #:prefix ng.initrd:)
   ((org euandre queue) #:prefix queue:)
-  (gnu bootloader)
-  (gnu bootloader grub)
-  (gnu packages)
-  (gnu services base)
-  (gnu services cups)
-  (gnu services desktop)
-  (gnu services docker)
-  (gnu services nix)
-  (gnu services pm)
-  (gnu services security-token)
-  (gnu services sound)
-  (gnu services ssh)
-  (gnu services virtualization)
-  (gnu services vpn)
-  (gnu services xorg)
-  (gnu system keyboard)
-  (gnu system file-systems)
+  ((xyz euandreh heredoc) #:prefix heredoc:)
+  (gnu)
   (gnu system locale)
-  (gnu system mapped-devices)
-  (guix gexp)
-  (guix packages)
-  (nongnu packages linux)
-  (nongnu system linux-initrd)
-  (srfi srfi-1))
-(heredoc:enable-syntax)
+  (guix build-system gnu)
+  (guix download)
+  (guix packages))
+(use-package-modules
+  cups
+  cpio
+  image
+  package-management)
 (use-service-modules
-  admin)
+  admin
+  cups
+  desktop
+  docker
+  mail
+  nix
+  pm
+  security-token
+  sound
+  ssh
+  virtualization
+  vpn
+  xorg)
+(heredoc:enable-syntax)
 
 
 ;; Implement wireless printing before sending upstream
@@ -110,14 +86,14 @@ System (CUPS) under Linux.  It supplies high quality printing with
 Seiko Epson Color Ink Jet Printers.")
     (home-page "https://www.openprinting.org/driver/epson-201401w")
     (license                  ;; SEIKO EPSON CORPORATION SOFTWARE LICENSE AGREEMENT
-      (list (ng-license:nonfree "https://epson.com/SoftwareLicenseAgreement")
+      (list (ng.license:nonfree "https://epson.com/SoftwareLicenseAgreement")
             license:lgpl2.1))))
 
 
 (operating-system
-  (kernel linux)
-  (initrd microcode-initrd)
-  (firmware (list linux-firmware))
+  (kernel ng.linux:linux)
+  (initrd ng.initrd:microcode-initrd)
+  (firmware (list ng.linux:linux-firmware))
   (locale "fr_FR.UTF-8")
   (locale-definitions
     (append