From a1c618448b809bf6214be2f2ac43ca5ab71dd04f Mon Sep 17 00:00:00 2001
From: "Agatha V. Lovelace" <agatha@technogothic.net>
Date: Thu, 5 Sep 2024 17:51:23 +0200
Subject: [PATCH] NixOS 24.05

---
 common/fragments/graphical/mail.nix    |  2 +-
 common/fragments/yubikey.nix           |  2 +-
 common/home_manager/helix.nix          |  2 +-
 flake.nix                              |  4 +-
 hosts/tears/hardware-configuration.nix | 55 +++++++++++---------------
 5 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/common/fragments/graphical/mail.nix b/common/fragments/graphical/mail.nix
index fe6b00c..6e8d4a8 100644
--- a/common/fragments/graphical/mail.nix
+++ b/common/fragments/graphical/mail.nix
@@ -9,5 +9,5 @@
     wantedBy = [ "graphical-session.target" ];
     partOf = [ "graphical-session.target" ];
   };
-  users.users.agatha.packages = [ pkgs.unstable.protonmail-bridge-gui ];
+  users.users.agatha.packages = [ pkgs.protonmail-bridge-gui ];
 }
diff --git a/common/fragments/yubikey.nix b/common/fragments/yubikey.nix
index 8432084..8be1fca 100644
--- a/common/fragments/yubikey.nix
+++ b/common/fragments/yubikey.nix
@@ -4,7 +4,7 @@
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
-    pinentryFlavor = "gnome3";
+    pinentryPackage = pkgs.pinentry-gnome3;
     enableExtraSocket = true;
   };
 
diff --git a/common/home_manager/helix.nix b/common/home_manager/helix.nix
index 50b4ade..2367efe 100644
--- a/common/home_manager/helix.nix
+++ b/common/home_manager/helix.nix
@@ -4,7 +4,7 @@
 
   home-manager.users.agatha = {
     # Formatters/Language Servers that Helix uses
-    home.packages = with pkgs; [ nixfmt ];
+    home.packages = with pkgs; [ nixfmt-rfc-style ];
 
     programs = {
       helix = {
diff --git a/flake.nix b/flake.nix
index 80f2332..90f61fb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,12 +1,12 @@
 {
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.11";
+    nixpkgs.url = "nixpkgs/nixos-24.05";
     nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable";
 
     vampysite.url = "git+https://git.lain.faith/sorceress/vampysite";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/hosts/tears/hardware-configuration.nix b/hosts/tears/hardware-configuration.nix
index 00ad93b..d97866d 100644
--- a/hosts/tears/hardware-configuration.nix
+++ b/hosts/tears/hardware-configuration.nix
@@ -66,35 +66,28 @@
   };
 
   # Creating separate mono sources for Tascam US-4x4HR
-  environment.etc."pipewire/pipewire.conf.d/91-us-4x4hr.conf".text = let
-    name = "US-4x4HR";
-    target = "alsa_input.usb-TASCAM_US-4x4HR_no_serial_number-00.pro-input-0";
-    input = ch: ''
-      {   
-        name = libpipewire-module-loopback
-        args = {
-          node.description = "${name} Input ${toString ch} Mono"
-          capture.props = {
-            node.name = "capture.${name}_ch${toString ch}"
-            audio.position = [ AUX${toString ch} ]
-            stream.dont-remix = true
-            target.object = "${target}"
-            node.passive = true
-          }
-          playback.props = {
-            node.name = "${name}_ch${toString ch}"
-            media.class = "Audio/Source"
-            audio.position = [ MONO ]
-          }
-        }
-      }    
-    '';
-  in ''
-      context.modules = [
-        ${input 0}
-        ${input 1}
-        ${input 2}
-        ${input 3}
-    ]
-  '';
+  services.pipewire.extraConfig.pipewire."91-us-4x4hr" = {
+    "context.modules" = let
+      name = "US-4x4HR";
+      target = "alsa_input.usb-TASCAM_US-4x4HR_no_serial_number-00.pro-input-0";
+      input = ch: {
+        "name" = "libpipewire-module-loopback";
+        "args" = {
+          "node.description" = "${name} Input ${toString ch} Mono";
+          "capture.props" = {
+            "node.name" = "capture.${name}_ch${toString ch}";
+            "audio.position" = [ "AUX${toString ch}" ];
+            "stream.dont-remix" = true;
+            "target.object" = target;
+            "node.passive" = true;
+          };
+          "playback.props" = {
+            "node.name" = "${name}_ch${toString ch}";
+            "media.class" = "Audio/Source";
+            "audio.position" = [ "MONO" ];
+          };
+        };
+      };
+    in [ (input 0) (input 1) (input 2) (input 3) ];
+  };
 }