diff --git a/flake.lock b/flake.lock index 113b7c0..fa2e2e5 100644 --- a/flake.lock +++ b/flake.lock @@ -113,6 +113,24 @@ "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -127,9 +145,9 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1692799911, @@ -145,9 +163,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1685518550, @@ -163,6 +181,27 @@ "type": "github" } }, + "fonts": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1694323018, + "narHash": "sha256-qjqjd4X79FJyv+JcULm5AQeXdtrg/+zGKvjXBcHkqT8=", + "owner": "artemist", + "repo": "fonts", + "rev": "a5002a6881b40efbc91829a990a8e11983105db9", + "type": "github" + }, + "original": { + "owner": "artemist", + "repo": "fonts", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -232,7 +271,7 @@ "crane": "crane", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ], @@ -320,7 +359,7 @@ "nixvim": { "inputs": { "beautysh": "beautysh", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], @@ -370,7 +409,7 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "gitignore": "gitignore_2", "nixpkgs": [ "nixvim", @@ -441,6 +480,7 @@ }, "root": { "inputs": { + "fonts": "fonts", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "nixos-hardware": "nixos-hardware", @@ -558,6 +598,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1678901627, @@ -590,7 +645,7 @@ }, "utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1692799911, diff --git a/flake.nix b/flake.nix index caebb2a..6f8b58a 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,11 @@ nixos-hardware.url = "github:nixos/nixos-hardware"; utils.url = "github:numtide/flake-utils"; + fonts = { + url = "github:artemist/fonts"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + lanzaboote = { url = "github:nix-community/lanzaboote/v0.3.0"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/sets/fonts.nix b/sets/fonts.nix index 0fc6309..4edaa41 100644 --- a/sets/fonts.nix +++ b/sets/fonts.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: { fonts = { @@ -32,32 +32,33 @@ ''; enableDefaultPackages = true; - packages = with pkgs; [ - # MS fonts - cantarell-fonts - corefonts + packages = with pkgs; + [ + # MS fonts + cantarell-fonts + corefonts - # Mono fonts - dejavu_fonts - fira-code - iosevka - source-code-pro - source-sans-pro + # Mono fonts + dejavu_fonts + fira-code + iosevka + source-code-pro + source-sans-pro - # UI fonts - b612 - inter - roboto + # UI fonts + b612 + inter + roboto - # Large multilingual fonts - fira-go - noto-fonts - noto-fonts-cjk - noto-fonts-emoji - noto-fonts-extra + # Large multilingual fonts + fira-go + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + noto-fonts-extra - # Weird symbols - (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) - ]; + # Weird symbols + (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) + ] ++ (builtins.attrValues inputs.fonts.packages.${pkgs.system}); }; }