summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenny Ballou <kballou@devnulllabs.io>2020-11-02 15:00:59 -0700
committerKenny Ballou <kballou@devnulllabs.io>2020-11-02 15:00:59 -0700
commite94c974523b50f448f9b91c9e92f59ff44f29a9f (patch)
treea54eafd80db080a2460d29b6d4097cc20533d85f
parentf769fe7cc36ac457cc0fba3f9655202a6a28ab41 (diff)
downloadcfg.nix-e94c974523b50f448f9b91c9e92f59ff44f29a9f.tar.gz
cfg.nix-e94c974523b50f448f9b91c9e92f59ff44f29a9f.tar.xz
fonts: install fonts into `fonts.fonts`
[0]: https://nixos.wiki/wiki/Fonts Signed-off-by: Kenny Ballou <kballou@devnulllabs.io>
-rw-r--r--overlays/00-fonts.nix17
-rw-r--r--system/fonts.nix15
-rw-r--r--system/packages.nix1
3 files changed, 15 insertions, 18 deletions
diff --git a/overlays/00-fonts.nix b/overlays/00-fonts.nix
deleted file mode 100644
index db577ef..0000000
--- a/overlays/00-fonts.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-self: super:
-{
- fonts-overlay = super.buildEnv {
- name = "fonts-overlay";
- ignoreCollisions = true;
- paths = [
- self.carlito
- self.dejavu_fonts
- self.ipafont
- self.kochi-substitute
- self.noto-fonts
- self.source-code-pro
- self.symbola
- self.ttf_bitstream_vera
- ];
- };
-}
diff --git a/system/fonts.nix b/system/fonts.nix
index 44c6b31..16c67b7 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -1,4 +1,19 @@
+{ pkgs, ... }:
{
+ fonts.fonts = with pkgs; [
+ carlito
+ dejavu_fonts
+ ipafont
+ kochi-substitute
+ liberation_ttf
+ noto-fonts
+ noto-fonts-cjk
+ noto-fonts-emoji
+ source-code-pro
+ symbola
+ ttf_bitstream_vera
+ ];
+
fonts.fontconfig.defaultFonts = {
monospace = [
"DejaVu Sans Mono"
diff --git a/system/packages.nix b/system/packages.nix
index 5078af1..b217512 100644
--- a/system/packages.nix
+++ b/system/packages.nix
@@ -24,7 +24,6 @@
ffmpeg
file
findutils
- fonts-overlay
fontconfig
fzf
gawk