home

commit d1e9400ec1ea8ce9e1dc668231887b80302c6375
parent a67021417e7334dc2e8fc772cca7ba9b49421c34
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Thu, 28 May 2020 11:10:50 +0200

nix: fix nixos-hardware usage 😅

- do not rely on NIX_PATH
- do not import x220s as it imports hdd profiles (which is not for
  mine as I do have ssd everywhere)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
hardware/lenovo-p50.nix
 | 
9
+++++++--
M
hardware/thinkpad-t460s.nix
 | 
8
+++++---
M
hardware/thinkpad-x220.nix
 | 
9
++++++---
M
hardware/thinkpad.nix
 | 
6
++++--
M
systems/hokkaido.nix
 | 
2
--

5 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/hardware/lenovo-p50.nix b/hardware/lenovo-p50.nix
@@ -1,7 +1,12 @@
 { config, pkgs, ... }:
-
+let
+  sources = import ../nix/sources.nix;
+in
 {
-  imports = [ ./thinkpad.nix ];
+  imports = [
+    (sources.nixos-hardware + "/common/pc/ssd")
+    ./thinkpad.nix
+  ];
   hardware = {
     bluetooth = {
       enable = true;
diff --git a/hardware/thinkpad-t460s.nix b/hardware/thinkpad-t460s.nix
@@ -1,9 +1,11 @@
 { config, pkgs, ... }:
-
+let
+  sources = import ../nix/sources.nix;
+in
 {
   imports = [
-    <nixos-hardware/lenovo/thinkpad/t460s>
-    <nixos-hardware/ssd>
+    (sources.nixos-hardware + "/lenovo/thinkpad/t460s")
+    (sources.nixos-hardware + "/common/pc/ssd")
     ./thinkpad.nix
   ];
   services = {
diff --git a/hardware/thinkpad-x220.nix b/hardware/thinkpad-x220.nix
@@ -1,10 +1,13 @@
 { config, pkgs, ... }:
-
+let
+  sources = import ../nix/sources.nix;
+in
 {
   imports = [
-    <nixos-hardware/lenovo/thinkpad/x220>
-    <nixos-hardware/ssd>
     ./thinkpad.nix
+    (sources.nixos-hardware + "/lenovo/thinkpad/tp-smapi.nix")
+    (sources.nixos-hardware + "/common/cpu/intel")
+    (sources.nixos-hardware + "/common/pc/ssd")
   ];
   boot = {
     kernelParams = [ "i915.enable_psr=1" ];
diff --git a/hardware/thinkpad.nix b/hardware/thinkpad.nix
@@ -1,7 +1,9 @@
 { config, pkgs, ... }:
-
+let
+  sources = import ../nix/sources.nix;
+in
 {
-  imports [ <nixos-hardware/lenovo/thinkpad> ];
+  imports = [ (sources.nixos-hardware + "/lenovo/thinkpad") ];
   boot = {
     blacklistedKernelModules = [
       # Kernel GPU Savings Options (NOTE i915 chipset only)
diff --git a/systems/hokkaido.nix b/systems/hokkaido.nix
@@ -10,7 +10,6 @@ in
 {
   imports = [
     (import ../nix).home-manager
-    (import ../nix).nixos-hardware
     ../modules/module-list.nixos.nix
     # hardware
     ../hardware/thinkpad-x220.nix
@@ -69,7 +68,6 @@ in
     "nixos-config=${dummyConfig}"
     "nixpkgs=/run/current-system/nixpkgs"
     "nixpkgs-overlays=/run/current-system/overlays/compat"
-    "nixos-hardware=${nixos-hardware}"
   ];
 
   nixpkgs = {