diff --git a/flake.lock b/flake.lock index 15c45f6..b87f1d8 100644 --- a/flake.lock +++ b/flake.lock @@ -284,6 +284,24 @@ "type": "github" } }, + "font-patcher": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1708808339, + "narHash": "sha256-D0mBcKoDjL6D0rSp1Xw0X5PsHDDvuzV77R0FcLM6RoE=", + "owner": "libc", + "repo": "nix-nerd-fonts-patcher", + "rev": "2eb143b6b9fa0a937b267233c374bb403410a09a", + "type": "github" + }, + "original": { + "owner": "libc", + "repo": "nix-nerd-fonts-patcher", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -430,7 +448,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" @@ -684,7 +702,7 @@ "inputs": { "flake-parts": "flake-parts", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1765325056, @@ -719,7 +737,7 @@ "nikkuss-pkgs": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1765303174, @@ -752,7 +770,7 @@ }, "nix-warez": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "dir": "blender", @@ -773,7 +791,7 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1765376994, @@ -792,18 +810,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", - "type": "github" + "lastModified": 1704008649, + "narHash": "sha256-rGPSWjXTXTurQN9beuHdyJhB8O761w1Zc5BqSSmHvoM=", + "path": "/nix/store/kh5mw1hsalj27ha1wfvksljxyaikcmyb-source", + "rev": "d44d59d2b5bd694cd9d996fd8c51d03e3e9ba7f7", + "type": "path" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-gamescope": { @@ -823,6 +838,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f61125a668a320878494449750330ca58b78c557", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1765270179, "narHash": "sha256-g2a4MhRKu4ymR4xwo+I+auTknXt/+j37Lnf0Mvfl1rE=", @@ -838,7 +869,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1764897201, "narHash": "sha256-428X4sppU6k+tF2vxTy726E5BxbtoxoTRP+1FBbXqvM=", @@ -854,7 +885,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1733808091, "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", @@ -869,7 +900,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1764950072, "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", @@ -885,7 +916,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1765186076, "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", @@ -901,7 +932,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1765472234, "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", @@ -917,7 +948,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1764950072, "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", @@ -1026,6 +1057,7 @@ "root": { "inputs": { "disko": "disko", + "font-patcher": "font-patcher", "home-manager": "home-manager", "hyprland": "hyprland", "neovim-nightly-overlay": "neovim-nightly-overlay", @@ -1033,7 +1065,7 @@ "nix-meow": "nix-meow", "nix-warez": "nix-warez", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-gamescope": "nixpkgs-gamescope", "nixvim": "nixvim", "quickshell": "quickshell", @@ -1047,7 +1079,7 @@ "inputs": { "crane": "crane", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1765636609, @@ -1085,7 +1117,7 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "systems": "systems_5" }, "locked": { diff --git a/flake.nix b/flake.nix index 6cc935f..338459f 100644 --- a/flake.nix +++ b/flake.nix @@ -47,6 +47,7 @@ nixpkgs-gamescope = { url = "github:Nixos/nixpkgs?rev=8fcb6f1c4948305af52d19f887b89011ee2c080d"; }; + font-patcher.url = "github:libc/nix-nerd-fonts-patcher"; }; outputs = inputs@{ diff --git a/hosts/doloro-wsl/nixos.nix b/hosts/doloro-wsl/nixos.nix index 7d55bcf..790f0aa 100644 --- a/hosts/doloro-wsl/nixos.nix +++ b/hosts/doloro-wsl/nixos.nix @@ -20,6 +20,25 @@ startAgent = true; }; }; + fonts = { + enableDefaultPackages = true; + packages = with pkgs; [ + nerd-fonts.jetbrains-mono + material-design-icons + material-symbols + (inputs.font-patcher.lib.patchFont { + font = pkgs.googlesans-code; + name = "Google Sans Code Nerd Font - Regular"; + subfamily = "Regular"; + inherit system; + }) + nerd-fonts.caskaydia-cove + nerd-fonts.noto + noto-fonts-cjk-sans + noto-fonts-cjk-serif + ]; + fontDir.enable = true; + }; networking.dhcpcd.enable = lib.mkOverride 0 false; boot.loader.grub.enable = lib.mkOverride 0 false; wsl = { diff --git a/hosts/doloro/nixos.nix b/hosts/doloro/nixos.nix index 611ff21..12e7924 100644 --- a/hosts/doloro/nixos.nix +++ b/hosts/doloro/nixos.nix @@ -155,6 +155,12 @@ in nerd-fonts.jetbrains-mono material-design-icons material-symbols + (inputs.font-patcher.lib.patchFont { + font = pkgs.googlesans-code; + name = "Google Sans Code Nerd Font - Regular"; + subfamily = "Regular"; + inherit system; + }) nerd-fonts.caskaydia-cove nerd-fonts.noto noto-fonts-cjk-sans