Merge remote-tracking branch 'origin/master' into master

common-gui.nix

@@ -12,25 +12,32 @@
 
   fonts = {
     enableDefaultFonts = false;
+    fontconfig = {
+      allowBitmaps = false;
+    };
     fonts = with pkgs; [
       xorg.fontbhlucidatypewriter100dpi
       xorg.fontbhlucidatypewriter75dpi
-      dejavu_fonts
       freefont_ttf
       gyre-fonts # TrueType substitutes for standard PostScript fonts
       xorg.fontbh100dpi
       xorg.fontmiscmisc
       xorg.fontcursormisc
-      # unifont
+      unifont
 
       noto-fonts-emoji
       noto-fonts-cjk
 
       cantarell_fonts # from gnome3 module
 
+      merriweather
+      merriweather-sans
+      open-sans
+      # libertine # breaks 
+
+      dejavu_fonts
       liberation_ttf
       ubuntu_font_family
-      dejavu_fonts
 
       wqy_microhei
       ipafont
@@ -38,11 +45,6 @@
       source-han-serif
       source-han-sans
 
-      merriweather
-      merriweather-sans
-      open-sans
-      libertine
-
       inconsolata
       iosevka
       fira fira-mono fira-code