Update Sweet theme

flake.lock

@@ -36,11 +36,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717786204,
-        "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
+        "lastModified": 1717974879,
+        "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
+        "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
         "type": "github"
       },
       "original": {
@@ -58,6 +58,7 @@
         "sweet-ambar-blue": "sweet-ambar-blue",
         "sweet-ambar-blue-dark": "sweet-ambar-blue-dark",
         "sweet-folders": "sweet-folders",
+        "sweet-kde": "sweet-kde",
         "wallpaper-engine-plasma5-plugin": "wallpaper-engine-plasma5-plugin",
         "wallpaper-engine-plasma6-plugin": "wallpaper-engine-plasma6-plugin",
         "yorha-grub-theme": "yorha-grub-theme",
@@ -114,6 +115,23 @@
         "url": "https://github.com/EliverLara/Sweet-folders"
       }
     },
+    "sweet-kde": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1712792363,
+        "narHash": "sha256-Pp/cRLDWsOV9fFQa8KC/a52Pu3bHZmFGoklbHh5g5BI=",
+        "ref": "plasma6",
+        "rev": "f3b13a7d55223ddd7aa66000ee8967a085ad6909",
+        "revCount": 31,
+        "type": "git",
+        "url": "https://github.com/EliverLara/Sweet-kde"
+      },
+      "original": {
+        "ref": "plasma6",
+        "type": "git",
+        "url": "https://github.com/EliverLara/Sweet-kde"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,

flake.nix

@@ -20,6 +20,10 @@
       flake = false;
       url = "git+https://github.com/EliverLara/Sweet-folders";
     };
+    sweet-kde = {
+      flake = false;
+      url = "git+https://github.com/EliverLara/Sweet-kde?ref=plasma6";
+    };
     wallpaper-engine-plasma5-plugin = {
       flake = false;
       url = "git+https://github.com/catsout/wallpaper-engine-kde-plugin?submodules=1";

packages/sweet-ambar-blue.nix

@@ -10,14 +10,12 @@ pkgs.stdenv.mkDerivation {
     cp -r ${sweet-ambar-blue}/ sweet-ambar-blue/
     cp -r ${sweet-ambar-blue-dark}/ sweet-ambar-blue-dark/
     cp -r ${sweet-folders}/ sweet-folders/
+    cp -r ${sweet-kde}/ sweet-kde/
     chmod -R +w ./
   '';
   installPhase = ''
     runHook preInstall
 
-    # Start in theme folder
-    cd sweet-ambar-blue/
-    
     # Remove redundant files
     rm -rf */.gitignore
     rm -rf */Art
@@ -33,8 +31,16 @@ pkgs.stdenv.mkDerivation {
     rm -rf */gtk-4.0/{apps,widgets,*.scss}
     rm -rf */xfwm4/{assets,render_assets.fish}
     
+    # Install icons
+    mkdir -p $out/share/icons/
+    mv candy-icons/ $out/share/icons/candy-icons/
+    mv sweet-ambar-blue-dark/kde/cursors/Sweet-cursors/ $out/share/icons/Sweet-cursors/
+    mv sweet-folders/Sweet-Rainbow/ $out/share/icons/Sweet-Rainbow/
+
     # Adjust KDE relevant folder structure
-    cd kde/
+    cd sweet-ambar-blue/kde/
+    mkdir plasma/desktoptheme/
+    mv -v ../../sweet-kde/ plasma/desktoptheme/Sweet-Ambar-Blue/
     mv -v aurorae/ aurorae-temp/
     mkdir aurorae/
     mv -v aurorae-temp/ aurorae/themes/
@@ -42,24 +48,15 @@ pkgs.stdenv.mkDerivation {
     mv -v kvantum/ Kvantum/
     rm -rf plasma/look-and-feel/Sweet-Ambar-Blue/
     mv -v plasma/look-and-feel/Plasma6/Sweet-Ambar-Blue/ plasma/look-and-feel/Sweet-Ambar-Blue/
-    mkdir plasma/desktoptheme/
-    cp -r plasma/look-and-feel/Sweet-Ambar-Blue/ plasma/desktoptheme/Sweet-Ambar-Blue/
     rm -r plasma/look-and-feel/Plasma6/
     rm -rf plasma/look-and-feel/*/contents/{logout,osd,components}
-    rm -rf plasma/desktoptheme/*/contents/{defaults,splash,previews}
 
-    mkdir -p $out/share/
-    mv * $out/share/
-    cd ../
-    rm -r kde/
-    cp -rv ./ $out/share/themes/
-
-    # Return to parent folder and move icons
-    cd ../
-    mkdir $out/share/icons/
-    mv candy-icons/ $out/share/icons/candy-icons/
-    mv sweet-ambar-blue-dark/kde/cursors/Sweet-cursors/ $out/share/icons/Sweet-cursors/
-    mv sweet-folders/Sweet-Rainbow/ $out/share/icons/Sweet-Rainbow/
+    # Install theme
+    mv -v * $out/share/
+    cd ../../
+    rm -r sweet-ambar-blue/kde/
+    mkdir $out/share/themes/
+    mv -v sweet-ambar-blue/ $out/share/themes/Sweet-Ambar-Blue/
 
     # Replace duplicate files with symbolic links to the first file in each set of duplicates
     jdupes --quiet --link-soft --recurse $out/share/