diff --git a/INSTALL.md b/INSTALL.md index ff0b8ce..8363144 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -619,16 +619,16 @@ nix run github:NixOS/nixpkgs/nixos-25.11#nixos-rebuild -- \ test \ --fast \ --flake .# \ - --build-host poby@ \ - --target-host poby@ \ + --build-host \ + --target-host \ --use-remote-sudo nix run github:NixOS/nixpkgs/nixos-25.11#nixos-rebuild -- \ switch \ --fast \ --flake .# \ - --build-host poby@ \ - --target-host poby@ \ + --build-host \ + --target-host \ --use-remote-sudo git add . diff --git a/hosts/midgard/default.nix b/hosts/midgard/default.nix index 3f119dd..b86bea6 100644 --- a/hosts/midgard/default.nix +++ b/hosts/midgard/default.nix @@ -1,12 +1,10 @@ -{ ... }: - -{ +{...}: { # Enable these imports after collecting disk IDs and generated hardware config # during the NixOS installer phase. - # imports = [ - # ./hardware-configuration.nix - # ./disko.nix - # ]; + imports = [ + ./hardware-configuration.nix + ./disko.nix + ]; networking.hostName = "midgard"; diff --git a/hosts/midgard/disko.nix b/hosts/midgard/disko.nix index dce18c1..7ff308a 100644 --- a/hosts/midgard/disko.nix +++ b/hosts/midgard/disko.nix @@ -1,11 +1,8 @@ -{ ... }: - -{ +{...}: { disko.devices = { disk.main = { type = "disk"; - device = "/dev/disk/by-id/REPLACE_WITH_MIDGARD_DISK_ID"; - + device = "/dev/disk/by-id/ata-SSM28128GPTCB3B-S112611_DAAE0797167D10302215"; content = { type = "gpt"; diff --git a/hosts/midgard/hardware-configuration.nix b/hosts/midgard/hardware-configuration.nix index d55143b..04a0d8d 100644 --- a/hosts/midgard/hardware-configuration.nix +++ b/hosts/midgard/hardware-configuration.nix @@ -1,5 +1,22 @@ -{ ... }: - +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. { - # TODO: Replace with generated midgard hardware configuration. + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc"]; + boot.initrd.kernelModules = ["dm-snapshot"]; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }