elenq: reorganize and style

2 files changed, 55 insertions, 46 deletions

diff --git a/elenq/documentation.scm b/elenq/documentation.scm
index ead697d..fd459f3 100644
--- a/elenq/documentation.scm
+++ b/elenq/documentation.scm
@@ -1,46 +1,26 @@
 (define-module (elenq documentation)
+  #:use-module (elenq graphics)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system copy)
-  #:use-module (guix build-system font)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix packages)
   #:use-module (gnu packages haskell-xyz))
 
-(define-public font-armata
-  (package
-    (name "font-armata")
-    (version "0.9.7")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/ekaitz-zarraga/font-armata/")
-               (commit (string-append "v" version))))
-        (file-name (git-file-name name version))
-        (sha256
-          (base32
-            "1pdlydanpay93pgkbpawii11j62m643pqkv6i6crvia198i9fnrd"))))
-    (build-system font-build-system)
-    (home-page "https://fontlibrary.org/en/font/armata")
-    (synopsis "Armata Font")
-    (description "Armata is a new Sans Serif font by Jasper @ Cannot Into Space
-Fonts. It is named after the new Russian T-14 Armata Main Battle Tank.")
-    (license license:silofl1.1)))
-
 (define-public pandoc-templates
   (let ((revision "1")
         (commit "39ad0e6cf9ed895b88041f8babe59506178a6fcb"))
     (package
       (name "pandoc-templates")
       (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "git://git.elenq.tech/pandoc-templates")
-                       (commit commit)))
-                (sha256
-                  (base32 "1z2p1dxlgivdgw79f74n2ax84xr8g0q62fsxpwag4dfdmik7131b"))))
+      (source
+        (origin
+          (method git-fetch)
+          (uri (git-reference
+                 (url "git://git.elenq.tech/pandoc-templates")
+                 (commit commit)))
+          (sha256
+            (base32 "1z2p1dxlgivdgw79f74n2ax84xr8g0q62fsxpwag4dfdmik7131b"))))
       (build-system copy-build-system)
       (arguments (list #:install-plan ''(("pandoc" "/share/pandoc"))))
       (native-search-paths
@@ -59,27 +39,28 @@ Technology's documents.")
         (commit "1cb21742a69f681e6452a7ddd0adc9543aefd72a"))
     (package
       (name "elenqdoc")
-      (version "1.0.0")
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "git://git.elenq.tech/elenqdoc")
-                       (commit commit)))
-                (sha256
-                  (base32 "0fdxskf3h14vdr9w5pi18svrz40p9qkbwcn4c4rp1b1azpbfsa6s"))))
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "git://git.elenq.tech/elenqdoc")
+               (commit commit)))
+         (sha256
+          (base32 "0fdxskf3h14vdr9w5pi18svrz40p9qkbwcn4c4rp1b1azpbfsa6s"))))
       (build-system copy-build-system)
       (inputs (list pandoc-templates))
       (propagated-inputs (list pandoc))
       (arguments
-        (list
-          #:install-plan ''(("elenqdoc" "/bin/elenqdoc"))
-          #:phases
-          #~(modify-phases %standard-phases
-              (add-after 'install 'wrap
-                (lambda _
-                  (wrap-program (string-append #$output "/bin/elenqdoc")
-                    `("ELENQDOC_DATADIR" =
-                      (,(string-append #$pandoc-templates "/share/pandoc/")))))))))
+       (list
+        #:install-plan ''(("elenqdoc" "/bin/elenqdoc"))
+        #:phases #~(modify-phases %standard-phases
+                     (add-after 'install 'wrap
+                       (lambda _
+                         (wrap-program (string-append #$output "/bin/elenqdoc")
+                           `("ELENQDOC_DATADIR" =
+                             (,(string-append #$pandoc-templates
+                                              "/share/pandoc/")))))))))
       (home-page "http://git.elenq.tech/")
       (synopsis "Simplified pandoc wrapper for ElenQ documents")
       (description "Provides `elenqdoc` command.")
diff --git a/elenq/graphics.scm b/elenq/graphics.scm
new file mode 100644
index 0000000..8153125
--- /dev/null
+++ b/elenq/graphics.scm
@@ -0,0 +1,28 @@
+(define-module (elenq graphics)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system font)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages))
+
+(define-public font-armata
+  (package
+    (name "font-armata")
+    (version "0.9.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ekaitz-zarraga/font-armata/")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1pdlydanpay93pgkbpawii11j62m643pqkv6i6crvia198i9fnrd"))))
+    (build-system font-build-system)
+    (home-page "https://fontlibrary.org/en/font/armata")
+    (synopsis "Armata Font")
+    (description
+     "Armata is a new Sans Serif font by Jasper @ Cannot Into Space
+Fonts. It is named after the new Russian T-14 Armata Main Battle Tank.")
+    (license license:silofl1.1)))
+