feat: Add devtools toggle for development env and fix flake

README.md

@@ -65,14 +65,8 @@ mise exec -- pnpm run:flatpak
 # ... also connect to dev server like so:
 mise exec -- pnpm run:flatpak --force-server http://localhost:5173
 
-# Nix-specific instructions for testing
+# Nix: Enter the development environment & start working with `mise`
 nix develop
-pnpm package
-pnpm run:nix
-# ... as before:
-pnpm run:nix --force-server=http://localhost:5173
-# a better solution would be telling
-# Electron Forge where system Electron is
 ```
 
 ### Pulling in Stoat's assets

flake.nix

@@ -1,30 +1,44 @@
 {
-  description = "Stoat for Desktop Development shell";
+  description = "Development environment for Stoat desktop app";
 
   inputs = {
-    nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
   };
 
-  outputs = inputs: {
-    devShells = builtins.mapAttrs (system: pkgs: {
-      default = pkgs.mkShell {
-        buildInputs = with pkgs; [
-          mise
-          pnpm
-          (writeShellScriptBin "electron-nix" ''
-            exec ${pkgs.lib.getExe pkgs.electron} "$@"
-          '')
-          zip
-          flatpak
-          flatpak-builder
-          elfutils
-        ];
+  outputs =
+    { self, nixpkgs }@inputs:
+    let
+      supportedSystems = [
+        "x86_64-linux"
+        "aarch64-linux"
+      ];
+      forEachSystem = nixpkgs.lib.genAttrs supportedSystems;
+    in
+    {
+      devShells = forEachSystem (
+        system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+        in
+        {
+          default = pkgs.mkShell {
+            buildInputs = with pkgs; [
+              mise
+              pnpm
+              python3
+              electron
+              zip
+              flatpak
+              flatpak-builder
+              elfutils
+            ];
 
-        shellHook = ''
-          export ELECTRON_OVERRIDE_DIST_PATH="${pkgs.electron}/bin"
-          export MISE_NODE_COMPILE=false
-        '';
-      };
-    }) inputs.nixpkgs.legacyPackages;
-  };
+            shellHook = ''
+              export ELECTRON_OVERRIDE_DIST_PATH="${pkgs.electron}/bin"
+              export MISE_NODE_COMPILE=false
+            '';
+          };
+        }
+      );
+    };
 }

package.json

@@ -14,8 +14,7 @@
     "fmt": "prettier --check 'src/**/*.{ts,tsx,json}'",
     "fmt:fix": "prettier --write 'src/**/*.{ts,tsx,json}'",
     "install:flatpak": "flatpak --user install out/make/flatpak/x86_64/chat.stoat.StoatDesktop_stable_x86_64.flatpak",
-    "run:flatpak": "flatpak run chat.stoat.StoatDesktop",
-    "run:nix": "/usr/bin/env electron-nix ."
+    "run:flatpak": "flatpak run chat.stoat.StoatDesktop"
   },
   "keywords": [],
   "author": {
@@ -64,4 +63,4 @@
     "node-pipewire": "1.1.0"
   },
   "packageManager": "pnpm@11.17.0+sha512.cca3cea332ad254bb84145f966d19f4879615210346fc92c79a047f23a0d7b3cca3c3792f0076ba1f1831d277efbcf0a9119b31a9a60eca7fb3d6231f331ef72"
-}
+}

src/main.ts

@@ -106,6 +106,21 @@ if (acquiredLock) {
 
   // ensure URLs launch in external context
   app.on("web-contents-created", (_, contents) => {
+    // DevTools in dev env only, to avoid users opening it in production
+    if (!app.isPackaged) {
+      contents.on("before-input-event", (event, input) => {
+        const isMac = process.platform === "darwin";
+        const isDevToolsShortcut = isMac
+          ? input.meta && input.alt && input.key.toLowerCase() === "i"
+          : input.control && input.shift && input.key.toLowerCase() === "i";
+
+        if (input.key === "F12" || isDevToolsShortcut) {
+          contents.toggleDevTools();
+          event.preventDefault();
+        }
+      });
+    }
+
     // prevent navigation out of build URL origin
     contents.on("will-navigate", (event, navigationUrl) => {
       if (new URL(navigationUrl).origin !== BUILD_URL.origin) {

src/native/window.ts

@@ -153,8 +153,26 @@ export function createMainWindow() {
 
   // configure spellchecker context menu
   mainWindow.webContents.on("context-menu", (_, params) => {
+    // Only show this menu if the user is right-clicking editable text or a misspelled word
+    // if (!params.isEditable && !params.misspelledWord) {
+    //   return;
+    // }
+
     const menu = new Menu();
 
+    if (params.isEditable) {
+      menu.append(new MenuItem({ label: "Cut", role: "cut" }));
+      menu.append(new MenuItem({ label: "Copy", role: "copy" }));
+      menu.append(new MenuItem({ label: "Paste", role: "paste" }));
+      menu.append(new MenuItem({ type: "separator" }));
+    } else if (params.selectionText.trim().length > 0) {
+      menu.append(new MenuItem({ label: "Copy", role: "copy" }));
+      menu.append(new MenuItem({ type: "separator" }));
+    }
+
+    menu.append(new MenuItem({ label: "Select All", role: "selectAll" }));
+    menu.append(new MenuItem({ type: "separator" }));
+
     // add all suggestions
     for (const suggestion of params.dictionarySuggestions) {
       menu.append(