merge + fix nixpkgs versions

system-modules/fonts.nix

@@ -1,9 +1,4 @@
-{
-  pkgs,
-  # pkgs-unstable,
-  rice,
-  ...
-}:
+{ pkgs, rice, ... }:
 {
   fonts.packages = with pkgs; [
     noto-fonts
@@ -12,10 +7,14 @@
     noto-fonts-emoji
     newcomputermodern
     atkinson-hyperlegible
-    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+    nerd-fonts.jetbrains-mono
+    nerd-fonts.zed-mono
+    nerd-fonts.profont
+    nerd-fonts.proggy-clean-tt
+    nerd-fonts.heavy-data
+    nerd-fonts._3270
   ] ++ (with rice.font; [
     base.package
     code.package
-  # ]) ++ (with pkgs-unstable; [
   ]);
 }

system-modules/hardware-configuration.nix

@@ -46,7 +46,7 @@
   } else {};
 
   hardware.graphics.extraPackages = if host == "NxXPS" then with pkgs; [
-    (if (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") then vaapiIntel else intel-vaapi-driver)
+    (if (lib.versionOlder (lib.versions.majorMinor lib.version) "25.05") then vaapiIntel else intel-vaapi-driver)
     libvdpau-va-gl
     intel-media-driver
   ] else [];