From 9daf1a46a56a04f39bea49cf3ead9daf8750774d Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Sat, 3 Aug 2024 21:07:55 -0400 Subject: [PATCH] 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 --- homeManagerModules/apps/alacritty/default.nix | 4 ++-- homeManagerModules/apps/fuzzel/default.nix | 2 +- homeManagerModules/apps/kitty/default.nix | 4 ++-- homeManagerModules/apps/rofi/default.nix | 2 +- homeManagerModules/apps/swaylock/default.nix | 2 +- homeManagerModules/apps/vsCodium/default.nix | 2 +- homeManagerModules/apps/zed/default.nix | 6 +++--- homeManagerModules/services/waybar/default.nix | 12 ++++++------ homeManagerModules/theme.nix | 14 ++++++++------ 9 files changed, 25 insertions(+), 23 deletions(-) diff --git a/homeManagerModules/apps/alacritty/default.nix b/homeManagerModules/apps/alacritty/default.nix index b70a319a..d6cb9658 100644 --- a/homeManagerModules/apps/alacritty/default.nix +++ b/homeManagerModules/apps/alacritty/default.nix @@ -20,11 +20,11 @@ font = { normal = { - family = "NotoSansM Nerd Font"; + family = "UbuntuSans Nerd Font"; style = "Regular"; }; - size = config.gtk.font.size; + size = config.gtk.font.size + 1; }; selection.save_to_clipboard = true; diff --git a/homeManagerModules/apps/fuzzel/default.nix b/homeManagerModules/apps/fuzzel/default.nix index 36898b3d..32b9a2c5 100644 --- a/homeManagerModules/apps/fuzzel/default.nix +++ b/homeManagerModules/apps/fuzzel/default.nix @@ -13,7 +13,7 @@ }; 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}"; layer = "overlay"; lines = 3; diff --git a/homeManagerModules/apps/kitty/default.nix b/homeManagerModules/apps/kitty/default.nix index 4b92d53f..dc1c6f82 100644 --- a/homeManagerModules/apps/kitty/default.nix +++ b/homeManagerModules/apps/kitty/default.nix @@ -9,8 +9,8 @@ enable = true; font = { - name = "NotoSansM Nerd Font"; - size = config.gtk.font.size; + name = "UbuntuSansMono Nerd Font"; + size = config.gtk.font.size + 1; }; settings = { diff --git a/homeManagerModules/apps/rofi/default.nix b/homeManagerModules/apps/rofi/default.nix index 5bd429dc..5dbe6880 100644 --- a/homeManagerModules/apps/rofi/default.nix +++ b/homeManagerModules/apps/rofi/default.nix @@ -15,7 +15,7 @@ in { programs.rofi = { enable = true; - font = "NotoSansM Nerd Font ${toString config.gtk.font.size}"; + font = "UbuntuSansMono Nerd Font ${toString config.gtk.font.size}"; location = "center"; package = pkgs.rofi-wayland; diff --git a/homeManagerModules/apps/swaylock/default.nix b/homeManagerModules/apps/swaylock/default.nix index c4f8c6bb..987479f9 100644 --- a/homeManagerModules/apps/swaylock/default.nix +++ b/homeManagerModules/apps/swaylock/default.nix @@ -15,7 +15,7 @@ caps-lock-key-hl-color=e78284 color=303446 daemonize - font="NotoSansMNerdFont-Regular" + font="UbuntuSansMonoNerdFont-Regular" image=${config.ar.home.theme.wallpaper} indicator-caps-lock indicator-idle-visible diff --git a/homeManagerModules/apps/vsCodium/default.nix b/homeManagerModules/apps/vsCodium/default.nix index afb2523b..c97d3f52 100644 --- a/homeManagerModules/apps/vsCodium/default.nix +++ b/homeManagerModules/apps/vsCodium/default.nix @@ -13,7 +13,7 @@ userSettings = { "diffEditor.ignoreTrimWhitespace" = false; - "editor.fontFamily" = "'NotoSansM Nerd Font', 'monospace', monospace"; + "editor.fontFamily" = "'UbuntuSansMono Nerd Font', 'monospace', monospace"; "editor.fontSize" = lib.mkDefault 14; "editor.formatOnPaste" = true; "editor.formatOnSave" = true; diff --git a/homeManagerModules/apps/zed/default.nix b/homeManagerModules/apps/zed/default.nix index d69412b7..06d22bba 100644 --- a/homeManagerModules/apps/zed/default.nix +++ b/homeManagerModules/apps/zed/default.nix @@ -45,7 +45,7 @@ auto_update = false; autosave.after_delay.milliseconds = 1000; - buffer_font_family = "NotoSansM Nerd Font"; + buffer_font_family = "UbuntuSansMono Nerd Font"; buffer_font_size = 14; current_line_highlight = "line"; @@ -84,7 +84,7 @@ metrics = false; }; - terminal.font_size = 12; + terminal.font_size = 14; theme = { dark = "Adwaita Pastel Dark"; @@ -92,7 +92,7 @@ mode = "system"; }; - ui_font_family = "NotoSans Nerd Font"; + ui_font_family = "UbuntuSans Nerd Font"; ui_font_size = 16; use_autoclose = false; vim_mode = false; diff --git a/homeManagerModules/services/waybar/default.nix b/homeManagerModules/services/waybar/default.nix index e0bdc00e..2b6f706e 100644 --- a/homeManagerModules/services/waybar/default.nix +++ b/homeManagerModules/services/waybar/default.nix @@ -255,8 +255,8 @@ xdg.configFile."waybar/style.css".text = '' * { border: none; - border-radius: 0; - font-family: "NotoSansM Nerd Font"; + border-radius: 0px; + font-family: "UbuntuSansMono Nerd Font"; font-size: 14px; font-weight: 600; } @@ -268,7 +268,7 @@ #workspaces button { padding: 0px 5px; - margin: 0 0px; + margin: 0px 0px; color: ${config.ar.home.theme.colors.text}; } @@ -289,8 +289,8 @@ #custom-logout, #custom-menu, #tray { - padding: 0 7.5px; - margin: 0 5px; + padding: 0px 7.5px; + margin: 0px 5px; } #battery { @@ -316,7 +316,7 @@ #submap, #tray, #workspaces { - border-radius: 10; + border-radius: 10px; background: rgba (36, 36, 36, 0.8); margin: 5px 10px 0px 10px; padding: 0px 10px 0px 10px; diff --git a/homeManagerModules/theme.nix b/homeManagerModules/theme.nix index 25da9393..94853bf1 100644 --- a/homeManagerModules/theme.nix +++ b/homeManagerModules/theme.nix @@ -11,6 +11,8 @@ in { packages = with pkgs; [ adwaita-qt gnome.adwaita-icon-theme + liberation_ttf + vegur ]; pointerCursor = { @@ -29,8 +31,8 @@ in { fonts.fontconfig = { enable = true; defaultFonts = { - monospace = ["NotoSansM Nerd Font"]; - serif = ["NotoSerif Nerd Font"]; + monospace = ["UbuntuSansMono Nerd Font"]; + serif = ["Vegur"]; sansSerif = [config.gtk.font.name]; }; }; @@ -55,8 +57,8 @@ in { }; font = { - name = "NotoSans Nerd Font"; - package = pkgs.nerdfonts.override {fonts = ["Noto"];}; + name = "UbuntuSans Nerd Font"; + package = pkgs.nerdfonts.override {fonts = ["UbuntuSans"];}; size = lib.mkDefault 11; }; @@ -127,7 +129,7 @@ in { cursor-theme = config.home.pointerCursor.name; 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 = if cfg.darkMode @@ -139,7 +141,7 @@ in { then "Papirus-Dark" 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}";