From 496b4ed379afe7f1e0563243a0a5efe0857fe3bb Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 23 Sep 2017 10:36:42 +0200
Subject: Create nested module hierarchy

---
 modules/i3.nix             | 4 ++++
 modules/laptop.nix         | 4 ++++
 modules/t470s.nix          | 5 +++++
 modules/thinkpad.nix       | 4 ++++
 modules/user-interface.nix | 4 ++++
 modules/x250.nix           | 5 +++++
 6 files changed, 26 insertions(+)

(limited to 'modules')

diff --git a/modules/i3.nix b/modules/i3.nix
index 07bf64a2..3bba3bbb 100644
--- a/modules/i3.nix
+++ b/modules/i3.nix
@@ -9,4 +9,8 @@
     i3status
     i3lock-color
   ];
+
+  imports = [
+    ./window-manager.nix
+  ];
 }
diff --git a/modules/laptop.nix b/modules/laptop.nix
index f0c88e7d..c50c28e4 100644
--- a/modules/laptop.nix
+++ b/modules/laptop.nix
@@ -70,4 +70,8 @@
 
   systemd.services.nixos-upgrade.unitConfig.ConditionACPower = true;
   systemd.services.nix-gc.unitConfig.ConditionACPower = true;
+
+  imports = [
+    ./user-interface.nix
+  ];
 }
diff --git a/modules/t470s.nix b/modules/t470s.nix
index 34d7f9e3..394df773 100644
--- a/modules/t470s.nix
+++ b/modules/t470s.nix
@@ -16,4 +16,9 @@
   environment.systemPackages = with pkgs; [
     nvme-cli
   ];
+
+  imports = [
+    ./intel-gpu.nix
+    ./thinkpad.nix
+  ];
 }
diff --git a/modules/thinkpad.nix b/modules/thinkpad.nix
index 009e3f08..38133d76 100644
--- a/modules/thinkpad.nix
+++ b/modules/thinkpad.nix
@@ -28,4 +28,8 @@
       STOP_CHARGE_THRESH_BAT1=80
     '';
   };
+
+  imports = [
+    ./bare-metal.nix
+  ];
 }
diff --git a/modules/user-interface.nix b/modules/user-interface.nix
index d8a2b6a4..09cb2bc6 100644
--- a/modules/user-interface.nix
+++ b/modules/user-interface.nix
@@ -76,4 +76,8 @@ in
   services.urxvtd = {
     enable = true;
   };
+
+  imports = [
+    ./xserver.nix
+  ];
 }
diff --git a/modules/x250.nix b/modules/x250.nix
index a6509bf1..e163ec4f 100644
--- a/modules/x250.nix
+++ b/modules/x250.nix
@@ -31,4 +31,9 @@
     SATA_LINKPWR_ON_BAT=medium_power
     SATA_LINKPWR_BLACKLIST="host1"
   '';
+
+  imports = [
+    ./intel-gpu.nix
+    ./thinkpad.nix
+  ];
 }
-- 
cgit 1.4.1