From 698c7d7ee7d9a809e2c19073053e413a2b3d4a1c Mon Sep 17 00:00:00 2001
From: Aria Nolan <tacocat@chytrid.org>
Date: Sat, 18 Nov 2023 20:19:49 -0500
Subject: [PATCH] fixed xdg portal

---
 hosts/JWST/configuration.nix                  | 23 ++++++++++++-------
 users/tacocat/wayland/sway/config             |  3 ++-
 users/tacocat/wayland/sway/config.d/autostart |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/hosts/JWST/configuration.nix b/hosts/JWST/configuration.nix
index 7581fb4..94e3154 100644
--- a/hosts/JWST/configuration.nix
+++ b/hosts/JWST/configuration.nix
@@ -56,16 +56,22 @@
 
   # Enable sound.
   sound.enable = true;
-  hardware.pulseaudio.enable = true;
-  services.pipewire.audio.enable = true;
+  # hardware.pulseaudio.enable = true;
+  # services.pipewire.audio.enable = true;
+
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    pulse.enable = true;
+  };
 
   xdg.portal = {
     enable = true;
-    wlr.enable = true;
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-wlr
-      xdg-desktop-portal-gtk
-    ];
+    # wlr.enable = true;
+    # extraPortals = with pkgs; [
+      # xdg-desktop-portal-wlr
+      # xdg-desktop-portal-gtk
+    # ];
   };
 
   hardware.opengl = {
@@ -94,13 +100,14 @@
   ];
 
   programs.sway.enable = true;
+  programs.sway.wrapperFeatures.gtk = true;
   programs.sway.extraPackages = with pkgs; [
     swaylock
     swayidle
     brightnessctl
   ];
 
-  # programs.waybar.enable = true;
+  programs.waybar.enable = true;
   # programs.nm-applet.enable = true;
 
   environment = {
diff --git a/users/tacocat/wayland/sway/config b/users/tacocat/wayland/sway/config
index e26aa32..7de8c8f 100755
--- a/users/tacocat/wayland/sway/config
+++ b/users/tacocat/wayland/sway/config
@@ -1,6 +1,5 @@
 # Default config for sway
 
-include ~/.config/sway/config.d/*
 include /etc/sway/config.d/*
 
 #
@@ -279,3 +278,5 @@ bindsym $mod+r mode "resize"
 #    blur on
 
 # xwayland enable
+
+include ~/.config/sway/config.d/*
diff --git a/users/tacocat/wayland/sway/config.d/autostart b/users/tacocat/wayland/sway/config.d/autostart
index ef2e24b..ef75403 100755
--- a/users/tacocat/wayland/sway/config.d/autostart
+++ b/users/tacocat/wayland/sway/config.d/autostart
@@ -1,5 +1,5 @@
 exec nm-applet
-# exec waybar
+# exec systemctl --user restart waybar
 exec gammastep-indicator
 exec dunst
 #exec swayidle -w \