diff options
author | tv <tv@krebsco.de> | 2023-06-14 18:36:13 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2023-06-14 18:36:13 +0200 |
commit | f9e82b4ffc5db0c53556bf068ffc8859828163ef (patch) | |
tree | 6ea55d0492ebb9458fec210c1ec59030e15c3187 /lass/2configs/baseX.nix | |
parent | e1ec606542ba602f8ebd95fe961a68aa70c012e4 (diff) | |
parent | ccf29b838bb6865f940597a1bd6e6cb4f3522b0c (diff) |
Merge remote-tracking branch 'orange/master'
Diffstat (limited to 'lass/2configs/baseX.nix')
-rw-r--r-- | lass/2configs/baseX.nix | 65 |
1 files changed, 5 insertions, 60 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 79777429..bb01d3dc 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -14,6 +14,7 @@ in { ./tmux.nix ./xmonad.nix ./themes.nix + ./fonts.nix { users.users.mainUser.packages = [ pkgs.sshuttle @@ -26,15 +27,15 @@ in { options.lass.fonts = { regular = mkOption { type = types.str; - default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1"; + default = "xft:Iosevka Term SS15:style=regular"; }; bold = mkOption { type = types.str; - default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1"; + default = "xft:Iosevka Term SS15:style=bold"; }; italic = mkOption { type = types.str; - default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1"; + default = "xft:Iosevka Term SS15:style=italic"; }; }; config.krebs.xresources.resources.X = '' @@ -98,64 +99,8 @@ in { ${pkgs.flameshot}/bin/flameshot gui ${pkgs.klem}/bin/klem '') - ]; - - fonts = { - fontDir.enable = true; - enableGhostscriptFonts = true; - - fonts = with pkgs; [ - xorg.fontschumachermisc - inconsolata - noto-fonts - (iosevka.override { - # https://typeof.net/Iosevka/customizer - privateBuildPlan = { - family = "Iosevka"; - spacing = "term"; - serifs = "slab"; - no-ligation = true; - - variants.design = { - capital-j = "serifless"; - a = "double-storey-tailed"; - b = "toothless-corner"; - d = "toothless-corner-serifless"; - f = "flat-hook-tailed"; - g = "earless-corner"; - i = "hooky"; - j = "serifless"; - l = "tailed"; - m = "earless-corner-double-arch"; - n = "earless-corner-straight"; - p = "earless-corner"; - q = "earless-corner"; - r = "earless-corner"; - u = "toothless-rounded"; - y = "cursive-flat-hook"; - - one = "no-base-long-top-serif"; - two = "straight-neck"; - three = "flat-top"; - four = "open"; - six = "open-contour"; - seven = "straight-serifless"; - eight = "two-circles"; - nine = "open-contour"; - tilde = "low"; - asterisk = "hex-low"; - number-sign = "upright"; - at = "short"; - dollar = "open"; - percent = "dots"; - question = "corner-flat-hooked"; - }; - }; - set = "kookiefonts"; - }) - ]; - }; + ]; services.udev.extraRules = '' SUBSYSTEM=="backlight", ACTION=="add", \ |