Jan
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some font issues

This commit is contained in:
Jan-Bulthuis 2025-01-24 02:26:24 +01:00
parent 3f11f64135
commit f341226d0b
5 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
user-modules/browser/qutebrowser/default.nix
View File

@ -43,8 +43,8 @@ in
# config.set("completion.web_history.max_items", 30) # config.set("completion.web_history.max_items", 30)
config.set("colors.webpage.darkmode.enabled", False) config.set("colors.webpage.darkmode.enabled", False)
config.set("colors.webpage.preferred_color_scheme", "${if theme.darkMode then "dark" else "light"}") config.set("colors.webpage.preferred_color_scheme", "${if theme.darkMode then "dark" else "light"}")
config.set("fonts.default_family", "${theme.fonts.monospace.name}") config.set("fonts.default_family", "${theme.fonts.interface.name}")
config.set("fonts.default_size", "${toString theme.fonts.monospace.recommendedSize}pt") config.set("fonts.default_size", "${toString theme.fonts.interface.recommendedSize}pt")
''; '';
}; };
}; };

2
user-modules/rofi/default.nix
View File

@ -19,7 +19,7 @@ in
enable = true; enable = true;
terminal = config.default.terminal; terminal = config.default.terminal;
package = pkgs.rofi-wayland; package = pkgs.rofi-wayland;
font = "${theme.fonts.monospace.name} ${toString theme.fonts.monospace.recommendedSize}"; font = "${theme.fonts.interface.name} ${toString (theme.fonts.interface.recommendedSize)}";
theme = theme =
let let
inherit (config.lib.formats.rasi) mkLiteral; inherit (config.lib.formats.rasi) mkLiteral;

5
user-modules/theming/default.nix
View File

@ -243,6 +243,11 @@ in
description = "Default emoji font."; description = "Default emoji font.";
}; };
interface = mkOption {
type = fontModule;
description = "Default emoji font.";
};
extraFonts = mkOption { extraFonts = mkOption {
type = types.listOf fontModule; type = types.listOf fontModule;
default = [ ]; default = [ ];

49
user-modules/vscode/default.nix
View File

@ -49,26 +49,41 @@ in
ms-vsliveshare.vsliveshare ms-vsliveshare.vsliveshare
]; ];
userSettings = { userSettings =
# Font setup let
# TODO: Move the conversion factor to theme settings font-family = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'";
"editor.fontFamily" = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'"; # TODO: Move the conversion factor to theme settings
"editor.fontSize" = mkForce (cfg.codeFont.recommendedSize); # Convert pt to px font-size = mkForce cfg.codeFont.recommendedSize; # Convert pt to px
"editor.fontLigatures" = true; in
"terminal.integrated.fontFamily" = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'"; {
"terminal.integrated.fontSize" = mkForce (cfg.codeFont.recommendedSize); # Convert pt to px # Font setup
"editor.fontFamily" = font-family;
"editor.inlayHints.fontFamily" = font-family;
"editor.inlineSuggest.fontFamily" = font-family;
"editor.fontSize" = font-size;
"editor.fontLigatures" = true;
"terminal.integrated.fontFamily" = font-family;
"terminal.integrated.fontSize" = font-size;
"chat.editor.fontFamily" = font-family; # TODO: Change this font to the standard UI font
"chat.editor.fontSize" = font-size;
"debug.console.fontFamily" = font-family;
"debug.console.fontSize" = font-size;
"scm.inputFontFamily" = font-family; # TODO: Change this font to the standard UI font
"scm.inputFontSize" = font-size;
"markdown.preview.fontFamily" = mkForce theme.fonts.sansSerif.name; # TODO: Change this font to the standard UI font
"markdown.preview.fontSize" = mkForce theme.fonts.sansSerif.recommendedSize;
# Formatting # Formatting
"editor.formatOnSave" = true; "editor.formatOnSave" = true;
"editor.tabSize" = 4; "editor.tabSize" = 4;
# Layout # Layout
"window.menuBarVisibility" = "hidden"; "window.menuBarVisibility" = "hidden";
# Git settings # Git settings
"git.autofetch" = true; "git.autofetch" = true;
"git.enableSmartCommit" = false; "git.enableSmartCommit" = false;
}; };
}; };
}; };
} }

1
users/jan.nix
View File

@ -114,6 +114,7 @@
fonts.sansSerif = fontpkgs."DejaVu Sans"; fonts.sansSerif = fontpkgs."DejaVu Sans";
fonts.monospace = fontpkgs."Dina"; fonts.monospace = fontpkgs."Dina";
fonts.emoji = fontpkgs."Noto Color Emoji"; fonts.emoji = fontpkgs."Noto Color Emoji";
fonts.interface = fontpkgs."Dina";
fonts.extraFonts = [ ]; fonts.extraFonts = [ ];
# Color scheme # Color scheme