From 1e08ac83f50258080f8da9c8f3d18ebfc7750546 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Mon, 18 Oct 2021 16:00:46 +0200
Subject: [PATCH] Switch to PipeWire

---
 nixos/base.nix  | 45 +++++++++++++++++++++++----------------------
 nixos/intel.nix |  4 ++--
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/nixos/base.nix b/nixos/base.nix
index 3d7acc2..e6c5634 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -87,18 +87,18 @@
   # hardware.pulseaudio.enable = true;
 
   # PIPEWIRE
-  hardware.pulseaudio.enable = true;
-  # security.rtkit.enable = true;
-  # services.pipewire = {
-  #   enable = true;
-  #   pulse.enable = true;
-  #   jack.enable = true;
-  #   alsa = {
-  #     enable = true;
-  #     support32Bit = true;
-  #   };
-  #   # media-session.enable = true;
-  # };
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    pulse.enable = true;
+    jack.enable = true;
+    alsa = {
+      enable = true;
+      support32Bit = true;
+    };
+    # media-session.enable = true;
+  };
   environment.sessionVariables.LD_LIBRARY_PATH = lib.mkForce "${config.services.pipewire.package.jack}/lib"; # Temporary fix for WebKitGTK
 
   # # Tablet
@@ -156,16 +156,17 @@
   services.thermald.enable = true;
 
   services.snapper = {
-    configs = let
-      bertofExtraConfig = ''
-        ALLOW_USERS="bertof"
-        TIMELINE_CREATE=yes
-        TIMELINE_CLEANUP=yes
-      '';
-      common = {
-        extraConfig = bertofExtraConfig;
-      };
-    in
+    configs =
+      let
+        bertofExtraConfig = ''
+          ALLOW_USERS="bertof"
+          TIMELINE_CREATE=yes
+          TIMELINE_CLEANUP=yes
+        '';
+        common = {
+          extraConfig = bertofExtraConfig;
+        };
+      in
       {
         bertof_home = common // {
           subvolume = "/home/bertof";
diff --git a/nixos/intel.nix b/nixos/intel.nix
index 68fa685..e0cb356 100644
--- a/nixos/intel.nix
+++ b/nixos/intel.nix
@@ -5,11 +5,11 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
+  imports = builtins.trace "Intel laptop configuration" [
     ./base.nix
   ];
 
-  boot.initrd.kernelModules = ["i915"];
+  boot.initrd.kernelModules = [ "i915" ];
 
   hardware.cpu.intel.updateMicrocode = config.hardware.enableRedistributableFirmware;