diff --git a/flake.lock b/flake.lock index ee3d8b3..e64201f 100755 --- a/flake.lock +++ b/flake.lock @@ -886,16 +886,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index c8968fe..798b1c2 100755 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "pagedMov's NixOS and Home Manager configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; hypr-contrib.url = "github:hyprwm/contrib"; hyprpicker.url = "github:hyprwm/hyprpicker"; stylix.url = "github:danth/stylix"; diff --git a/modules/home/environment/gtk.nix b/modules/home/environment/gtk.nix index e2bde35..2fa4607 100755 --- a/modules/home/environment/gtk.nix +++ b/modules/home/environment/gtk.nix @@ -7,9 +7,9 @@ fonts.fontconfig.enable = true; home.packages = with pkgs; [ - (nerdfonts.override { - fonts = [ "JetBrainsMono" "CascadiaCode" "NerdFontsSymbolsOnly" ]; - }) + nerd-fonts.jetbrains-mono + nerd-fonts.symbols-only + cascadia-code ]; gtk = { diff --git a/modules/home/environment/stylixhome.nix b/modules/home/environment/stylixhome.nix index ea2aa8e..3716f77 100755 --- a/modules/home/environment/stylixhome.nix +++ b/modules/home/environment/stylixhome.nix @@ -31,15 +31,15 @@ in { }; fonts = { monospace = { - package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }; + package = pkgs.nerd-fonts.jetbrains-mono; name = "JetBrains Mono Nerd Font"; }; sansSerif = { - package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }; + package = pkgs.nerd-fonts.jetbrains-mono; name = "JetBrains Mono Nerd Font"; }; serif = { - package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }; + package = pkgs.nerd-fonts.jetbrains-mono; name = "JetBrains Mono Nerd Font"; }; sizes = { diff --git a/modules/sys/sysenv/stylix.nix b/modules/sys/sysenv/stylix.nix index 8db93bb..84e8b99 100755 --- a/modules/sys/sysenv/stylix.nix +++ b/modules/sys/sysenv/stylix.nix @@ -33,15 +33,15 @@ in { }; fonts = { monospace = { - package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }; + package = pkgs.nerd-fonts.jetbrains-mono; name = "JetBrains Mono Nerd Font"; }; sansSerif = { - package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }; + package = pkgs.nerd-fonts.jetbrains-mono; name = "JetBrains Mono Nerd Font"; }; serif = { - package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }; + package = pkgs.nerd-fonts.jetbrains-mono; name = "JetBrains Mono Nerd Font"; }; sizes = {