From 92378190f1b8400f24cbbf3172c683a761429d89 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Tue, 23 Jan 2024 19:53:52 +0000
Subject: [PATCH] Properly enable pipewire from nixos wiki setup

Disable hardware.audio, enable pipewire addons

Move xdg mime definitions from home manager to system level

Consolidate xdg portal options in desktop.nix
---
 home/hyprland/default.nix | 27 ---------------------------
 system/desktop.nix        | 20 +++++++++++++-------
 system/hyprland.nix       | 32 ++++++++++++++++++++++++++------
 3 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index d1f2e1f6..77449e06 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -107,32 +107,5 @@
       '';
       "swaync/style.css".source = ./swaync/style.css;
     };
-    mimeApps = rec {
-      enable = true;
-      defaultApplications = {
-        "application/pdf" = [ "emacs.desktop" ];
-        "application/epub+zip" = [ "emacs.desktop" ];
-        "application/oxps" = [ "emacs.desktop" ];
-        "image/jpeg" = [ "swayimg.desktop" ];
-        "image/png" = [ "swayimg.desktop" ];
-        "video/mp4" = [ "mpv.desktop" ];
-        "text/csv" = [ "emacs.desktop" ];
-        "text/html" = [ "firefox.desktop" ];
-        "x-scheme-handler/http" = [ "firefox.desktop" ];
-        "x-scheme-handler/https" = [ "firefox.desktop" ];
-        "x-scheme-handler/about" = [ "firefox.desktop" ];
-        "x-scheme-handler/chrome" = [ "firefox.desktop" ];
-        "application/x-extension-htm" = [ "firefox.desktop" ];
-        "application/x-extension-html" = [ "firefox.desktop" ];
-        "application/x-extension-shtml" = [ "firefox.desktop" ];
-        "application/xhtml+xml" = [ "firefox.desktop" ];
-        "application/x-extension-xhtml" = [ "firefox.desktop" ];
-        "application/x-extension-xht" = [ "firefox.desktop" ];
-        "application/x-mozilla-bookmarks" = [ "firefox.desktop" ];
-        "x-scheme-handler/msteams" = [ "teams-for-linux.desktop" ];
-        "x-scheme-handler/zoomus" = [ ];
-      };
-      associations.added = defaultApplications;
-    };
   };
 }
diff --git a/system/desktop.nix b/system/desktop.nix
index 37fc8653..98f51803 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -10,11 +10,8 @@
     polkit.enable = true;
     rtkit.enable = true;
   };
-  sound.enable = true;
-  hardware = {
-    pulseaudio.enable = false;
-    bluetooth.enable = true;
-  };
+  sound.enable = false;
+  hardware.bluetooth.enable = true;
   services = {
     accounts-daemon.enable = true;
     dbus.packages = with pkgs; [ gcr ];
@@ -24,9 +21,14 @@
     };
     pipewire = {
       enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
+      alsa = {
+        enable = true;
+        support32Bit = true;
+      };
+      audio.enable = true;
+      jack.enable = true;
       pulse.enable = true;
+      wireplumber.enable = true;
     };
     xserver = {
       layout = "gb";
@@ -41,4 +43,8 @@
     platformTheme = "gnome";
     style = "adwaita-dark";
   };
+  xdg.portal = {
+    enable = true;
+    xdgOpenUsePortal = true;
+  };
 }
diff --git a/system/hyprland.nix b/system/hyprland.nix
index c13c7aab..ff60178f 100644
--- a/system/hyprland.nix
+++ b/system/hyprland.nix
@@ -38,11 +38,6 @@
       libreoffice
       webcord
       teams-for-linux
-      gst_all_1.gst-libav
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-good
-      gst_all_1.gst-plugins-bad
-      gst_all_1.gst-plugins-ugly
     ];
   };
   security.pam.services.swaylock = { };
@@ -58,7 +53,32 @@
       initial_session = { inherit command; };
     };
   };
-  xdg.portal.enable = true;
+  xdg.mime = rec {
+    enable = true;
+    defaultApplications = {
+      "application/pdf" = [ "emacs.desktop" ];
+      "application/epub+zip" = [ "emacs.desktop" ];
+      "application/oxps" = [ "emacs.desktop" ];
+      "image/jpeg" = [ "swayimg.desktop" ];
+      "image/png" = [ "swayimg.desktop" ];
+      "video/mp4" = [ "mpv.desktop" ];
+      "text/csv" = [ "emacs.desktop" ];
+      "text/html" = [ "firefox.desktop" ];
+      "x-scheme-handler/http" = [ "firefox.desktop" ];
+      "x-scheme-handler/https" = [ "firefox.desktop" ];
+      "x-scheme-handler/about" = [ "firefox.desktop" ];
+      "x-scheme-handler/chrome" = [ "firefox.desktop" ];
+      "application/x-extension-htm" = [ "firefox.desktop" ];
+      "application/x-extension-html" = [ "firefox.desktop" ];
+      "application/x-extension-shtml" = [ "firefox.desktop" ];
+      "application/xhtml+xml" = [ "firefox.desktop" ];
+      "application/x-extension-xhtml" = [ "firefox.desktop" ];
+      "application/x-extension-xht" = [ "firefox.desktop" ];
+      "application/x-mozilla-bookmarks" = [ "firefox.desktop" ];
+      "x-scheme-handler/msteams" = [ "teams-for-linux.desktop" ];
+    };
+    addedAssociations = defaultApplications;
+  };
   programs = {
     dconf.enable = true;
     light.enable = true;