l: use hack fonts everywhere

4 files changed, 26 insertions, 9 deletions

diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix
index d9ecd7ae9..6db6f8fd1 100644
--- a/lass/1systems/helios/config.nix
+++ b/lass/1systems/helios/config.nix
@@ -45,7 +45,9 @@ with import <stockholm/lib>;
     {
       services.xserver.dpi = 200;
       fonts.fontconfig.dpi = 200;
-      lass.myFont = "-schumacher-clean-*-*-*-*-25-*-*-*-*-*-iso10646-1";
+      lass.fonts.regular = "xft:Hack-Regular:pixelsize=22,xft:Symbola";
+      lass.fonts.bold =    "xft:Hack-Bold:pixelsize=22,xft:Symbola";
+      lass.fonts.italic =  "xft:Hack-RegularOblique:pixelsize=22,xft:Symbol";
     }
     { #TAPIR, AGATIS, sentral, a3 - foo
       services.redis.enable = true;
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index f6390ce4d..9d4ad8c6a 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -28,9 +28,19 @@ in {
       '';
     }
     { #font magic
-      options.lass.myFont = mkOption {
-        type = types.str;
-        default = "-schumacher-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
+      options.lass.fonts = {
+        regular = mkOption {
+          type = types.str;
+          default = "xft:Hack-Regular:pixelsize=11,xft:Symbola";
+        };
+        bold = mkOption {
+          type = types.str;
+          default = "xft:Hack-Bold:pixelsize=11,xft:Symbola";
+        };
+        italic = mkOption {
+          type = types.str;
+          default = "xft:Hack-RegularOblique:pixelsize=11,xft:Symbol";
+        };
       };
     }
   ];
@@ -82,8 +92,11 @@ in {
     termite
   ];
 
-  fonts.fonts = [
-    pkgs.xlibs.fontschumachermisc
+  fonts.fonts = with pkgs; [
+    hack-font
+    hasklig
+    symbola
+    xlibs.fontschumachermisc
   ];
 
   services.xserver = {
diff --git a/lass/2configs/xresources.nix b/lass/2configs/xresources.nix
index adbcd353d..a3c54f3a1 100644
--- a/lass/2configs/xresources.nix
+++ b/lass/2configs/xresources.nix
@@ -8,8 +8,10 @@ let
     URxvt*scrollBar: false
     URxvt*urgentOnBell: true
     URxvt*SaveLines: 4096
-    URxvt*font: ${config.lass.myFont}
-    URxvt*boldFont: ${config.lass.myFont}
+
+    URxvt.font:       ${config.lass.fonts.regular}
+    URxvt.boldFont:   ${config.lass.fonts.bold}
+    URxvt.italicFont: ${config.lass.fonts.italic}
 
     ! ref https://github.com/muennich/urxvt-perls
     URxvt.perl-lib: ${pkgs.urxvt_perls}/lib/urxvt/perl
diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix
index b86ce358e..5d0cf0cab 100644
--- a/lass/5pkgs/xmonad-lass.nix
+++ b/lass/5pkgs/xmonad-lass.nix
@@ -52,7 +52,7 @@ urxvtcPath :: FilePath
 urxvtcPath = "${pkgs.rxvt_unicode}/bin/urxvtc"
 
 myFont :: String
-myFont = "${config.lass.myFont}"
+myFont = "${config.lass.fonts.regular}"
 
 main :: IO ()
 main = getArgs >>= \case