From 220b4987fef9d56ea7dfbdf0ac7f569bd16191ea Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 25 Nov 2025 21:17:52 +0100
Subject: [PATCH] treewide: package renaming for 25.11

---
 machines/core/core.nix                |  2 +-
 modules/hardware/graphics/default.nix | 12 +++---------
 modules/system/fonts/default.nix      |  3 +--
 profiles/desktop-apps/default.nix     |  4 ++--
 profiles/development/default.nix      |  2 +-
 profiles/gaming/default.nix           |  6 +++---
 profiles/media/default.nix            |  3 +--
 profiles/meeting/default.nix          |  2 +-
 profiles/usb-iso/default.nix          |  4 ++--
 9 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/machines/core/core.nix b/machines/core/core.nix
index b6f691e..bf21520 100644
--- a/machines/core/core.nix
+++ b/machines/core/core.nix
@@ -6,12 +6,12 @@
     bind # dig
     borgbackup
     cryptsetup
+    delta
     fd # find replacement
     file
     fzf
     gettext
     git
-    gitAndTools.delta
     gptfdisk
     htop
     jq
diff --git a/modules/hardware/graphics/default.nix b/modules/hardware/graphics/default.nix
index ba01f81..4f9befe 100644
--- a/modules/hardware/graphics/default.nix
+++ b/modules/hardware/graphics/default.nix
@@ -31,23 +31,17 @@ in
       # Intel GPU
       (lib.mkIf (cfg.cpuFlavor == "intel") {
         nixpkgs.config.packageOverrides = pkgs: {
-          vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+          intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
         };
         hardware.graphics.extraPackages = with pkgs; [
           intel-media-driver # LIBVA_DRIVER_NAME=iHD
-          vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
-          vaapiVdpau
+          intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
+          libva-vdpau-driver
           libvdpau-va-gl
         ];
       })
 
       (lib.mkIf (cfg.cpuFlavor == "amd") {
-        hardware.graphics.extraPackages = with pkgs; [
-          amdvlk
-        ];
-        hardware.graphics.extraPackages32 = with pkgs; [
-          driversi686Linux.amdvlk
-        ];
       })
     ]
   );
diff --git a/modules/system/fonts/default.nix b/modules/system/fonts/default.nix
index 24d3412..830a81a 100644
--- a/modules/system/fonts/default.nix
+++ b/modules/system/fonts/default.nix
@@ -40,8 +40,7 @@ in
           noto-fonts
           noto-fonts-cjk-sans
           noto-fonts-color-emoji
-          noto-fonts-extra
-          ubuntu_font_family
+          ubuntu-classic
           unifont # unicode fallback
         ]
         ++ cfg.additionalFonts;
diff --git a/profiles/desktop-apps/default.nix b/profiles/desktop-apps/default.nix
index 95d1f0b..19f5638 100644
--- a/profiles/desktop-apps/default.nix
+++ b/profiles/desktop-apps/default.nix
@@ -18,7 +18,7 @@ in
       firefox
       (gimp-with-plugins.override {
         plugins = with gimpPlugins; [
-          resynthesizer # disabled because broken with python3
+          # resynthesizer # disabled because broken with python3
         ];
       })
       kdePackages.ghostwriter
@@ -34,7 +34,7 @@ in
       })
       newsflash
       rhythmbox
-      tdesktop
+      telegram-desktop
       thunderbird
       vlc
       wayvnc
diff --git a/profiles/development/default.nix b/profiles/development/default.nix
index cc5e74a..1d0afa0 100644
--- a/profiles/development/default.nix
+++ b/profiles/development/default.nix
@@ -36,7 +36,7 @@ in
           pandas
           pillow
           plotly
-          scikitlearn
+          scikit-learn
           scipy
           tqdm # progressbar in pandas
           wheel # python development
diff --git a/profiles/gaming/default.nix b/profiles/gaming/default.nix
index 3712ffc..51d70ec 100644
--- a/profiles/gaming/default.nix
+++ b/profiles/gaming/default.nix
@@ -17,14 +17,14 @@ in
       blobby
       discord
       gamemode
-      minetest
+      luanti
       moonlight-qt # steam-link stream
       openttd
       prismlauncher # replace minecraft
-      superTuxKart
-      steam
       SDL
       SDL2
+      steam
+      superTuxKart
       wine
       winetricks
     ];
diff --git a/profiles/media/default.nix b/profiles/media/default.nix
index 89b17e6..ca91470 100644
--- a/profiles/media/default.nix
+++ b/profiles/media/default.nix
@@ -26,7 +26,6 @@ in
       mediaelch # video sorting
       metadata-cleaner # mat2-gui
       mp3gain # audio volume
-      mp3splt # splitting mp3 files
       mp3val # audio validation
       pdfgrep # grep in pdfs
       unstable.pdfsam-basic # pdf editing
@@ -35,7 +34,7 @@ in
       puddletag # audio tagging
       shotwell # photo management
       sonixd # cloud-music-player
-      soundkonverter # audio converter
+      soundconverter # audio converter
       varia # download
       (yt-dlp.override { withAlias = true; }) # video download
     ];
diff --git a/profiles/meeting/default.nix b/profiles/meeting/default.nix
index 99656d9..24fb118 100644
--- a/profiles/meeting/default.nix
+++ b/profiles/meeting/default.nix
@@ -17,7 +17,7 @@ in
       element-desktop
       fractal
       mumble
-      teamspeak5_client
+      teamspeak6-client
     ];
   };
 }
diff --git a/profiles/usb-iso/default.nix b/profiles/usb-iso/default.nix
index bc66209..2ce961a 100644
--- a/profiles/usb-iso/default.nix
+++ b/profiles/usb-iso/default.nix
@@ -15,10 +15,10 @@ in
   config = lib.mkIf cfg.enable {
     # binary blobs are needed for ventoy
     nixpkgs.config.permittedInsecurePackages = [
-      "ventoy-1.1.05"
+      "ventoy-1.1.07"
     ];
     environment.systemPackages = with pkgs; [
-      ventoy-bin-full # general
+      ventoy-full # general
       woeusb-ng # windows
     ];
   };