From 12188b6ec3113305b2161b31410cf68284c7c565 Mon Sep 17 00:00:00 2001 From: Benedikt Tissot Date: Tue, 19 Jan 2021 10:45:06 +0100 Subject: [PATCH 1/2] nixos-hardware: use the flake instead of a path --- README.md | 4 ++-- hosts/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d2878c27..93897b5d 100644 --- a/README.md +++ b/README.md @@ -141,11 +141,11 @@ flk iso ## Hardware Specific Profile for a Single Host -Find out the fitting [nixos-hardware profile](https://github.com/NixOS/nixos-hardware#list-of-profiles) path for the hardware of your host and add it to the configuration. +Find out the fitting [nixos-hardware profile](https://github.com/NixOS/nixos-hardware#list-of-profiles) path for the hardware of your host, then find the corresponding modules in the [flake](https://github.com/NixOS/nixos-hardware/blob/master/flake.nix) and addit to the configuration. For example for a Dell XPS 13 9370 the host configuration would contain: ```nix { - imports = [ "${hardwareModulesPath}/dell/xps/13-9370" ... ]; + imports = [ hardware.dell-xps-13-9370 ... ]; ... } ``` diff --git a/hosts/default.nix b/hosts/default.nix index af2a363c..d33c1118 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -25,7 +25,7 @@ let specialArgs = { unstableModulesPath = "${master}/nixos/modules"; - hardwareModulesPath = "${nixos-hardware}"; + hardware = nixos-hardware.nixosModules; }; modules = From 4a5cb133a7b697eb70e4a4b7629298f921ffa9d7 Mon Sep 17 00:00:00 2001 From: benneti Date: Tue, 19 Jan 2021 11:32:59 +0100 Subject: [PATCH 2/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 93897b5d..fbb0acdc 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ flk iso ## Hardware Specific Profile for a Single Host -Find out the fitting [nixos-hardware profile](https://github.com/NixOS/nixos-hardware#list-of-profiles) path for the hardware of your host, then find the corresponding modules in the [flake](https://github.com/NixOS/nixos-hardware/blob/master/flake.nix) and addit to the configuration. +Find out the fitting [nixos-hardware profile](https://github.com/NixOS/nixos-hardware#list-of-profiles) for the hardware of your host, then find the corresponding modules in the [flake](https://github.com/NixOS/nixos-hardware/blob/master/flake.nix) and add it to the configuration. For example for a Dell XPS 13 9370 the host configuration would contain: ```nix {