diff --git a/flake.nix b/flake.nix index 8024794..f481ce2 100644 --- a/flake.nix +++ b/flake.nix @@ -90,6 +90,7 @@ modules = [ (./. + "/profiles" + ("/" + systemSettings.profile) + "/configuration.nix") disko.nixosModules.disko + (./. + "/disko" + ("/" + systemSettings.diskoConfig) + ".nix") ]; specialArgs = { inherit pkgs-stable; diff --git a/profiles/personal/configuration.nix b/profiles/personal/configuration.nix index a30ef5f..1ad16ae 100644 --- a/profiles/personal/configuration.nix +++ b/profiles/personal/configuration.nix @@ -7,7 +7,6 @@ { imports = [ ../../system/hardware-configuration.nix - ../../disko/${systemSettings.diskoConfig}.nix ../../system/hardware/kernel.nix ../../system/hardware/bluetooth.nix ../../system/hardware/opengl.nix @@ -35,7 +34,7 @@ loader = { efi = { canTouchEfiVariables = true; - efiSysMountPoint = "/boot/EFI"; + efiSysMountPoint = "/boot"; }; grub = { enable = true; diff --git a/system/hardware/audio.nix b/system/hardware/audio.nix index 8f9005d..ae0cdfb 100644 --- a/system/hardware/audio.nix +++ b/system/hardware/audio.nix @@ -2,7 +2,7 @@ { environment.systemPackages = [ pkgs.pipewire ]; - hardware.pulseaudio.enable = true; + hardware.pulseaudio.enable = false; sound.enable = true; security.rtkit.enable = true; services.pipewire = {