From 5139091ab9d881000aed21730a29d06f9b7e1870 Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Tue, 8 Apr 2025 20:11:16 +0200
Subject: [PATCH] feat: conform with new nix namings

---
 modules/core/pipewire.nix | 18 ++++++++++--------
 roles/amdgpu.nix          | 16 ++++++++++------
 roles/nvidia.nix          | 14 +++++++++-----
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/modules/core/pipewire.nix b/modules/core/pipewire.nix
index 0e37f57..6c0a0d1 100644
--- a/modules/core/pipewire.nix
+++ b/modules/core/pipewire.nix
@@ -1,11 +1,13 @@
-{ ... }: 
+{ ... }:
 {
-  hardware.pulseaudio.enable = false;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # lowLatency.enable = true;
+  services = {
+    pulseaudio.enable = false;
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      # lowLatency.enable = true;
+    };
   };
 }
diff --git a/roles/amdgpu.nix b/roles/amdgpu.nix
index 7c86877..1c3e5ac 100644
--- a/roles/amdgpu.nix
+++ b/roles/amdgpu.nix
@@ -1,8 +1,14 @@
-{ lib, pkgs, config, ... }:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 with lib;
 let
   cfg = config.liv.amdgpu;
-in {
+in
+{
   options.liv.amdgpu = {
     enable = mkEnableOption "Enable amdgpu drivers";
   };
@@ -11,8 +17,6 @@ in {
     hardware = {
       graphics = {
         enable = true;
-      };
-      opengl = {
         extraPackages = with pkgs; [
           mesa
           libva
@@ -28,8 +32,8 @@ in {
       };
       enableRedistributableFirmware = true;
     };
-    
-    boot.initrd.kernelModules=[ "amdgpu" ];
+
+    boot.initrd.kernelModules = [ "amdgpu" ];
 
     environment.systemPackages = with pkgs; [
       amdvlk
diff --git a/roles/nvidia.nix b/roles/nvidia.nix
index e6c2aba..508676e 100644
--- a/roles/nvidia.nix
+++ b/roles/nvidia.nix
@@ -1,19 +1,23 @@
-{ lib, pkgs, config, ... }:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 with lib;
 let
   cfg = config.liv.nvidia;
-in {
+in
+{
   options.liv.nvidia = {
     enable = mkEnableOption "Enable NVIDIA drivers";
   };
 
   config = mkIf cfg.enable {
     hardware = {
+      enableRedistributableFirmware = true;
       graphics = {
         enable = true;
-      };
-      enableRedistributableFirmware = true;
-      opengl = {
         extraPackages = with pkgs; [
           # amdvlk
         ];