From 80b37887c2af35c6f5984df1cb046d318212586d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 4 Aug 2025 15:24:03 +0000
Subject: [PATCH] utterly-nord-plasma: migrate to by-name

utterly-nord-plasma: refactor package definitions and meta

utterly-nord-plasma: remove rec
---
 .../ut/utterly-nord-plasma/package.nix}       | 22 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  5 -----
 2 files changed, 9 insertions(+), 18 deletions(-)
 rename pkgs/{data/themes/utterly-nord-plasma/default.nix => by-name/ut/utterly-nord-plasma/package.nix} (82%)

diff --git a/pkgs/data/themes/utterly-nord-plasma/default.nix b/pkgs/by-name/ut/utterly-nord-plasma/package.nix
similarity index 82%
rename from pkgs/data/themes/utterly-nord-plasma/default.nix
rename to pkgs/by-name/ut/utterly-nord-plasma/package.nix
index b181ca18c566..6e27725a1c30 100644
--- a/pkgs/data/themes/utterly-nord-plasma/default.nix
+++ b/pkgs/by-name/ut/utterly-nord-plasma/package.nix
@@ -2,29 +2,25 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  breeze-icons,
-  kdeclarative,
-  kirigami,
-  plasma-framework,
-  plasma-workspace,
+  kdePackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "utterly-nord-plasma";
   version = "3.2";
 
   src = fetchFromGitHub {
     owner = "HimDek";
-    repo = pname;
+    repo = "utterly-nord-plasma";
     rev = "e513b4dfeddd587a34bfdd9ba6b1d1eac8ecadf5";
     hash = "sha256-moLgBFR+BgoiEBzV3y/LA6JZfLHrG1weL1+h8LN9ztA=";
   };
 
-  propagatedUserEnvPkgs = [
+  propagatedUserEnvPkgs = with kdePackages; [
     breeze-icons
     kdeclarative
     kirigami
-    plasma-framework
+    libplasma
     plasma-workspace
   ];
 
@@ -54,11 +50,11 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Plasma theme with Nordic Colors, transparency, blur and round edges for UI elements";
     homepage = "https://himdek.com/Utterly-Nord-Plasma/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.all;
-    maintainers = [ maintainers.romildo ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ romildo ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd14647a4149..df12cf5bc153 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11579,11 +11579,6 @@ with pkgs;
 
   tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { };
 
-  utterly-nord-plasma = kdePackages.callPackage ../data/themes/utterly-nord-plasma {
-    # renamed in KF6
-    plasma-framework = kdePackages.libplasma;
-  };
-
   whitesur-kde = kdePackages.callPackage ../data/themes/whitesur-kde { };
 
   xkeyboard_config = xkeyboard-config;