From 6c06028e80b82f1a7af24bc64e6c6bd5a54d5936 Mon Sep 17 00:00:00 2001
From: Sravan Balaji <balajsra@umich.edu>
Date: Sun, 24 Mar 2024 15:18:50 -0400
Subject: [PATCH] Attempt to Fix Issues Again

- Move disko nix file to flake out of configuration.nix
- Move efiSysMountPoint back to /boot
- Disable pulseaudio since pipewire is in use
---
 flake.nix                           | 1 +
 profiles/personal/configuration.nix | 3 +--
 system/hardware/audio.nix           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 = {