Commit d1e9400ec1ea

Vincent Demeester <vincent@sbr.pm>
2020-05-28 11:10:50
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>
main
1 parent a670214
Changed files (5)
hardware
lenovo-p50.nix
thinkpad-t460s.nix
thinkpad-x220.nix
thinkpad.nix
systems
hokkaido.nix
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;
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 = {
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" ];
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)
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 = {