From 44686f804f2e48779cfcd822389435bee0434092 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sun, 17 Jan 2021 16:14:47 +0100
Subject: [PATCH] Use pipewire

Screen sharing doesn't seem to work yet
---
 configurations/sound.nix | 12 ++++--------
 configurations/sway.nix  |  6 ++++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/configurations/sound.nix b/configurations/sound.nix
index 6428fbb9..60e0aaf6 100644
--- a/configurations/sound.nix
+++ b/configurations/sound.nix
@@ -2,14 +2,10 @@
 
 {
   sound.enable = true;
-  hardware.pulseaudio = {
+  services.pipewire = {
     enable = true;
+    alsa.enable = true;
+    jack.enable = true;
+    pulse.enable = true;
   };
-
-  # PulseAudio doesn't play nice with symlinks
-  systemd.user.services.pulseaudio.environment = lib.mkIf config.chvp.zfs.enable {
-    XDG_CONFIG_HOME = "/data/home/charlotte/.config";
-  };
-
-  users.users.charlotte.extraGroups = [ "audio" ];
 }
diff --git a/configurations/sway.nix b/configurations/sway.nix
index 7889e6a8..5aca2112 100644
--- a/configurations/sway.nix
+++ b/configurations/sway.nix
@@ -8,6 +8,11 @@ in
 {
   services.dbus.packages = with pkgs; [ gnome3.dconf ];
   security.pam.services.swaylock = { };
+  xdg.portal = {
+    enable = true;
+    gtkUsePortal = true;
+    extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
+  };
   home-manager.users.charlotte = { pkgs, lib, ... }: {
     home.packages = [ color-picker screenshot ];
     programs.mako = {
@@ -139,6 +144,7 @@ in
       '';
       extraSessionCommands = ''
         export XDG_SESSION_TYPE=wayland
+        export XDG_CURRENT_DESKTOP=sway
         export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
         export QT_AUTO_SCREEN_SCALE_FACTOR=0
         export QT_SCALE_FACTOR=1