4 files changed, 79 insertions, 0 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
new file mode 100644
index 0000000..5f87431
--- /dev/null
+++ b/pkgs/default.nix
@@ -0,0 +1,11 @@
+{ pkgs, unstablePkgs, ... }:
+
+rec {
+  inherit (pkgs.callPackages ./electron-wayland-wrappers.nix {})
+    discord
+    obsidian
+    vscode
+    element-desktop;
+
+  ghidra = unstablePkgs.callPackage ./ghidra {};
+}
diff --git a/pkgs/electron-wayland-wrappers.nix b/pkgs/electron-wayland-wrappers.nix
new file mode 100644
index 0000000..b83f258
--- /dev/null
+++ b/pkgs/electron-wayland-wrappers.nix
@@ -0,0 +1,42 @@
+{
+  symlinkJoin, makeWrapper,
+  
+  discord, obsidian, vscode, element-desktop
+}:
+
+let
+  goodFlags = ''
+    --ozone-platform=wayland \
+    --force-device-scale=2 \
+    --enable-features=UseOzonePlatform,WaylandWindowDecorations \
+    --disable-features=WaylandFractionalScaleV1
+  '';
+
+  badFlags = ''
+    --ozone-platform=x11 \
+    --no-sandbox
+  '';
+
+  makeElectronWrapper = {
+    name,
+    binary ? name,
+    package,
+    bad ? false
+  }: let
+    flags = if bad then badFlags else goodFlags;
+  in symlinkJoin {
+    name = name;
+    paths = [ package ];
+    buildInputs = [ makeWrapper ];
+    postBuild = ''
+      wrapProgram $out/bin/${binary} \
+        --add-flags "${flags}"
+    '';
+  };
+in
+{
+  discord = makeElectronWrapper { name = "Discord"; package = discord; bad = true; };
+  obsidian = makeElectronWrapper { name = "obsidian"; package = obsidian; };
+  vscode = makeElectronWrapper { name = "vscode"; binary = "code"; package = vscode.fhs; };
+  element-desktop = makeElectronWrapper { name = "element-desktop"; package = element-desktop; };
+}
diff --git a/pkgs/ghidra/default.nix b/pkgs/ghidra/default.nix
new file mode 100644
index 0000000..79e61e5
--- /dev/null
+++ b/pkgs/ghidra/default.nix
@@ -0,0 +1,15 @@
+{ ghidra }:
+
+let
+  ghidra-patched = ghidra.overrideAttrs (finalAttrs: previousAttrs: { 
+    patches = previousAttrs.patches ++ [ ./ui-scale.patch ];
+  });
+in
+ghidra-patched.withExtensions (extensions: with extensions; [
+  gnudisassembler
+  machinelearning
+  ghidraninja-ghidra-scripts
+  lightkeeper
+  ret-sync
+  ghidra-delinker-extension
+])
diff --git a/pkgs/ghidra/ui-scale.patch b/pkgs/ghidra/ui-scale.patch
new file mode 100644
index 0000000..6ebac8d
--- /dev/null
+++ b/pkgs/ghidra/ui-scale.patch
@@ -0,0 +1,11 @@
+--- a/Ghidra/RuntimeScripts/Common/support/launch.properties
++++ b/Ghidra/RuntimeScripts/Common/support/launch.properties
+@@ -20,7 +20,7 @@
+ VMARGS=-Dsun.java2d.opengl=false
+ VMARGS_LINUX=-Dsun.java2d.pmoffscreen=false
+ VMARGS_LINUX=-Dsun.java2d.xrender=true
+-VMARGS_LINUX=-Dsun.java2d.uiScale=1
++VMARGS_LINUX=-Dsun.java2d.uiScale=2
+ VMARGS_LINUX=-Dawt.useSystemAAFontSettings=on
+ VMARGS_WINDOWS=-Dsun.java2d.d3d=false
+