From ad42cc9838a53d1b9edfb5ddff6d4f09f2b21648 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 22 Feb 2021 14:16:25 +0100 Subject: [PATCH] Add nixos-hardware modules to glotzbert --- flake.lock | 15 +++++++++++++++ flake.nix | 8 ++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 37ca9cd5..59629469 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,19 @@ { "nodes": { + "nixos-hardware": { + "locked": { + "lastModified": 1613453906, + "narHash": "sha256-w6oeQ3OTCKxRAG9KtjK+ErxpvUhNr48binO99JVQP9Q=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "115770eed0c0fa50c1277cd0f7fe0f15501dbc43", + "type": "github" + }, + "original": { + "id": "nixos-hardware", + "type": "indirect" + } + }, "nixpkgs": { "locked": { "lastModified": 1613993207, @@ -18,6 +32,7 @@ }, "root": { "inputs": { + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "secrets": "secrets" } diff --git a/flake.nix b/flake.nix index 272654b2..39e1f307 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ }; }; - outputs = { self, nixpkgs, secrets }: + outputs = { self, nixpkgs, secrets, nixos-hardware }: let forAllSystems = f: nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ] @@ -67,7 +67,11 @@ in { glotzbert = nixosSystem' { - modules = [ ./hosts/glotzbert ]; + modules = [ + ./hosts/glotzbert + nixos-hardware.nixosModules.common-cpu-intel + nixos-hardware.nixosModules.common-pc-ssd + ]; system = "x86_64-linux"; };