fonts (no name2)

This commit is contained in:
Lennart J. Kurzweg (Nx2)
2024-12-02 20:46:32 +01:00
parent 683913e0fe
commit 219a19a3a8
8 changed files with 10 additions and 10 deletions

View File

@@ -41,8 +41,7 @@ pkgs: rec {
in ccolor // fcolor // xcolor; in ccolor // fcolor // xcolor;
font = { font = {
code = { code = {
name = "JetBrainsMono-NF"; name = "JetBrainsMono Nerd Font";
name2 = "JetBrainsMono Nerd Font";
package = (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }); package = (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; });
# name = "CascadiaCove-NF"; # name = "CascadiaCove-NF";
# package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; }); # package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; });

View File

@@ -46,7 +46,7 @@
margin: ${builtins.toString rice.gap-size}px; margin: ${builtins.toString rice.gap-size}px;
} }
.color-container { .color-container {
font-family: ${rice.font.code.name2}; font-family: ${rice.font.code.name};
display: flex; display: flex;
gap: ${builtins.toString rice.gap-size}px; gap: ${builtins.toString rice.gap-size}px;
margin: ${builtins.toString rice.gap-size}px; margin: ${builtins.toString rice.gap-size}px;

View File

@@ -3,7 +3,7 @@
programs.kitty = { programs.kitty = {
enable = true; enable = true;
font = { font = {
name = rice.font.code.name2; name = rice.font.code.name;
package = rice.font.code.package; package = rice.font.code.package;
}; };
settings = with rice.color; { settings = with rice.color; {

View File

@@ -8,7 +8,7 @@
textColor = color.foreground; textColor = color.foreground;
borderColor = color.border; borderColor = color.border;
borderSize = border-width; borderSize = border-width;
font = font.code.name2; font = font.code.name;
borderRadius = rounding; borderRadius = rounding;
anchor = "top-right"; anchor = "top-right";
margin = builtins.toString (gap-size * 2) ; margin = builtins.toString (gap-size * 2) ;

View File

@@ -14,7 +14,7 @@
} }
* { * {
font: "${rice.font.code.name2} 12"; font: "${rice.font.code.name} 12";
foreground: ${foreground}; foreground: ${foreground};
background-color: ${background}${trdr}; background-color: ${background}${trdr};
padding: 0px; padding: 0px;

View File

@@ -65,7 +65,7 @@
]; ];
userSettings = { userSettings = {
workbench.colorTheme = "Just Black"; workbench.colorTheme = "Just Black";
editor.fontFamily = "'${rice.font.code.name2}', 'monospace', monospace"; editor.fontFamily = "'${rice.font.code.name}', 'monospace', monospace";
remote.SSH.useLocalServer = false; remote.SSH.useLocalServer = false;
}; };
enableUpdateCheck = false; enableUpdateCheck = false;

View File

@@ -163,7 +163,7 @@ in {
}; };
style = with rice.color; let f = rice.lib.hex-to-rgb-comma-string; in '' style = with rice.color; let f = rice.lib.hex-to-rgb-comma-string; in ''
* { * {
font-family: ${rice.font.code.name2}; font-family: ${rice.font.code.name};
font-size: 1em; font-size: 1em;
min-height: 0px; min-height: 0px;
margin: 0px; margin: 0px;
@@ -223,7 +223,7 @@ in {
} }
#window, #custom-ctimeremaining { #window, #custom-ctimeremaining {
font-family: ${rice.font.base.name}, ${rice.font.code.name2}; font-family: ${rice.font.base.name}, ${rice.font.code.name};
color: rgb(${f tertiary.bright}); color: rgb(${f tertiary.bright});
} }

View File

@@ -7,7 +7,8 @@
{ {
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
noto-fonts noto-fonts
noto-fonts-cjk noto-fonts-cjk-sans
noto-fonts-cjk-serif
noto-fonts-emoji noto-fonts-emoji
newcomputermodern newcomputermodern
atkinson-hyperlegible atkinson-hyperlegible