l: extract fonts, switch to compiled iosevka
This commit is contained in:
parent
ab0812fa5a
commit
ccf29b838b
@ -14,6 +14,7 @@ in {
|
|||||||
./tmux.nix
|
./tmux.nix
|
||||||
./xmonad.nix
|
./xmonad.nix
|
||||||
./themes.nix
|
./themes.nix
|
||||||
|
./fonts.nix
|
||||||
{
|
{
|
||||||
users.users.mainUser.packages = [
|
users.users.mainUser.packages = [
|
||||||
pkgs.sshuttle
|
pkgs.sshuttle
|
||||||
@ -26,15 +27,15 @@ in {
|
|||||||
options.lass.fonts = {
|
options.lass.fonts = {
|
||||||
regular = mkOption {
|
regular = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
|
default = "xft:Iosevka Term SS15:style=regular";
|
||||||
};
|
};
|
||||||
bold = mkOption {
|
bold = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
|
default = "xft:Iosevka Term SS15:style=bold";
|
||||||
};
|
};
|
||||||
italic = mkOption {
|
italic = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
|
default = "xft:Iosevka Term SS15:style=italic";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
config.krebs.xresources.resources.X = ''
|
config.krebs.xresources.resources.X = ''
|
||||||
@ -98,65 +99,9 @@ in {
|
|||||||
${pkgs.flameshot}/bin/flameshot gui
|
${pkgs.flameshot}/bin/flameshot gui
|
||||||
${pkgs.klem}/bin/klem
|
${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 = ''
|
services.udev.extraRules = ''
|
||||||
SUBSYSTEM=="backlight", ACTION=="add", \
|
SUBSYSTEM=="backlight", ACTION=="add", \
|
||||||
RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness", \
|
RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness", \
|
||||||
|
14
lass/2configs/fonts.nix
Normal file
14
lass/2configs/fonts.nix
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
{
|
||||||
|
fonts = {
|
||||||
|
fontDir.enable = true;
|
||||||
|
enableGhostscriptFonts = true;
|
||||||
|
|
||||||
|
fonts = with pkgs; [
|
||||||
|
xorg.fontschumachermisc
|
||||||
|
inconsolata
|
||||||
|
noto-fonts
|
||||||
|
(iosevka-bin.override { variant = "ss15"; })
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
@ -68,7 +68,7 @@ myTerm :: FilePath
|
|||||||
myTerm = "/run/current-system/sw/bin/alacritty"
|
myTerm = "/run/current-system/sw/bin/alacritty"
|
||||||
|
|
||||||
myFont :: String
|
myFont :: String
|
||||||
myFont = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1"
|
myFont = "${config.lass.fonts.regular}"
|
||||||
|
|
||||||
main :: IO ()
|
main :: IO ()
|
||||||
main = do
|
main = do
|
||||||
|
Loading…
Reference in New Issue
Block a user