diff --git a/SwarselSystems.org b/SwarselSystems.org index 2857a86..f2bfce2 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -115,6 +115,8 @@ This is where the theme for the whole OS is defined. This noweb-ref section cann For styling, I am using the [[https://github.com/danth/stylix][stylix]] NixOS module, loaded by flake. This package is really great, as it adds nix expressions for basically everything. Ever since switching to this, I did not have to play around with theming anywhere else. +The full list of nerd-fonts can be found here: https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/data/fonts/nerd-fonts/manifests/fonts.json + #+begin_src nix :tangle no :noweb-ref theme enable = true; @@ -151,7 +153,8 @@ For styling, I am using the [[https://github.com/danth/stylix][stylix]] NixOS mo }; monospace = { - package = pkgs.nerdfonts; # has overrides + package = pkgs.nerd-fonts.fira-mono; # has overrides + name = "FiraCode Nerd Font Mono"; }; @@ -2436,10 +2439,6 @@ This file now holds all of the "nixpkgs-changes" that I am using across the conf withSystemVencord = true; }; - nerdfonts = _prev.nerdfonts.override { - fonts = [ "FiraMono" "FiraCode" "NerdFontsSymbolsOnly" ]; - }; - firefox = _prev.firefox.override { nativeMessagingHosts = [ _prev.tridactyl-native @@ -6544,7 +6543,9 @@ This holds packages that I can use as provided, or with small modifications (as }) # font stuff - nerdfonts # has overrides + nerd-fonts.fira-mono + nerd-fonts.fira-code + nerd-fonts.symbols-only noto-fonts-emoji font-awesome_5 noto-fonts diff --git a/overlays/default.nix b/overlays/default.nix index bcdcf15..0d82bea 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -5,10 +5,6 @@ withSystemVencord = true; }; - nerdfonts = _prev.nerdfonts.override { - fonts = [ "FiraMono" "FiraCode" "NerdFontsSymbolsOnly" ]; - }; - firefox = _prev.firefox.override { nativeMessagingHosts = [ _prev.tridactyl-native diff --git a/profiles/common/home/packages.nix b/profiles/common/home/packages.nix index 5fa756b..1e5b082 100644 --- a/profiles/common/home/packages.nix +++ b/profiles/common/home/packages.nix @@ -143,7 +143,9 @@ }) # font stuff - nerdfonts # has overrides + nerd-fonts.fira-mono + nerd-fonts.fira-code + nerd-fonts.symbols-only noto-fonts-emoji font-awesome_5 noto-fonts diff --git a/profiles/common/home/stylix.nix b/profiles/common/home/stylix.nix index 0eb35e9..d2bfe09 100644 --- a/profiles/common/home/stylix.nix +++ b/profiles/common/home/stylix.nix @@ -36,7 +36,8 @@ }; monospace = { - package = pkgs.nerdfonts; # has overrides + package = pkgs.nerd-fonts.fira-mono; # has overrides + name = "FiraCode Nerd Font Mono"; }; diff --git a/profiles/common/nixos/stylix.nix b/profiles/common/nixos/stylix.nix index 803e14d..39833e3 100644 --- a/profiles/common/nixos/stylix.nix +++ b/profiles/common/nixos/stylix.nix @@ -36,7 +36,8 @@ }; monospace = { - package = pkgs.nerdfonts; # has overrides + package = pkgs.nerd-fonts.fira-mono; # has overrides + name = "FiraCode Nerd Font Mono"; };