From 6ccfdadeb5370d70eae20b2d78093c42ad18133a Mon Sep 17 00:00:00 2001
From: Emile Clark-Boman <eclarkboman@gmail.com>
Date: Sat, 19 Jul 2025 23:19:15 +1000
Subject: [PATCH] Progress nixpkgs to 25.05

Update nerdfont naming convention accordingly
---
 flake.lock                   |  8 ++++----
 flake.nix                    |  3 +--
 hosts/lolcathost/default.nix | 34 +++++++++++++++++++---------------
 hosts/myputer/default.nix    |  2 +-
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9e28c75..72a6d80 100755
--- a/flake.lock
+++ b/flake.lock
@@ -592,16 +592,16 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1739357830,
-        "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=",
+        "lastModified": 1752620740,
+        "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a",
+        "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index e31b8ac..85323f7 100755
--- a/flake.nix
+++ b/flake.nix
@@ -2,8 +2,7 @@
   description = "Emile's Nix Dotfiles";
 
   inputs = {
-    # nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
 
     #home-manager = {
     #  url = "github:nix-community/home-manager";
diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix
index a9616a3..2f99758 100755
--- a/hosts/lolcathost/default.nix
+++ b/hosts/lolcathost/default.nix
@@ -4,8 +4,8 @@
   ...
 }: let
   home-manager = builtins.fetchTarball {
-    url = "https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz";
-    sha256 = "0gjfa3bv0m0kymxqla9iih11gjb6czyj942v34pyc7xy4qsx898k";
+    url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz";
+    sha256 = "0z94i2ig7wcm63fp1wkpp6r4458g2bj3r7ijlfapxihqybpgvng5";
   };
 in {
   imports = [
@@ -351,20 +351,24 @@ in {
   # ----- FONTS -----
   fonts = {
     enableDefaultPackages = true; # no clue what this line does tbh
-    packages = with pkgs; [
-      #(nerdfonts.override {
-      #  fonts = [
-      #    "Cousine"
-      #    "Iosevka"
-      #     "JetBrainsMono"
-      #   ];
-      # })
-      nerdfonts
-      geist-font # for my hyprlock theme
+    packages = with pkgs;
+      [
+        #(nerdfonts.override {
+        #  fonts = [
+        #    "Cousine"
+        #    "Iosevka"
+        #     "JetBrainsMono"
+        #   ];
+        # })
+        # nerdfonts
+        geist-font # for my hyprlock theme
 
-      # texlive maintains a noto-emoji flake
-      texlivePackages.noto-emoji
-    ];
+        # texlive maintains a noto-emoji flake
+        texlivePackages.noto-emoji
+      ]
+      ++ builtins.filter lib.attrsets.isDerivation (
+        builtins.attrValues pkgs.nerd-fonts
+      );
 
     # TODO: change my default fonts
     fontconfig = {
diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix
index 337501f..59e350c 100755
--- a/hosts/myputer/default.nix
+++ b/hosts/myputer/default.nix
@@ -7,7 +7,7 @@
 }: let
   home-manager = builtins.fetchTarball {
     url = "https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz";
-    sha256 = "1mwq9mzyw1al03z4q2ifbp6d0f0sx9f128xxazwrm62z0rcgv4na";
+    sha256 = "0z94i2ig7wcm63fp1wkpp6r4458g2bj3r7ijlfapxihqybpgvng5";
   };
 in {
   imports = [