From 0ae05b21da6a5880ce17f85bbaa0d693db798bbf Mon Sep 17 00:00:00 2001
From: Doloro1978 <doloroo@proton.me>
Date: Wed, 3 Jun 2026 14:58:40 +0100
Subject: [PATCH 1/6] feat(grimoire): desktop file

---
 pkgs/by-name/gr/grimorie/package.nix | 47 +++++++++++++++++-----------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/gr/grimorie/package.nix b/pkgs/by-name/gr/grimorie/package.nix
index 17da157..730edc8 100644
--- a/pkgs/by-name/gr/grimorie/package.nix
+++ b/pkgs/by-name/gr/grimorie/package.nix
@@ -14,6 +14,7 @@
   vpkmerge,
   sqlite,
   callPackage,
+  makeDesktopItem,
 }: let
   sources = callPackage ../../../../_sources/generated.nix {};
 
@@ -34,6 +35,14 @@
     fetcherVersion = 3;
     hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
   };
+
+  desktopItem = makeDesktopItem {
+    name = "grimoire";
+    exec = "$out/bin/grimoire %u";
+    desktopName = "Grimoire";
+    categories = ["Utility"];
+    MimeType = "x-scheme-handler/grimoire";
+  };
 in
   stdenv.mkDerivation {
     pname = "grimoire";
@@ -88,31 +97,33 @@ in
     '';
 
     installPhase = ''
-      runHook preInstall
+            runHook preInstall
 
-      mkdir -p $out/lib/grimoire
-      cp -r dist $out/lib/grimoire/dist
+            mkdir -p $out/lib/grimoire
+            cp -r dist $out/lib/grimoire/dist
 
-      mkdir -p $out/lib/grimoire/resources
-      cp -r resources/vpkmerge $out/lib/grimoire/resources/vpkmerge
-      echo '{"name":"grimoire","version":"${version}","main":"dist/main/index.js"}' \
-        > $out/lib/grimoire/package.json
+            mkdir -p $out/lib/grimoire/resources
+            cp -r resources/vpkmerge $out/lib/grimoire/resources/vpkmerge
+            echo '{"name":"grimoire","version":"${version}","main":"dist/main/index.js"}' \
+              > $out/lib/grimoire/package.json
 
-      cp -r node_modules $out/lib/grimoire/node_modules
+            cp -r node_modules $out/lib/grimoire/node_modules
 
-      rm -rf "$out/lib/grimoire/node_modules/@grimoire"
+            rm -rf "$out/lib/grimoire/node_modules/@grimoire"
 
-      find "$out/lib/grimoire/node_modules" -type l | while read -r link; do
-        [ -e "$link" ] || rm -f "$link"
-      done
+            find "$out/lib/grimoire/node_modules" -type l | while read -r link; do
+              [ -e "$link" ] || rm -f "$link"
+            done
 
-      mkdir -p $out/bin
-      makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \
-        --add-flags "$out/lib/grimoire" \
-        --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
-        --set NODE_ENV production
+            mkdir -p $out/bin
+            makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \
+              --add-flags "$out/lib/grimoire" \
+              --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
+              --set NODE_ENV production
 
-      runHook postInstall
+      cp ${desktopItem}/share/applications/grimoire.desktop $out/share/applications/grimoire.desktop
+
+            runHook postInstall
     '';
 
     meta = {
-- 
2.54.0


From 438c343f6552489196c7dde49429d45e3f955fcd Mon Sep 17 00:00:00 2001
From: Doloro1978 <doloroo@proton.me>
Date: Wed, 3 Jun 2026 15:01:59 +0100
Subject: [PATCH 2/6] fix: lint

---
 pkgs/by-name/gr/grimorie/package.nix | 36 ++++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/gr/grimorie/package.nix b/pkgs/by-name/gr/grimorie/package.nix
index 730edc8..cc1e4c8 100644
--- a/pkgs/by-name/gr/grimorie/package.nix
+++ b/pkgs/by-name/gr/grimorie/package.nix
@@ -97,33 +97,33 @@ in
     '';
 
     installPhase = ''
-            runHook preInstall
+      runHook preInstall
 
-            mkdir -p $out/lib/grimoire
-            cp -r dist $out/lib/grimoire/dist
+      mkdir -p $out/lib/grimoire
+      cp -r dist $out/lib/grimoire/dist
 
-            mkdir -p $out/lib/grimoire/resources
-            cp -r resources/vpkmerge $out/lib/grimoire/resources/vpkmerge
-            echo '{"name":"grimoire","version":"${version}","main":"dist/main/index.js"}' \
-              > $out/lib/grimoire/package.json
+      mkdir -p $out/lib/grimoire/resources
+      cp -r resources/vpkmerge $out/lib/grimoire/resources/vpkmerge
+      echo '{"name":"grimoire","version":"${version}","main":"dist/main/index.js"}' \
+      > $out/lib/grimoire/package.json
 
-            cp -r node_modules $out/lib/grimoire/node_modules
+      cp -r node_modules $out/lib/grimoire/node_modules
 
-            rm -rf "$out/lib/grimoire/node_modules/@grimoire"
+      rm -rf "$out/lib/grimoire/node_modules/@grimoire"
 
-            find "$out/lib/grimoire/node_modules" -type l | while read -r link; do
-              [ -e "$link" ] || rm -f "$link"
-            done
+      find "$out/lib/grimoire/node_modules" -type l | while read -r link; do
+      [ -e "$link" ] || rm -f "$link"
+      done
 
-            mkdir -p $out/bin
-            makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \
-              --add-flags "$out/lib/grimoire" \
-              --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
-              --set NODE_ENV production
+      mkdir -p $out/bin
+      makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \
+      --add-flags "$out/lib/grimoire" \
+      --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
+      --set NODE_ENV production
 
       cp ${desktopItem}/share/applications/grimoire.desktop $out/share/applications/grimoire.desktop
 
-            runHook postInstall
+      runHook postInstall
     '';
 
     meta = {
-- 
2.54.0


From 25a00efd634c62051ca76ec531f98201668e0e43 Mon Sep 17 00:00:00 2001
From: Doloro1978 <doloroo@proton.me>
Date: Wed, 3 Jun 2026 15:03:21 +0100
Subject: [PATCH 3/6] fix: mime types

---
 pkgs/by-name/gr/grimorie/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gr/grimorie/package.nix b/pkgs/by-name/gr/grimorie/package.nix
index cc1e4c8..ce29e46 100644
--- a/pkgs/by-name/gr/grimorie/package.nix
+++ b/pkgs/by-name/gr/grimorie/package.nix
@@ -41,7 +41,7 @@
     exec = "$out/bin/grimoire %u";
     desktopName = "Grimoire";
     categories = ["Utility"];
-    MimeType = "x-scheme-handler/grimoire";
+    mimeTypes = ["x-scheme-handler/grimoire"];
   };
 in
   stdenv.mkDerivation {
-- 
2.54.0


From 2e246ef435f11d1beb095df58c0769fa5c9f82eb Mon Sep 17 00:00:00 2001
From: Doloro1978 <doloroo@proton.me>
Date: Wed, 3 Jun 2026 15:09:45 +0100
Subject: [PATCH 4/6] fix

---
 pkgs/by-name/gr/grimorie/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gr/grimorie/package.nix b/pkgs/by-name/gr/grimorie/package.nix
index ce29e46..3d6cec4 100644
--- a/pkgs/by-name/gr/grimorie/package.nix
+++ b/pkgs/by-name/gr/grimorie/package.nix
@@ -38,7 +38,7 @@
 
   desktopItem = makeDesktopItem {
     name = "grimoire";
-    exec = "$out/bin/grimoire %u";
+    exec = "/bin/grimoire %u";
     desktopName = "Grimoire";
     categories = ["Utility"];
     mimeTypes = ["x-scheme-handler/grimoire"];
-- 
2.54.0


From 8274be821da59319d3b48decc92a57cda0955557 Mon Sep 17 00:00:00 2001
From: Doloro1978 <doloroo@proton.me>
Date: Wed, 3 Jun 2026 15:14:00 +0100
Subject: [PATCH 5/6] fix i hope

---
 pkgs/by-name/gr/grimorie/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gr/grimorie/package.nix b/pkgs/by-name/gr/grimorie/package.nix
index 3d6cec4..74c9fd7 100644
--- a/pkgs/by-name/gr/grimorie/package.nix
+++ b/pkgs/by-name/gr/grimorie/package.nix
@@ -121,7 +121,7 @@ in
       --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
       --set NODE_ENV production
 
-      cp ${desktopItem}/share/applications/grimoire.desktop $out/share/applications/grimoire.desktop
+      cp -r ${desktopItem}/share/applications/grimoire.desktop $out/share/applications/grimoire.desktop
 
       runHook postInstall
     '';
-- 
2.54.0


From e8147f898d645b7521d951f6892f1fe6c2d1e94b Mon Sep 17 00:00:00 2001
From: Doloro1978 <doloroo@proton.me>
Date: Wed, 3 Jun 2026 16:37:19 +0100
Subject: [PATCH 6/6] using desktopfile hook now

---
 pkgs/by-name/gr/grimorie/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/grimorie/package.nix b/pkgs/by-name/gr/grimorie/package.nix
index 74c9fd7..6667070 100644
--- a/pkgs/by-name/gr/grimorie/package.nix
+++ b/pkgs/by-name/gr/grimorie/package.nix
@@ -15,6 +15,7 @@
   sqlite,
   callPackage,
   makeDesktopItem,
+  copyDesktopItems,
 }: let
   sources = callPackage ../../../../_sources/generated.nix {};
 
@@ -58,8 +59,11 @@ in
       pkg-config
       makeWrapper
       electron_40
+      copyDesktopItems
     ];
 
+    desktopItems = [desktopItem];
+
     buildInputs = [
       sqlite
     ];
@@ -121,8 +125,6 @@ in
       --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
       --set NODE_ENV production
 
-      cp -r ${desktopItem}/share/applications/grimoire.desktop $out/share/applications/grimoire.desktop
-
       runHook postInstall
     '';
 
-- 
2.54.0