From 8669c0cea0a9cc67e6abd30d10dab42fc8eaa406 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Fri, 10 Jul 2020 10:02:59 +0200
Subject: [PATCH] Add nixos-hardware

---
 imports/nixos-hardware/default.nix  | 7 +++++++
 imports/nixos-hardware/metadata.nix | 9 +++++++++
 machines/kholinar/configuration.nix | 5 +++++
 machines/oldtown/configuration.nix  | 7 +++++++
 4 files changed, 28 insertions(+)
 create mode 100644 imports/nixos-hardware/default.nix
 create mode 100644 imports/nixos-hardware/metadata.nix

diff --git a/imports/nixos-hardware/default.nix b/imports/nixos-hardware/default.nix
new file mode 100644
index 00000000..961783d0
--- /dev/null
+++ b/imports/nixos-hardware/default.nix
@@ -0,0 +1,7 @@
+let
+  metadata = import ./metadata.nix;
+in
+builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixos-hardware/archive/${metadata.rev}.tar.gz";
+  sha256 = metadata.sha256;
+}
diff --git a/imports/nixos-hardware/metadata.nix b/imports/nixos-hardware/metadata.nix
new file mode 100644
index 00000000..df47690f
--- /dev/null
+++ b/imports/nixos-hardware/metadata.nix
@@ -0,0 +1,9 @@
+{
+  url = "https://github.com/NixOS/nixos-hardware/archive/master.tar.gz";
+  repo_git = "https://github.com/NixOS/nixos-hardware";
+  branch = "master";
+  rev = "cc353d439e3135dbe3f5473d897d2c35537f260c";
+  sha256 = "1vwjdbl7x5nx3i6x4xqqsbfwm5kby4qskr1yrx5sv849560ag4dm";
+  revdate = "2020-07-06 16:22:31 +0100";
+  skip = false;
+}
diff --git a/machines/kholinar/configuration.nix b/machines/kholinar/configuration.nix
index 0ba8bda9..96f9d5af 100644
--- a/machines/kholinar/configuration.nix
+++ b/machines/kholinar/configuration.nix
@@ -1,7 +1,12 @@
 { pkgs, lib, ... }:
 
+let
+  findImport = (import ../../lib.nix).findImport;
+  nixos-hardware = findImport "nixos-hardware";
+in
 {
   imports = [
+    "${nixos-hardware}/lenovo/thinkpad/t490"
     ./hardware.nix
     ./secret.nix
     ../../configurations/eid.nix
diff --git a/machines/oldtown/configuration.nix b/machines/oldtown/configuration.nix
index 514df2e5..4837a2e0 100644
--- a/machines/oldtown/configuration.nix
+++ b/machines/oldtown/configuration.nix
@@ -1,7 +1,14 @@
 { config, pkgs, ... }:
 
+let
+  findImport = (import ../../lib.nix).findImport;
+  nixos-hardware = findImport "nixos-hardware";
+in
 {
   imports = [
+    "${nixos-hardware}/common/cpu/intel"
+    "${nixos-hardware}/common/pc/laptop"
+    "${nixos-hardware}/common/pc/laptop/ssd"
     ./hardware.nix
     ./secret.nix
     ../../configurations/eid.nix