From 5ce17a639f8eeb704fd45f34a65357fccc3a12b4 Mon Sep 17 00:00:00 2001
From: Bart van der Braak <bart@vanderbraak.nl>
Date: Sat, 24 May 2025 15:46:43 +0200
Subject: [PATCH 1/2] Update flake to use 25.05

---
 nixos/flake.lock | 22 +++++++++++--------
 nixos/flake.nix  | 57 ++++++++++++++++++++++++------------------------
 2 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/nixos/flake.lock b/nixos/flake.lock
index 7f84575..612c5f8 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -23,14 +23,18 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-vH5mXxEvZeoGNkqKoCluhTGfoeXCZ1seYhC2pbMN0sg=",
-        "path": "/nix/store/zd5dgszslv09jzybcpf25gpl12s6r2d9-source",
-        "type": "path"
+        "lastModified": 1747953325,
+        "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
+        "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs_2": {
@@ -61,11 +65,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1748060564,
-        "narHash": "sha256-KTceiwnQm5MFAjtQtSp2/lkodwSd2jub/wCYfVGIFKI=",
+        "lastModified": 1748090150,
+        "narHash": "sha256-WrcGLv4Q94B2eG+jj5EckQfItR4zTAz/8uX2to4bU4g=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "1963b92737b62652fa85e1dfc57d5f4c6d28aea4",
+        "rev": "d25f7e7fc5a2ebcb4c41924b4755eec642e6f18d",
         "type": "github"
       },
       "original": {
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 5c68a28..431956e 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -2,38 +2,37 @@
   description = "Bart's NixOS Configuration";
 
   inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
     zen-browser.url = "github:0xc000022070/zen-browser-flake";
   };
 
-  outputs =
-    { nixpkgs, ... }@inputs:
-    {
-      nixosConfigurations = {
-        tongfang = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
-          modules = [
-            ./hardware/tongfang.nix
-            ./configuration.nix
-            ./users.nix
-            ./packages.nix
-            ./services.nix
-            ./modules/bootloader.nix
-            ./modules/fonts.nix
-          ];
-        };
-        qemu = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
-          modules = [
-            ./hardware/qemu.nix
-            ./modules/kde.nix
-            ./modules/configuration.nix
-            ./modules/display-manager.nix
-            ./modules/greeter.nix
-            ./modules/networking.nix
-            ./modules/nix-settings.nix
-            ./modules/users.nix
-          ];
-        };
+  outputs = { nixpkgs, ... }@inputs: {
+    nixosConfigurations = {
+      tongfang = nixpkgs.lib.nixosSystem {
+        specialArgs = { inherit inputs; };
+        modules = [
+          ./hardware/tongfang.nix
+          ./configuration.nix
+          ./users.nix
+          ./packages.nix
+          ./services.nix
+          ./modules/bootloader.nix
+          ./modules/fonts.nix
+        ];
+      };
+      qemu = nixpkgs.lib.nixosSystem {
+        specialArgs = { inherit inputs; };
+        modules = [
+          ./hardware/qemu.nix
+          ./modules/kde.nix
+          ./modules/configuration.nix
+          ./modules/display-manager.nix
+          ./modules/greeter.nix
+          ./modules/networking.nix
+          ./modules/nix-settings.nix
+          ./modules/users.nix
+        ];
       };
     };
+  };
 }

From 57cd8d8ff5bab392c1e7348d6525e4617b118c14 Mon Sep 17 00:00:00 2001
From: Bart van der Braak <bart@vanderbraak.nl>
Date: Sat, 24 May 2025 17:23:21 +0200
Subject: [PATCH 2/2] Update `nerd-fonts` to only include Jet Brains Mono

---
 nixos/modules/fonts.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/fonts.nix b/nixos/modules/fonts.nix
index bc81e47..0f0be9c 100644
--- a/nixos/modules/fonts.nix
+++ b/nixos/modules/fonts.nix
@@ -72,8 +72,7 @@ in {
     enableDefaultPackages = true;
     packages = with pkgs; [
       jetbrains-mono
-      nerdfonts
-      noto-fonts
+      noto-fonts.JetBrainsMono
       noto-fonts-emoji
       (makeAppleFont "sf-pro" "SF Pro Fonts.pkg" fontSources.sf-pro)
       (makeAppleFont "sf-compact" "SF Compact Fonts.pkg" fontSources.sf-compact)