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
This commit is contained in:
@ -90,6 +90,7 @@
|
|||||||
modules = [
|
modules = [
|
||||||
(./. + "/profiles" + ("/" + systemSettings.profile) + "/configuration.nix")
|
(./. + "/profiles" + ("/" + systemSettings.profile) + "/configuration.nix")
|
||||||
disko.nixosModules.disko
|
disko.nixosModules.disko
|
||||||
|
(./. + "/disko" + ("/" + systemSettings.diskoConfig) + ".nix")
|
||||||
];
|
];
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit pkgs-stable;
|
inherit pkgs-stable;
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../system/hardware-configuration.nix
|
../../system/hardware-configuration.nix
|
||||||
../../disko/${systemSettings.diskoConfig}.nix
|
|
||||||
../../system/hardware/kernel.nix
|
../../system/hardware/kernel.nix
|
||||||
../../system/hardware/bluetooth.nix
|
../../system/hardware/bluetooth.nix
|
||||||
../../system/hardware/opengl.nix
|
../../system/hardware/opengl.nix
|
||||||
@ -35,7 +34,7 @@
|
|||||||
loader = {
|
loader = {
|
||||||
efi = {
|
efi = {
|
||||||
canTouchEfiVariables = true;
|
canTouchEfiVariables = true;
|
||||||
efiSysMountPoint = "/boot/EFI";
|
efiSysMountPoint = "/boot";
|
||||||
};
|
};
|
||||||
grub = {
|
grub = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
environment.systemPackages = [ pkgs.pipewire ];
|
environment.systemPackages = [ pkgs.pipewire ];
|
||||||
hardware.pulseaudio.enable = true;
|
hardware.pulseaudio.enable = false;
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
|
Reference in New Issue
Block a user