diff --git a/config.scm b/config.scm index a24132e..5d970bc 100644 --- a/config.scm +++ b/config.scm @@ -1,18 +1,12 @@ (use-modules (gnu) + (gnu packages) (gnu packages shells) (guix profiles) (guix packages) (srfi srfi-1)) (use-service-modules desktop docker networking ssh xorg) -(define (manifest->packages manifest) - "Return the list of packages in MANIFEST." - (filter-map (lambda (entry) - (let ((item (manifest-entry-item entry))) - (if (package? item) item #f))) - (manifest-entries manifest))) - (operating-system (locale "en_CA.utf8") (timezone "America/Toronto") @@ -52,26 +46,25 @@ %base-user-accounts)) (packages - (append - (manifest->packages - (specifications->manifest - '("docker" - "docker-cli" - "docker-compose" - "ratpoison" - "nss-certs" - "xterm" - "recutils" - "emacs" - "emacs-guix" - "emacs-exwm" - "graphviz" - "iptables" - "tmux" - "xterm" - "xrandr" - "xsetroot"))) - %base-packages)) + (append + (map specification->package + '("docker" + "docker-cli" + "docker-compose" + "ratpoison" + "nss-certs" + "xterm" + "recutils" + "emacs" + "emacs-guix" + "emacs-exwm" + "graphviz" + "iptables" + "tmux" + "xterm" + "xrandr" + "xsetroot")) + %base-packages)) (services (cons* (service docker-service-type) (service iptables-service-type