From 4b4ab387e9dfc9e4c47960c3867a065cc81c9cb3 Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Fri, 27 Oct 2023 02:54:42 +0200
Subject: [PATCH] packages: use new nixpak features

---
 packages/nixpak/modules/gui-base.nix | 13 +++++--------
 packages/nixpak/modules/network.nix  |  1 -
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/nixpak/modules/gui-base.nix b/packages/nixpak/modules/gui-base.nix
index 3bf0be9..47bf3ee 100644
--- a/packages/nixpak/modules/gui-base.nix
+++ b/packages/nixpak/modules/gui-base.nix
@@ -21,20 +21,17 @@ in
     fonts.enable = true;
     locale.enable = true;
     bubblewrap = {
+      sockets = {
+        wayland = true;
+        pulse = true;
+      };
       network = lib.mkDefault false;
       bind.rw = [
         (sloth.concat' sloth.xdgCacheHome "/fontconfig")
         (sloth.concat' sloth.xdgCacheHome "/mesa_shader_cache")
 
-        (sloth.concat [
-          (sloth.env "XDG_RUNTIME_DIR")
-          "/"
-          (sloth.env "WAYLAND_DISPLAY")
-        ])
-
         (envSuffix "XDG_RUNTIME_DIR" "/at-spi/bus")
         (envSuffix "XDG_RUNTIME_DIR" "/gvfsd")
-        (envSuffix "XDG_RUNTIME_DIR" "/pulse")
         (envSuffix "XDG_RUNTIME_DIR" "/doc")
         (envSuffix "XDG_RUNTIME_DIR" "/dconf")
       ];
@@ -58,4 +55,4 @@ in
       };
     };
   };
-}
\ No newline at end of file
+}
diff --git a/packages/nixpak/modules/network.nix b/packages/nixpak/modules/network.nix
index 7a723b4..1fcaa35 100644
--- a/packages/nixpak/modules/network.nix
+++ b/packages/nixpak/modules/network.nix
@@ -1,7 +1,6 @@
 {
   etc.sslCertificates.enable = true;
   bubblewrap = {
-    bind.ro = [ "/etc/resolv.conf" ];
     network = true;
   };
 }