diff --git a/nixos/common.nix b/nixos/common.nix index c7ba4b44..d222862a 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -80,13 +80,13 @@ in { fonts.fontconfig = { enable = true; - defaultFonts.monospace = [ "Berkeley Mono" ]; + defaultFonts.monospace = [ "BerkeleyMono Nerd Font" ]; }; fonts.fonts = with pkgs; [ (fetchzip { url = "file://" + ./fonts/berkeley.tar.xz; - sha256 = "sha256-V3X8RFZdz3hNd8tbrXDkP6c18pGUuE62uQcmFiE0AbM="; + sha256 = "sha256-nsDqdQikT65vJVMq7r2MAOxd3xqj8vJ0Ky2y9CfI/bg=="; }) (fetchzip { url = "file://" + ./fonts/tragicastle.tar.xz; diff --git a/nixos/fonts/README.md b/nixos/fonts/README.md new file mode 100644 index 00000000..c896bfee --- /dev/null +++ b/nixos/fonts/README.md @@ -0,0 +1,4 @@ +* mv all *.otf and *.ttf into one dir +* `fd --exec nix run nixpkgs#nerd-font-patcher -- --progressbars --careful -c {}` +* tar.xz + * diff --git a/nixos/fonts/berkeley.tar.xz b/nixos/fonts/berkeley.tar.xz index d2331eff..0fb454ac 100644 Binary files a/nixos/fonts/berkeley.tar.xz and b/nixos/fonts/berkeley.tar.xz differ diff --git a/nixos/gnome/home.nix b/nixos/gnome/home.nix index a61ee685..899a486a 100644 --- a/nixos/gnome/home.nix +++ b/nixos/gnome/home.nix @@ -29,7 +29,7 @@ cyplo = { visibleName = "peninsula"; default = true; - font = "Berkeley Mono"; + font = "BerkeleyMono Nerd Font"; colors = { foregroundColor = "#838394949696"; backgroundColor = "#00002B2B3636"; diff --git a/nixos/home-manager/programs/alacritty.nix b/nixos/home-manager/programs/alacritty.nix index 3add24ba..65705235 100644 --- a/nixos/home-manager/programs/alacritty.nix +++ b/nixos/home-manager/programs/alacritty.nix @@ -17,7 +17,7 @@ }; font = { - family = "Berkeley Mono"; + family = "BerkeleyMono Nerd Font"; size = 12; }; diff --git a/nixos/home-manager/programs/kitty.nix b/nixos/home-manager/programs/kitty.nix index 4599e3d8..c7a1592a 100644 --- a/nixos/home-manager/programs/kitty.nix +++ b/nixos/home-manager/programs/kitty.nix @@ -1,9 +1,5 @@ -{ - config, - pkgs, - ... -}: { - home.sessionVariables = {TERMINAL = "kitty";}; +{ config, pkgs, ... }: { + home.sessionVariables = { TERMINAL = "kitty"; }; programs.kitty = { enable = true; @@ -11,7 +7,7 @@ enable_audio_bell = false; font_size = "16.0"; - font_family = "Berkeley Mono"; + font_family = "BerkeleyMono Nerd Font"; bold_font = "auto"; italic_font = "auto"; bold_italic_font = "auto"; diff --git a/nixos/home-manager/programs/termite.nix b/nixos/home-manager/programs/termite.nix index 91232474..500e843c 100644 --- a/nixos/home-manager/programs/termite.nix +++ b/nixos/home-manager/programs/termite.nix @@ -1,9 +1,5 @@ -{ - config, - pkgs, - ... -}: { - home.sessionVariables = {TERMINAL = "termite";}; +{ config, pkgs, ... }: { + home.sessionVariables = { TERMINAL = "termite"; }; programs.termite = { enable = true; allowBold = true; @@ -12,7 +8,7 @@ dynamicTitle = true; mouseAutohide = true; scrollOnKeystroke = false; - font = "Berkeley Mono 12"; + font = "BerkeleyMono Nerd Font 12"; backgroundColor = "#002b36"; foregroundColor = "#839496"; diff --git a/nixos/i3/dunst.nix b/nixos/i3/dunst.nix index 9dec6716..2d8987a7 100644 --- a/nixos/i3/dunst.nix +++ b/nixos/i3/dunst.nix @@ -1,13 +1,9 @@ -{ - config, - pkgs, - ... -}: { +{ config, pkgs, ... }: { services.dunst = { enable = true; settings = { global = { - font = "Berkeley Mono 10"; + font = "BerkeleyMono Nerd Font 10"; sort = "yes"; indicate_hidden = "yes"; word_wrap = "yes"; diff --git a/nixos/i3/i3.nix b/nixos/i3/i3.nix index 364759a3..7bf7b219 100644 --- a/nixos/i3/i3.nix +++ b/nixos/i3/i3.nix @@ -48,7 +48,7 @@ in { colors.background = "#001e26"; colors.statusline = "#708183"; fonts = { - names = [ "Berkeley Mono" "Font Awesome 6 Free" ]; + names = [ "BerkeleyMono Nerd Font" ]; size = 10.0; }; diff --git a/nixos/i3/rofi.nix b/nixos/i3/rofi.nix index 5cc67c27..75380b02 100644 --- a/nixos/i3/rofi.nix +++ b/nixos/i3/rofi.nix @@ -1,11 +1,7 @@ -{ - config, - pkgs, - ... -}: { +{ config, pkgs, ... }: { programs.rofi = { enable = true; - font = "Berkeley Mono 16"; + font = "BerkeleyMono Nerd Font 16"; theme = "solarized"; }; }