diff --git a/flake.lock b/flake.lock index b87f1d8..afc149d 100644 --- a/flake.lock +++ b/flake.lock @@ -289,15 +289,15 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1708808339, - "narHash": "sha256-D0mBcKoDjL6D0rSp1Xw0X5PsHDDvuzV77R0FcLM6RoE=", - "owner": "libc", + "lastModified": 1765841187, + "narHash": "sha256-EDNulMxDxJfhk9cJdYv0KPU1hAKrTcMbSFUcOFhgBws=", + "owner": "Doloro1978", "repo": "nix-nerd-fonts-patcher", - "rev": "2eb143b6b9fa0a937b267233c374bb403410a09a", + "rev": "eaf93a869699796be559fbaa2b4351c53d7f4cf2", "type": "github" }, "original": { - "owner": "libc", + "owner": "Doloro1978", "repo": "nix-nerd-fonts-patcher", "type": "github" } diff --git a/flake.nix b/flake.nix index 338459f..aa96dcd 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ nixpkgs-gamescope = { url = "github:Nixos/nixpkgs?rev=8fcb6f1c4948305af52d19f887b89011ee2c080d"; }; - font-patcher.url = "github:libc/nix-nerd-fonts-patcher"; + font-patcher.url = "github:Doloro1978/nix-nerd-fonts-patcher"; }; outputs = inputs@{ diff --git a/hosts/doloro-wsl/nixos.nix b/hosts/doloro-wsl/nixos.nix index 790f0aa..24e513d 100644 --- a/hosts/doloro-wsl/nixos.nix +++ b/hosts/doloro-wsl/nixos.nix @@ -26,12 +26,11 @@ 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; - }) + googlesans-code + # (inputs.font-patcher.lib.patchFont { + # font = pkgs.googlesans-code; + # name = "Google Sans Code Nerd Font"; + # }) nerd-fonts.caskaydia-cove nerd-fonts.noto noto-fonts-cjk-sans diff --git a/hosts/doloro/nixos.nix b/hosts/doloro/nixos.nix index 12e7924..727f5f9 100644 --- a/hosts/doloro/nixos.nix +++ b/hosts/doloro/nixos.nix @@ -151,21 +151,25 @@ in 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 - ]; + packages = + with pkgs; + [ + nerd-fonts.jetbrains-mono + material-design-icons + material-symbols + googlesans-code + nerd-fonts.caskaydia-cove + nerd-fonts.noto + noto-fonts-cjk-sans + noto-fonts-cjk-serif + ] + ++ [ + (inputs.font-patcher.lib.patchFont { + font = "${pkgs.googlesans-code}/share/fonts/googlesans-code/GoogleSansCode[wght].ttf"; + name = "Google Sans Code Nerd Font"; + inherit system; + }) + ]; fontDir.enable = true; }; diff --git a/modules/hyprland/home.nix b/modules/hyprland/home.nix index 1f04e1f..67f33a8 100644 --- a/modules/hyprland/home.nix +++ b/modules/hyprland/home.nix @@ -50,7 +50,7 @@ in main = { term = "xterm-256color"; - font = "CaskaydiaCove Nerd Font Mono:size=12"; + font = "Google Sans Code Nerd Font:size=11"; }; mouse = {