diff --git a/modules/desktop.nix b/modules/desktop.nix index 0647dc1..59f9474 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -14,6 +14,17 @@ with lib; trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; }; + # Use the systemd-boot EFI boot loader. + boot = { + kernelPackages = pkgs.linuxPackages_zen; + kernelParams = [ "mem_sleep_default=deep" "nvme.noacpi=1"]; + # initrd.kernelModules = [ "amdgpu" ]; + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + }; + networking.networkmanager.enable = true; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index 1242f6d..9f6ad9e 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -13,17 +13,6 @@ networking.hostName = "kaladin"; # Define your hostname. - # Use the systemd-boot EFI boot loader. - boot = { - kernelPackages = pkgs.linuxPackages_zen; - kernelParams = [ "mem_sleep_default=deep" ]; - # initrd.kernelModules = [ "amdgpu" ]; - loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; - }; - }; - networking.interfaces.enp0s31f6.useDHCP = true; networking.interfaces.wlp7s0.useDHCP = true;