Move monospace fonts into a theme

This commit is contained in:
Oliver Davies 2024-03-17 00:27:24 +00:00
parent 384da2a640
commit 5e5e46922c
4 changed files with 43 additions and 17 deletions

View file

@ -1,6 +1,7 @@
{
inputs,
desktop ? false,
self,
}: {pkgs, ...}: let
configure-gtk = pkgs.writeTextFile {
name = "configure-gtk";
@ -16,6 +17,8 @@
'';
};
theme = import "${self}/lib/theme" {inherit pkgs;};
username = "opdavies";
in {
nixpkgs.config.allowUnfree = true;
@ -185,19 +188,22 @@ in {
};
};
packages = with pkgs; [
(nerdfonts.override {
fonts = [
"AnonymousPro"
"FiraCode"
"GeistMono"
"IntelOneMono"
"Iosevka"
"JetBrainsMono"
"Meslo"
];
})
];
packages = with pkgs;
[
(nerdfonts.override {
fonts = [
"AnonymousPro"
"FiraCode"
"GeistMono"
"IntelOneMono"
"Iosevka"
"JetBrainsMono"
];
})
]
++ [
theme.fonts.monospace.package
];
};
zramSwap.enable = true;

View file

@ -5,7 +5,7 @@
}: {
desktop ? false,
}: let
configuration = import ./configuration.nix {inherit desktop inputs;};
configuration = import ./configuration.nix {inherit desktop inputs self;};
hardwareConfiguration = import ./hardware-configuration.nix;
in
inputs.nixpkgs.lib.nixosSystem {

View file

@ -1,4 +1,14 @@
{
lib,
pkgs,
self,
...
}: let
inherit (lib) strings;
inherit (strings) toInt;
theme = import "${self}/lib/theme" {inherit pkgs;};
in {
programs.alacritty = {
enable = true;
@ -11,11 +21,10 @@
};
font = {
size = 12.0;
size = toInt "${theme.fonts.monospace.size}";
bold.style = "Regular";
normal.family = "GeistMono Nerd Font Mono";
# fc-list : family | sort | grep "Nerd Font"
normal.family = "${theme.fonts.monospace.name}";
offset.y = 12;
glyph_offset.y = 6;

11
lib/theme/default.nix Normal file
View file

@ -0,0 +1,11 @@
{pkgs, ...}: {
fonts = {
monospace = {
name = "MesloLGSDZ Nerd Font Mono";
# fc-list : family | sort | grep "Nerd Font"
package = pkgs.nerdfonts.override {fonts = ["Meslo"];};
size = "10";
};
};
}