From 8fd3afe58b41fd6fa635a0c2fd2e455527f0e437 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Thu, 5 Dec 2019 11:51:01 +0100
Subject: [PATCH] Guix: Move font-dejavu to Emacs profile.

---
 .config/fontconfig/fonts.conf            |  6 ++++++
 .package-lists/guix-default-channels.scm |  6 +++---
 .package-lists/guix-default-manifest.scm |  3 +--
 .package-lists/guix-emacs-channels.scm   | 25 ++++++++++++++++++++++++
 .package-lists/guix-emacs-manifest.scm   |  1 +
 5 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 .config/fontconfig/fonts.conf
 create mode 100644 .package-lists/guix-emacs-channels.scm

diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf
new file mode 100644
index 00000000..5a0d7030
--- /dev/null
+++ b/.config/fontconfig/fonts.conf
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/fonts.conf file to configure system font access -->
+<fontconfig>
+<dir>~/.guix-extra-profiles/emacs/emacs/share/fonts</dir>
+</fontconfig>
diff --git a/.package-lists/guix-default-channels.scm b/.package-lists/guix-default-channels.scm
index fad0de07..2d976799 100644
--- a/.package-lists/guix-default-channels.scm
+++ b/.package-lists/guix-default-channels.scm
@@ -2,12 +2,12 @@
         (name 'nonguix)
         (url "https://gitlab.com/nonguix/nonguix.git")
         (commit
-          "2146063dc1eeb88cee3fb644ddd42a3ecf0e624c"))
+          "8624048c592bea418a5e3c79b89d7dd43e641f4e"))
       (channel
         (name 'guix-gaming-games)
         (url "https://gitlab.com/guix-gaming-channels/games.git")
         (commit
-          "d20502ca6ee2c34454879ef4a67f4ba85cc9c911"))
+          "1c1594ab7f6728656e004cab9f81b0a854592527"))
       (channel
         (name 'guix-gaming-duke-nukem-3d)
         (url "https://gitlab.com/guix-gaming-channels/duke-nukem-3d.git")
@@ -22,4 +22,4 @@
         (name 'guix)
         (url "https://git.savannah.gnu.org/git/guix.git")
         (commit
-          "2ffae2689aef8efb325f97ec54abcdeee8588aa0")))
+          "29e621a0134841705c007917e9a107013c8b0adb")))
diff --git a/.package-lists/guix-default-manifest.scm b/.package-lists/guix-default-manifest.scm
index 5385bf33..664a1e42 100644
--- a/.package-lists/guix-default-manifest.scm
+++ b/.package-lists/guix-default-manifest.scm
@@ -2,5 +2,4 @@
   '("aspell"
     "aspell-dict-de" ; TODO: Keep dicts in default profile until bug #29686 is fixed.
     "aspell-dict-en"
-    "aspell-dict-fr"
-    "font-dejavu"))
+    "aspell-dict-fr"))
diff --git a/.package-lists/guix-emacs-channels.scm b/.package-lists/guix-emacs-channels.scm
new file mode 100644
index 00000000..2d976799
--- /dev/null
+++ b/.package-lists/guix-emacs-channels.scm
@@ -0,0 +1,25 @@
+(list (channel
+        (name 'nonguix)
+        (url "https://gitlab.com/nonguix/nonguix.git")
+        (commit
+          "8624048c592bea418a5e3c79b89d7dd43e641f4e"))
+      (channel
+        (name 'guix-gaming-games)
+        (url "https://gitlab.com/guix-gaming-channels/games.git")
+        (commit
+          "1c1594ab7f6728656e004cab9f81b0a854592527"))
+      (channel
+        (name 'guix-gaming-duke-nukem-3d)
+        (url "https://gitlab.com/guix-gaming-channels/duke-nukem-3d.git")
+        (commit
+          "ab13db32b35c4eb043a0f8d66b47c700373ff2a8"))
+      (channel
+        (name 'guix-gaming-quake-3)
+        (url "https://gitlab.com/guix-gaming-channels/quake-3.git")
+        (commit
+          "25135247e5b3bef70f43c50692177f024b09512b"))
+      (channel
+        (name 'guix)
+        (url "https://git.savannah.gnu.org/git/guix.git")
+        (commit
+          "29e621a0134841705c007917e9a107013c8b0adb")))
diff --git a/.package-lists/guix-emacs-manifest.scm b/.package-lists/guix-emacs-manifest.scm
index 27e60dac..c1b6e461 100644
--- a/.package-lists/guix-emacs-manifest.scm
+++ b/.package-lists/guix-emacs-manifest.scm
@@ -103,5 +103,6 @@
     "emacs-yasnippet"
     "emacs-youtube-dl"
     "emacs-ztree"
+    "font-dejavu"
     "notmuch"
     "pinentry-emacs"))