From 5407ba7a5242062edeaf3dbcd42d533b9ff96023 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Sun, 24 Dec 2017 23:21:05 +0000
Subject: treewide: abstract away common configs into common/

---
 apple/macbook-pro/10-1/default.nix | 9 ++++++---
 apple/macbook-pro/12-1/default.nix | 3 ++-
 apple/macbook-pro/default.nix      | 7 +++++++
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 apple/macbook-pro/default.nix

(limited to 'apple')

diff --git a/apple/macbook-pro/10-1/default.nix b/apple/macbook-pro/10-1/default.nix
index 0fa8a2f..06e7486 100644
--- a/apple/macbook-pro/10-1/default.nix
+++ b/apple/macbook-pro/10-1/default.nix
@@ -1,16 +1,19 @@
 { lib, pkgs, ... }:
 
 {
-  imports = [ ../../. ];
+  imports = [
+    ../.
+    ../../../common/pc/laptop/ssd
+  ];
 
+  # TODO: boot loader
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
+  # TODO: drop
   hardware.opengl.driSupport32Bit = true;
 
   services.xserver = {
-    libinput.enable = lib.mkDefault true;
-
     # TODO: we should not enable unfree drivers
     # when there is an alternative (i.e. nouveau)
     videoDrivers = [ "nvidia" ];
diff --git a/apple/macbook-pro/12-1/default.nix b/apple/macbook-pro/12-1/default.nix
index 63c36db..02c6f32 100644
--- a/apple/macbook-pro/12-1/default.nix
+++ b/apple/macbook-pro/12-1/default.nix
@@ -2,7 +2,8 @@
 
 {
   imports = [
-    ../../.
+    ../.
+    ../../../common/pc/laptop/ssd
     <nixpkgs/nixos/modules/hardware/network/broadcom-43xx.nix>
   ];
 
diff --git a/apple/macbook-pro/default.nix b/apple/macbook-pro/default.nix
new file mode 100644
index 0000000..4ced65a
--- /dev/null
+++ b/apple/macbook-pro/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ../.
+    ../../common/cpu/intel
+    ../../common/pc/laptop
+  ];
+}
-- 
cgit v1.2.3