1774175572

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1767386128,
+        "lastModified": 1769353768,
-        "narHash": "sha256-BJDu7dIMauO2nYRSL4aI8wDNtEm2KOb7lDKP3hxdrpo=",
+        "narHash": "sha256-zI+7cbMI4wMIR57jMjDSEsVb3grapTnURDxxJPYFIW0=",
         "owner": "numtide",
         "repo": "blueprint",
-        "rev": "0ed984d51a3031065925ab08812a5434f40b93d4",
+        "rev": "c7da5c70ad1c9b60b6f5d4f674fbe205d48d8f6c",
         "type": "github"
       },
       "original": {
@@ -47,11 +47,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1769267506,
+        "lastModified": 1771295914,
-        "narHash": "sha256-P3fTCv97DfUk7n3k6CCRiY7htypmIX0nZ49VGmtuCYE=",
+        "narHash": "sha256-XlVJSzZgpoX4eepEu/fy7xIzmgplz2mynHkVbNgGSpU=",
         "owner": "vikingnope",
         "repo": "helium-browser-nix-flake",
-        "rev": "55e98df9fdaf731667d0667f64b9dda0fbbdbe14",
+        "rev": "3b5a408af4833f1cc6b002c1f952aca7dbfc8202",
         "type": "github"
       },
       "original": {
@@ -97,11 +97,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1766319780,
+        "lastModified": 1770308099,
-        "narHash": "sha256-Uh5180wjvBtSgtJ9zccZ7hu7bd7nvrnb6ff0nDwT2Rw=",
+        "narHash": "sha256-VxuIePns4c+qpsHpLXW0CwovpKUx1xnvVIUuJwPO6fQ=",
         "owner": "Naxdy",
         "repo": "nix-bwrapper",
-        "rev": "3b0d58d4d3e8da89147369d803926998798443e4",
+        "rev": "1248b52f2bd4fe5690c1a36836a1798be21d953b",
         "type": "github"
       },
       "original": {
@@ -112,11 +112,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1769018530,
+        "lastModified": 1771008912,
-        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
+        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
+        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
         "type": "github"
       },
       "original": {
@@ -135,11 +135,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758662783,
+        "lastModified": 1768249818,
-        "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=",
+        "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4",
+        "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796",
         "type": "github"
       },
       "original": {
@@ -209,11 +209,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758728421,
+        "lastModified": 1770228511,
-        "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=",
+        "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
+        "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
         "type": "github"
       },
       "original": {
@@ -247,11 +247,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769228180,
+        "lastModified": 1771130449,
-        "narHash": "sha256-94KY0JNjdd3CcSyKlHPCPswlqmUrWT6+MfOHektsdB8=",
+        "narHash": "sha256-4aKnr603xOLsTsPB4vQqPLpeze4n+9tURz0IK48ZJ4E=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "ef1663c14b7c3c2b84bcf140232534be5a2a0257",
+        "rev": "105bcb6a016ecc4327f24fc0e9e9aba1da53b33b",
         "type": "github"
       },
       "original": {

packages/grayjay-bwrapped/default.nix

@@ -0,0 +1,49 @@
+{
+  # lib,
+  # pkgs,
+  inputs,
+  system,
+  # perSystem,
+  addPkgs ? [],
+  bwrapperOpts ? {},
+  packageOverrides ? {},
+  unfreePkgs ? ["grayjay"],
+  ...
+}: let
+  pkgs = import inputs.nixpkgs {
+    config.allowUnfreePredicate = pkg:
+      builtins.elem (pkgs.lib.getName pkg) unfreePkgs;
+
+    inherit system;
+    overlays = [inputs.nix-bwrapper.overlays.bwrapper];
+  };
+in (pkgs.mkBwrapper (pkgs.lib.attrsets.recursiveUpdate rec {
+    app = {
+      inherit addPkgs;
+      package = pkgs.grayjay.override packageOverrides;
+      id = "app.grayjay.Grayjay" + "_bwrapped";
+      # execArgs = "--disable-gpu-memory-buffer-video-frames";
+      env = {
+        ELECTRON_TRASH = "gio";
+      };
+    };
+    mounts.readWrite = [
+      # "$XDG_RUNTIME_DIR/doc/by-app/${app.id}"
+      #   "$XDG_RUNTIME_DIR/speech-dispatcher"
+      # "$HOME/Downloads"
+    ];
+    dbus.session.talks = [
+      "org.freedesktop.ScreenSaver"
+      # "org.kde.StatusNotifierWatcher"
+      # "com.canonical.AppMenu.Registrar"
+      # "com.canonical.indicator.application"
+      # "com.canonical.Unity"
+    ];
+    dbus.system.talks = [
+      # "org.freedesktop.UPower"
+    ];
+    dbus.session.owns = [
+      "org.mpris.MediaPlayer2.chromium.*"
+    ];
+  }
+  bwrapperOpts))

packages/helium-browser-bwrapped/default.nix

@@ -19,16 +19,19 @@
   };
 in (pkgs.mkBwrapper (pkgs.lib.attrsets.recursiveUpdate rec {
     app = {
-      inherit addPkgs;
+      addPkgs =
+        [
+          pkgs.flatpak-xdg-utils
+        ]
+        ++ addPkgs;
       package = perSystem.helium.helium;
       id = "net.imput.Helium" + "_bwrapped";
-      # runScript = "helium";
       env = {
         GSETTINGS_BACKEND = "dconf";
 
         # use freedesktop portals (like file picker)
         GTK_USE_PORTAL = 1;
-        QT_QPA_PLATFORMTHEME = "flatpak";
+        # QT_QPA_PLATFORMTHEME = "flatpak";
       };
     };
     fhsenv.opts.dieWithParent = false;
@@ -39,6 +42,7 @@ in (pkgs.mkBwrapper (pkgs.lib.attrsets.recursiveUpdate rec {
       "org.freedesktop.Avahi"
       "org.freedesktop.UPower"
       "org.freedesktop.portal.Documents"
+      "org.freedesktop.portal.FileManager"
     ];
     dbus.session.talks = [
       # "org.a11y.Bus"

packages/materialgram-bwrapped/default.nix

@@ -18,9 +18,19 @@
   };
 in (pkgs.mkBwrapper (pkgs.lib.attrsets.recursiveUpdate rec {
     app = {
-      inherit addPkgs;
+      addPkgs =
+        addPkgs
+        ++ [
+          pkgs.flatpak-xdg-utils
+        ];
       package = pkgs.materialgram.override packageOverrides;
       id = "io.github.kukuruzka165.materialgram" + "_bwrapped";
+      env = {
+        GTK_USE_PORTAL = 1;
+
+        # use freedesktop portals (like file picker)
+        QT_QPA_PLATFORMTHEME = "flatpak";
+      };
     };
     mounts.read = [
     ];

packages/prismlauncher-bwrapped/default.nix

@@ -29,10 +29,16 @@ in (pkgs.mkBwrapper (pkgs.lib.attrsets.recursiveUpdate rec {
       );
       id = "org.prismlauncher.PrismLauncher" + "_bwrapped";
       runScript = "prismlauncher";
+      env = {
+        # use freedesktop portals (like file picker)
+        QT_QPA_PLATFORMTHEME = "flatpak";
+        # QT_QPA_FLATPAK_PLATFORMTHEME = "kde";
+      };
     };
     mounts.read = [
       "/sys/kernel/mm/hugepages"
       "/sys/kernel/mm/transparent_hugepage"
+      "$HOME/.config/qt6ct"
     ];
     dbus.session.talks = [
       "org.a11y.Bus"

packages/simplex-chat-bwrapped/default.nix

@@ -0,0 +1,49 @@
+{
+  # lib,
+  # pkgs,
+  inputs,
+  system,
+  unfreePkgs ? [],
+  addPkgs ? [],
+  packageOverrides ? {},
+  bwrapperOpts ? {},
+  ...
+}: let
+  pkgs = import inputs.nixpkgs {
+    config.allowUnfreePredicate = pkg:
+      builtins.elem (pkgs.lib.getName pkg) unfreePkgs;
+
+    inherit system;
+    overlays = [inputs.nix-bwrapper.overlays.bwrapper];
+  };
+in (pkgs.mkBwrapper (pkgs.lib.attrsets.recursiveUpdate rec {
+    app = {
+      inherit addPkgs;
+      package = pkgs.simplex-chat-desktop.override packageOverrides;
+      id = "chat.simplex.simplex" + "_bwrapped";
+      env = {
+        GTK_USE_PORTAL = 1;
+
+        # use freedesktop portals (like file picker)
+        QT_QPA_PLATFORMTHEME = "flatpak";
+      };
+    };
+    mounts.read = [
+    ];
+    dbus.session.talks = [
+      "org.freedesktop.Notifications"
+      "org.gnome.Mutter.IdleMonitor"
+      "org.kde.StatusNotifierWatcher"
+      "com.canonical.AppMenu.Registrar"
+      "com.canonical.indicator.application"
+      "org.ayatana.indicator.application"
+      "org.sigxcpu.Feedback"
+      # "org.a11y.Bus"
+      "org.gtk.vfs.*"
+      "org.freedesktop.portal.FileChooser"
+    ];
+    # dbus.system.talks = [
+    #   "org.freedesktop.UDisks2"
+    # ];
+  }
+  bwrapperOpts))

packages/zen-browser-bwrapped/default.nix

@@ -24,7 +24,9 @@ in (pkgs.mkBwrapper (pkgs.lib.attrsets.recursiveUpdate rec {
       mv $out/bin/zen-browser $out/bin/zen
     '';
     app = {
-      inherit addPkgs;
+      addPkgs =
+        [pkgs.flatpak-xdg-utils]
+        ++ addPkgs;
       package = perSystem.zen-browser.zen-browser.override packageOverrides;
       id = "app.zen_browser.zen" + "_bwrapped";
       runScript = "zen";