diff options
| author | Yegor Timoshenko <yegortimoshenko@gmail.com> | 2017-12-24 23:21:05 +0000 |
|---|---|---|
| committer | Yegor Timoshenko <yegortimoshenko@gmail.com> | 2017-12-24 23:21:05 +0000 |
| commit | 5407ba7a5242062edeaf3dbcd42d533b9ff96023 (patch) | |
| tree | 796a83420dba49ebe0b5c81a52a436856fb3b03a /apple | |
| parent | b63e0eb372b00d4cb5ca552ae9583bdb593f07dd (diff) | |
treewide: abstract away common configs into common/
Diffstat (limited to 'apple')
| -rw-r--r-- | apple/macbook-pro/10-1/default.nix | 9 | ||||
| -rw-r--r-- | apple/macbook-pro/12-1/default.nix | 3 | ||||
| -rw-r--r-- | apple/macbook-pro/default.nix | 7 |
3 files changed, 15 insertions, 4 deletions
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 + ]; +} |