diff --git a/profiles/personal/configuration.nix b/profiles/personal/configuration.nix index 4ee592a..0c48e32 100644 --- 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 = { diff --git a/system/hardware/audio.nix b/system/hardware/audio.nix index e5ea4fa..1b2c963 100644 --- 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;