diff --git a/lib/nixos/configuration.nix b/lib/nixos/configuration.nix index 55b7f107..d2f1c560 100644 --- a/lib/nixos/configuration.nix +++ b/lib/nixos/configuration.nix @@ -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; diff --git a/lib/nixos/default.nix b/lib/nixos/default.nix index 6d986fe4..27a2b4bd 100644 --- a/lib/nixos/default.nix +++ b/lib/nixos/default.nix @@ -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 { diff --git a/lib/nixos/home-manager/modules/alacritty.nix b/lib/nixos/home-manager/modules/alacritty.nix index 9b0454ea..914429d1 100644 --- a/lib/nixos/home-manager/modules/alacritty.nix +++ b/lib/nixos/home-manager/modules/alacritty.nix @@ -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; diff --git a/lib/theme/default.nix b/lib/theme/default.nix new file mode 100644 index 00000000..f99d2a51 --- /dev/null +++ b/lib/theme/default.nix @@ -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"; + }; + }; +}