Fix Paths and PulseAudio/PipeWire conflicts

2024-03-24 21:15:03 -04:00
parent 43fcffba37
commit 5a230bfdcc
2 changed files with 3 additions and 2 deletions
--- a/profiles/personal/configuration.nix
+++ b/profiles/personal/configuration.nix
@@ -6,7 +6,7 @@

 {
  imports = [
-    (./. + "../../hardware" + ("/" + systemSettings.hardwareConfiguration) + ".nix")
+    (../../hardware + "/${systemSettings.hardwareConfiguration}.nix")
    ../../system/hardware/kernel.nix
    ../../system/hardware/bluetooth.nix
    ../../system/hardware/opengl.nix
@@ -17,7 +17,7 @@
    ../../system/app/gaming/steam.nix
    ../../system/app/gaming/gamemode.nix
    ../../system/hardware/audio.nix
-    (./. + "../../system/gui" + ("/" + systemSettings.desktopEnvironment) + ".nix")
+    (../../system/gui + "/${systemSettings.desktopEnvironment}.nix")
  ];

  nix = {
--- a/system/hardware/audio.nix
+++ b/system/hardware/audio.nix
@@ -2,6 +2,7 @@

 {
  sound.enable = true;
+  hardware.pulseaudio.enable = false;
  security.rtkit.enable = true;
  services.pipewire = {
    enable = true;