feat(grimoire): desktop file

_sources/generated.json

@@ -116,12 +116,12 @@
             "name": null,
             "owner": "Slush97",
             "repo": "grimoire",
-            "rev": "v1.23.0",
-            "sha256": "sha256-GY1J/guggCc4fyEQKUoEHmRC8hMcSg6gBKU0maEYSPE=",
+            "rev": "v1.14.2",
+            "sha256": "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=",
             "sparseCheckout": [],
             "type": "github"
         },
-        "version": "v1.23.0"
+        "version": "v1.14.2"
     },
     "neovide": {
         "cargoLock": {

_sources/generated.nix

@@ -69,13 +69,13 @@
   };
   grimoire = {
     pname = "grimoire";
-    version = "v1.23.0";
+    version = "v1.14.2";
     src = fetchFromGitHub {
       owner = "Slush97";
       repo = "grimoire";
-      rev = "v1.23.0";
+      rev = "v1.14.2";
       fetchSubmodules = false;
-      sha256 = "sha256-GY1J/guggCc4fyEQKUoEHmRC8hMcSg6gBKU0maEYSPE=";
+      sha256 = "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=";
     };
   };
   neovide = {

pkgs/by-name/gr/grimorie/package.nix

@@ -15,7 +15,6 @@
   sqlite,
   callPackage,
   makeDesktopItem,
-  copyDesktopItems,
 }: let
   sources = callPackage ../../../../_sources/generated.nix {};
 
@@ -34,15 +33,15 @@
     pname = "grimoire";
     inherit version src;
     fetcherVersion = 3;
-    hash = "sha256-X7KLUag9HPHVit0l/tA3BxQZ2/Cj0A5KiG4Oevx2268=";
+    hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
   };
 
   desktopItem = makeDesktopItem {
     name = "grimoire";
-    exec = "grimoire %u";
+    exec = "$out/bin/grimoire %u";
     desktopName = "Grimoire";
     categories = ["Utility"];
-    mimeTypes = ["x-scheme-handler/grimoire"];
+    MimeType = "x-scheme-handler/grimoire";
   };
 in
   stdenv.mkDerivation {
@@ -59,11 +58,8 @@ in
       pkg-config
       makeWrapper
       electron_40
-      copyDesktopItems
     ];
 
-    desktopItems = [desktopItem];
-
     buildInputs = [
       sqlite
     ];
@@ -73,12 +69,6 @@ in
     env.GRIMOIRE_SOCIAL_BASE_URL = "https://grimoire-social.slusheliott.workers.dev";
 
     postPatch = ''
-      # The app is launched via electron directly (not an electron-builder
-      # package), so `app.isPackaged` is false and `is.dev` is true, which
-      # auto-opens DevTools on launch. Strip that call.
-      substituteInPlace electron/main/index.ts \
-        --replace-fail "mainWindow.webContents.openDevTools();" ""
-
       cp -r ${grimoire-social-src} ../grimoire-social
       chmod -R u+w ../grimoire-social
 
@@ -107,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 = {

pkgs/by-name/x1/x1e80100-firmware/package.nix

@@ -27,11 +27,11 @@ stdenv.mkDerivation (
 
   rec {
     name = "x1e80100-firmware";
-    version = "26100_26.053.36539.0";
+    version = "26100_26.033.32430.0";
     src = fetchurl {
       # https://www.microsoft.com/en-us/download/details.aspx?id=106120
       url = "https://download.microsoft.com/download/b7ca2c3f-d320-4795-be0f-529a0117abb4/SurfaceLaptop7_ARM_Win11_${version}.msi";
-      hash = "sha256-ZrbhrOfl8BvFks1MmueKowu7DgSrV0kc0D7CqqbhIps=";
+      hash = "sha256-KyHgMGk/oytVctE5AhdXer+x7mJk2uP8Vgc7v78wSRc=";
     };
     nativeBuildInputs = [
       msitools