From e6f8cf67cfccb77a9ec4b737ee6fb335c104aebe Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Thu, 19 Sep 2024 23:58:17 -0300 Subject: [PATCH] feat: move from FantasqueSansMono to IBS Plex and set it as default across the board --- modules/home-manager/packages.nix | 3 ++- modules/home-manager/programs/alacritty.nix | 4 ++-- modules/home-manager/programs/emacs/doom/config.el | 2 +- modules/home-manager/programs/mako/config | 4 ++-- .../programs/rofi/catppuccin-frappe.rasi | 4 ++-- modules/home-manager/programs/rofi/default.nix | 2 +- modules/home-manager/programs/waybar.nix | 4 ++-- modules/nixos/default.nix | 1 + modules/nixos/packages.nix | 4 ++-- modules/nixos/theming.nix | 12 ++++++++++++ 10 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 modules/nixos/theming.nix diff --git a/modules/home-manager/packages.nix b/modules/home-manager/packages.nix index 7b6c950..5bff1c3 100644 --- a/modules/home-manager/packages.nix +++ b/modules/home-manager/packages.nix @@ -82,10 +82,11 @@ ## Theming (nerdfonts.override { fonts = [ - "FantasqueSansMono" + "IBMPlexMono" "NerdFontsSymbolsOnly" ]; }) + ibm-plex libsForQt5.qtstyleplugin-kvantum libsForQt5.qtwayland qt6Packages.qtstyleplugin-kvantum diff --git a/modules/home-manager/programs/alacritty.nix b/modules/home-manager/programs/alacritty.nix index 323d4b9..cb98060 100644 --- a/modules/home-manager/programs/alacritty.nix +++ b/modules/home-manager/programs/alacritty.nix @@ -16,11 +16,11 @@ in font = { normal = { - family = "FantasqueSansM Nerd Font"; + family = "BlexMono Nerd Font"; style = "Regular"; }; - size = 13; + size = 12; }; window = { diff --git a/modules/home-manager/programs/emacs/doom/config.el b/modules/home-manager/programs/emacs/doom/config.el index 547bda1..d24d3c2 100644 --- a/modules/home-manager/programs/emacs/doom/config.el +++ b/modules/home-manager/programs/emacs/doom/config.el @@ -28,7 +28,7 @@ ;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to ;; refresh your font settings. If Emacs still can't find your font, it likely ;; wasn't installed correctly. Font issues are rarely Doom issues! -(setq doom-font (font-spec :family "FantasqueSansM Nerd Font" :size 16)) +(setq doom-font (font-spec :family "BlexMono Nerd Font" :size 13)) ;; There are two ways to load a theme. Both assume the theme is installed and ;; available. You can either set `doom-theme' or manually load a theme with the diff --git a/modules/home-manager/programs/mako/config b/modules/home-manager/programs/mako/config index 0567279..4e59b13 100644 --- a/modules/home-manager/programs/mako/config +++ b/modules/home-manager/programs/mako/config @@ -4,7 +4,7 @@ border-color=#282a36 border-radius=20 border-size=2 default-timeout=10000 -format=%s\n%b +format=%s\n%b group-by=summary height=125 icon-location=right @@ -17,7 +17,7 @@ text-color=#44475a width=300 [grouped] -format=%s\n%b +format=%s\n%b [mode=do-not-disturb] invisible=1 diff --git a/modules/home-manager/programs/rofi/catppuccin-frappe.rasi b/modules/home-manager/programs/rofi/catppuccin-frappe.rasi index 225200f..79cb8dc 100644 --- a/modules/home-manager/programs/rofi/catppuccin-frappe.rasi +++ b/modules/home-manager/programs/rofi/catppuccin-frappe.rasi @@ -9,7 +9,7 @@ grey: #737994; width: 600; - font: "FantasqueSansM Nerd Font 14"; + font: "IBM Plex Sans 14"; } element-text, element-icon , mode-switcher { @@ -87,7 +87,7 @@ button { padding: 10px; background-color: @bg-col-light; text-color: @grey; - vertical-align: 0.5; + vertical-align: 0.5; horizontal-align: 0.5; } diff --git a/modules/home-manager/programs/rofi/default.nix b/modules/home-manager/programs/rofi/default.nix index 1ad328b..ea802ae 100644 --- a/modules/home-manager/programs/rofi/default.nix +++ b/modules/home-manager/programs/rofi/default.nix @@ -5,7 +5,7 @@ enable = true; package = pkgs.rofi-wayland; - font = "FantasqueSansM Nerd Font"; + font = "IBM Plex Sans"; extraConfig = { disable-history = false; diff --git a/modules/home-manager/programs/waybar.nix b/modules/home-manager/programs/waybar.nix index 9ba44d5..aeeeab2 100644 --- a/modules/home-manager/programs/waybar.nix +++ b/modules/home-manager/programs/waybar.nix @@ -147,8 +147,8 @@ * { all: unset; color: #c6d0f5; - font-family: "FantasqueSansM Nerd Font", 'Courier New', Courier, monospace; - font-size: 16px; + font-family: "IBM Plex Sans", 'Courier New', Courier, monospace; + font-size: 14px; } .modules-left, diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 2c7933a..796ca94 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -9,5 +9,6 @@ ./services.nix ./sound.nix ./system.nix + ./theming.nix ]; } diff --git a/modules/nixos/packages.nix b/modules/nixos/packages.nix index 26e9f1f..0eee06e 100644 --- a/modules/nixos/packages.nix +++ b/modules/nixos/packages.nix @@ -72,8 +72,8 @@ (catppuccin-sddm.override # So SDDM finds the theme files. { flavor = "frappe"; - font = "FantasqueSansM Nerd Font"; - fontSize = "12"; + font = "IBM Plex Sans"; + fontSize = "11"; background = "${./theming/sddm/Background.jpg}"; loginBackground = true; } diff --git a/modules/nixos/theming.nix b/modules/nixos/theming.nix new file mode 100644 index 0000000..96f2b24 --- /dev/null +++ b/modules/nixos/theming.nix @@ -0,0 +1,12 @@ +{ ... }: + +{ + # Set the default fonts for the system. + fonts.fontconfig = { + defaultFonts = { + serif = [ "IBM Plex Serif" ]; + sansSerif = [ "IBM Plex Sans" ]; + monospace = [ "IBM Plex Mono" ]; + }; + }; +}