Fix conflict

Justfile

@@ -1,5 +1,5 @@
 default:
-    guix time-machine --channels=./channels.scm.lock -- shell --container --emulate-fhs --manifest=./manifest.scm -- sh -c "mkdir -p ./out && pdflatex -output-directory=./out ./src/document.tex"
+    guix time-machine --channels=./channels.scm.lock -- shell --container --emulate-fhs --manifest=./manifest.scm -- sh -c "mkdir -p ./out && lualatex -output-directory=./out ./src/document.tex"
 
 dev:
     guix time-machine --channels=./channels.scm.lock -- shell --manifest=./manifest.scm

channels.scm

@@ -6,4 +6,22 @@
           (make-channel-introduction
             "9edb3f66fd807b096b48283debdcddccfea34bad"
             (openpgp-fingerprint
-             "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA")))))
+             "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA"))))
+      (channel
+       (name 'kbg)
+       (url "https://git.sr.ht/~kennyballou/guix-channel")
+       (branch "master")
+       (introduction
+	(make-channel-introduction
+	 "b9d0b8041d28ebd9f85cb041aa3f2235c8b39417"
+	 (openpgp-fingerprint
+          "10F4 14AB D526 0D0E 2372  8C08 FE55 890B 57AE DCE5"))))
+      (channel
+       (name 'saayix)
+       (url "https://codeberg.org/look/saayix")
+       (branch "main")
+       (introduction
+	(make-channel-introduction
+	 "12540f593092e9a177eb8a974a57bb4892327752"
+	 (openpgp-fingerprint
+          "3FFA 7335 973E 0A49 47FC  0A8C 38D5 96BE 07D3 34AB")))))

manifest.scm

@@ -2,4 +2,4 @@
 (use-modules (template-package)
 	     (gnu packages tex))
 
-(packages->manifest (list texlive-scheme-basic texlive-cm-super texlive-hyperref texlive-pgf texlive-etoolbox texlive-geometry coreutils))
+(packages->manifest (list texlive-scheme-basic texlive-cm-super texlive-hyperref texlive-etoolbox texlive-pgf texlive-geometry coreutils ltex-ls texlab))