diff options
Diffstat (limited to '')
| -rw-r--r-- | hosts/by-name/apzu/hardware.nix | 11 | ||||
| -rw-r--r-- | hosts/by-name/tiamat/configuration.nix | 2 | ||||
| -rw-r--r-- | hosts/default.nix | 7 |
3 files changed, 14 insertions, 6 deletions
diff --git a/hosts/by-name/apzu/hardware.nix b/hosts/by-name/apzu/hardware.nix index 8d481fa6..d037473a 100644 --- a/hosts/by-name/apzu/hardware.nix +++ b/hosts/by-name/apzu/hardware.nix @@ -13,13 +13,14 @@ ]; soispha = { + boot.enableIsoEntry = true; + disks = { enable = true; disk = "/dev/disk/by-id/nvme-INTEL_SSDPEKNU512GZH_PHKA1481032A512A_1"; ssd = true; swap = { - uuid = "c94cd20a-dd3c-436f-9841-6fe92e5c8719"; - resumeOffset = "533760"; + ram_size = "16G"; }; }; @@ -32,6 +33,12 @@ boot = { kernelModules = ["kvm-intel" "rtw89"]; + kernelParams = [ + # Use the newer experimental xe driver + # "i915.force_probe=!9a49" + # "xe.force_probe=9a49" + ]; + initrd.availableKernelModules = ["xhci_pci" "vmd" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; }; } diff --git a/hosts/by-name/tiamat/configuration.nix b/hosts/by-name/tiamat/configuration.nix index 18393543..baa9215a 100644 --- a/hosts/by-name/tiamat/configuration.nix +++ b/hosts/by-name/tiamat/configuration.nix @@ -9,9 +9,7 @@ # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. { lib, - pkgs, system, - libraries, externalBinaries, ... }: { diff --git a/hosts/default.nix b/hosts/default.nix index 64768074..fc18d556 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -9,6 +9,8 @@ # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. { self, + sources, + nixpkgs, system, openPRsNixpkgs, packageSets, @@ -24,18 +26,19 @@ }; generateHost = _: path: - self.inputs.nixpkgs.lib.nixosSystem { + nixpkgs.lib.nixosSystem { specialArgs = { inherit + self libraries modules - self ; }; modules = [ { _module.args = { inherit + sources # extra package sources openPRsNixpkgs packageSets |