diff --git a/user-modules/browser/qutebrowser/default.nix b/user-modules/browser/qutebrowser/default.nix index 2c50e99..628ddeb 100644 --- a/user-modules/browser/qutebrowser/default.nix +++ b/user-modules/browser/qutebrowser/default.nix @@ -43,8 +43,8 @@ in # config.set("completion.web_history.max_items", 30) config.set("colors.webpage.darkmode.enabled", False) 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_size", "${toString theme.fonts.monospace.recommendedSize}pt") + config.set("fonts.default_family", "${theme.fonts.interface.name}") + config.set("fonts.default_size", "${toString theme.fonts.interface.recommendedSize}pt") ''; }; }; diff --git a/user-modules/rofi/default.nix b/user-modules/rofi/default.nix index 67c80a0..a8ba575 100644 --- a/user-modules/rofi/default.nix +++ b/user-modules/rofi/default.nix @@ -19,7 +19,7 @@ in enable = true; terminal = config.default.terminal; 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 = let inherit (config.lib.formats.rasi) mkLiteral; diff --git a/user-modules/theming/default.nix b/user-modules/theming/default.nix index d073be5..88d3b5b 100644 --- a/user-modules/theming/default.nix +++ b/user-modules/theming/default.nix @@ -243,6 +243,11 @@ in description = "Default emoji font."; }; + interface = mkOption { + type = fontModule; + description = "Default emoji font."; + }; + extraFonts = mkOption { type = types.listOf fontModule; default = [ ]; diff --git a/user-modules/vscode/default.nix b/user-modules/vscode/default.nix index 85007f7..903a411 100644 --- a/user-modules/vscode/default.nix +++ b/user-modules/vscode/default.nix @@ -49,26 +49,41 @@ in ms-vsliveshare.vsliveshare ]; - userSettings = { - # Font setup - # TODO: Move the conversion factor to theme settings - "editor.fontFamily" = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'"; - "editor.fontSize" = mkForce (cfg.codeFont.recommendedSize); # Convert pt to px - "editor.fontLigatures" = true; - "terminal.integrated.fontFamily" = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'"; - "terminal.integrated.fontSize" = mkForce (cfg.codeFont.recommendedSize); # Convert pt to px + userSettings = + let + font-family = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'"; + # TODO: Move the conversion factor to theme settings + font-size = mkForce cfg.codeFont.recommendedSize; # Convert pt to px + in + { + # 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 - "editor.formatOnSave" = true; - "editor.tabSize" = 4; + # Formatting + "editor.formatOnSave" = true; + "editor.tabSize" = 4; - # Layout - "window.menuBarVisibility" = "hidden"; + # Layout + "window.menuBarVisibility" = "hidden"; - # Git settings - "git.autofetch" = true; - "git.enableSmartCommit" = false; - }; + # Git settings + "git.autofetch" = true; + "git.enableSmartCommit" = false; + }; }; }; } diff --git a/users/jan.nix b/users/jan.nix index d5dc6b1..4183956 100644 --- a/users/jan.nix +++ b/users/jan.nix @@ -114,6 +114,7 @@ fonts.sansSerif = fontpkgs."DejaVu Sans"; fonts.monospace = fontpkgs."Dina"; fonts.emoji = fontpkgs."Noto Color Emoji"; + fonts.interface = fontpkgs."Dina"; fonts.extraFonts = [ ]; # Color scheme