home: noto sans -> ubuntu sans (#75)

* initial changeover

* zed: adjust font sizes

* waybar: fix missing pixels

* waybar: set to mono font

* zed: ui font 14 -> 16

* kitty: font gtk + 1

* alacritty: font gtk + 1

* rofi: use mono font

* home/theme: use vegur serif font
This commit is contained in:
Aly Raffauf 2024-08-03 21:07:55 -04:00 committed by GitHub
parent 07fb35b1c2
commit 9daf1a46a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 25 additions and 23 deletions

View file

@ -20,11 +20,11 @@
font = { font = {
normal = { normal = {
family = "NotoSansM Nerd Font"; family = "UbuntuSans Nerd Font";
style = "Regular"; style = "Regular";
}; };
size = config.gtk.font.size; size = config.gtk.font.size + 1;
}; };
selection.save_to_clipboard = true; selection.save_to_clipboard = true;

View file

@ -13,7 +13,7 @@
}; };
main = { main = {
font = "NotoSansM Nerd Font:size=${toString config.gtk.font.size}"; font = "UbuntuSansMono Nerd Font:size=${toString config.gtk.font.size}";
icon-theme = "${config.gtk.iconTheme.name}"; icon-theme = "${config.gtk.iconTheme.name}";
layer = "overlay"; layer = "overlay";
lines = 3; lines = 3;

View file

@ -9,8 +9,8 @@
enable = true; enable = true;
font = { font = {
name = "NotoSansM Nerd Font"; name = "UbuntuSansMono Nerd Font";
size = config.gtk.font.size; size = config.gtk.font.size + 1;
}; };
settings = { settings = {

View file

@ -15,7 +15,7 @@ in {
programs.rofi = { programs.rofi = {
enable = true; enable = true;
font = "NotoSansM Nerd Font ${toString config.gtk.font.size}"; font = "UbuntuSansMono Nerd Font ${toString config.gtk.font.size}";
location = "center"; location = "center";
package = pkgs.rofi-wayland; package = pkgs.rofi-wayland;

View file

@ -15,7 +15,7 @@
caps-lock-key-hl-color=e78284 caps-lock-key-hl-color=e78284
color=303446 color=303446
daemonize daemonize
font="NotoSansMNerdFont-Regular" font="UbuntuSansMonoNerdFont-Regular"
image=${config.ar.home.theme.wallpaper} image=${config.ar.home.theme.wallpaper}
indicator-caps-lock indicator-caps-lock
indicator-idle-visible indicator-idle-visible

View file

@ -13,7 +13,7 @@
userSettings = { userSettings = {
"diffEditor.ignoreTrimWhitespace" = false; "diffEditor.ignoreTrimWhitespace" = false;
"editor.fontFamily" = "'NotoSansM Nerd Font', 'monospace', monospace"; "editor.fontFamily" = "'UbuntuSansMono Nerd Font', 'monospace', monospace";
"editor.fontSize" = lib.mkDefault 14; "editor.fontSize" = lib.mkDefault 14;
"editor.formatOnPaste" = true; "editor.formatOnPaste" = true;
"editor.formatOnSave" = true; "editor.formatOnSave" = true;

View file

@ -45,7 +45,7 @@
auto_update = false; auto_update = false;
autosave.after_delay.milliseconds = 1000; autosave.after_delay.milliseconds = 1000;
buffer_font_family = "NotoSansM Nerd Font"; buffer_font_family = "UbuntuSansMono Nerd Font";
buffer_font_size = 14; buffer_font_size = 14;
current_line_highlight = "line"; current_line_highlight = "line";
@ -84,7 +84,7 @@
metrics = false; metrics = false;
}; };
terminal.font_size = 12; terminal.font_size = 14;
theme = { theme = {
dark = "Adwaita Pastel Dark"; dark = "Adwaita Pastel Dark";
@ -92,7 +92,7 @@
mode = "system"; mode = "system";
}; };
ui_font_family = "NotoSans Nerd Font"; ui_font_family = "UbuntuSans Nerd Font";
ui_font_size = 16; ui_font_size = 16;
use_autoclose = false; use_autoclose = false;
vim_mode = false; vim_mode = false;

View file

@ -255,8 +255,8 @@
xdg.configFile."waybar/style.css".text = '' xdg.configFile."waybar/style.css".text = ''
* { * {
border: none; border: none;
border-radius: 0; border-radius: 0px;
font-family: "NotoSansM Nerd Font"; font-family: "UbuntuSansMono Nerd Font";
font-size: 14px; font-size: 14px;
font-weight: 600; font-weight: 600;
} }
@ -268,7 +268,7 @@
#workspaces button { #workspaces button {
padding: 0px 5px; padding: 0px 5px;
margin: 0 0px; margin: 0px 0px;
color: ${config.ar.home.theme.colors.text}; color: ${config.ar.home.theme.colors.text};
} }
@ -289,8 +289,8 @@
#custom-logout, #custom-logout,
#custom-menu, #custom-menu,
#tray { #tray {
padding: 0 7.5px; padding: 0px 7.5px;
margin: 0 5px; margin: 0px 5px;
} }
#battery { #battery {
@ -316,7 +316,7 @@
#submap, #submap,
#tray, #tray,
#workspaces { #workspaces {
border-radius: 10; border-radius: 10px;
background: rgba (36, 36, 36, 0.8); background: rgba (36, 36, 36, 0.8);
margin: 5px 10px 0px 10px; margin: 5px 10px 0px 10px;
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;

View file

@ -11,6 +11,8 @@ in {
packages = with pkgs; [ packages = with pkgs; [
adwaita-qt adwaita-qt
gnome.adwaita-icon-theme gnome.adwaita-icon-theme
liberation_ttf
vegur
]; ];
pointerCursor = { pointerCursor = {
@ -29,8 +31,8 @@ in {
fonts.fontconfig = { fonts.fontconfig = {
enable = true; enable = true;
defaultFonts = { defaultFonts = {
monospace = ["NotoSansM Nerd Font"]; monospace = ["UbuntuSansMono Nerd Font"];
serif = ["NotoSerif Nerd Font"]; serif = ["Vegur"];
sansSerif = [config.gtk.font.name]; sansSerif = [config.gtk.font.name];
}; };
}; };
@ -55,8 +57,8 @@ in {
}; };
font = { font = {
name = "NotoSans Nerd Font"; name = "UbuntuSans Nerd Font";
package = pkgs.nerdfonts.override {fonts = ["Noto"];}; package = pkgs.nerdfonts.override {fonts = ["UbuntuSans"];};
size = lib.mkDefault 11; size = lib.mkDefault 11;
}; };
@ -127,7 +129,7 @@ in {
cursor-theme = config.home.pointerCursor.name; cursor-theme = config.home.pointerCursor.name;
cursor-size = config.home.pointerCursor.size; cursor-size = config.home.pointerCursor.size;
document-font-name = "NotoSerif Nerd Font ${toString config.gtk.font.size}"; document-font-name = "Vegur ${toString config.gtk.font.size}";
gtk-theme = gtk-theme =
if cfg.darkMode if cfg.darkMode
@ -139,7 +141,7 @@ in {
then "Papirus-Dark" then "Papirus-Dark"
else "Papirus"; else "Papirus";
monospace-font-name = "NotoSansM Nerd Font ${toString config.gtk.font.size}"; monospace-font-name = "UbuntuSansMono Nerd Font ${toString config.gtk.font.size}";
}; };
"org/gnome/desktop/wm/preferences".titlebar-font = "${config.gtk.font.name} ${toString config.gtk.font.size}"; "org/gnome/desktop/wm/preferences".titlebar-font = "${config.gtk.font.name} ${toString config.gtk.font.size}";