mirror of
https://github.com/NixOS/nixos-hardware
synced 2024-11-23 11:29:42 +01:00
Merge pull request #19 from Ericson2314/master
Apple MacBook Pro 10,1 + misc fixes
This commit is contained in:
commit
d808b992fa
5 changed files with 62 additions and 3 deletions
9
.gitignore
vendored
Normal file
9
.gitignore
vendored
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
*~
|
||||||
|
,*
|
||||||
|
.*.swp
|
||||||
|
.*.swo
|
||||||
|
result
|
||||||
|
result-*
|
||||||
|
.version-suffix
|
||||||
|
|
||||||
|
.DS_Store
|
41
apple/macbook-pro-10-1.nix
Normal file
41
apple/macbook-pro-10-1.nix
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports =
|
||||||
|
[ ../lib/kernel-version.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
## BEGIN from generated hardware-configuration
|
||||||
|
## Probably better to just use a freshly generated hardware.configuration.nix
|
||||||
|
## than this, but including for reference.
|
||||||
|
#imports =
|
||||||
|
# [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
|
||||||
|
# ];
|
||||||
|
#
|
||||||
|
#boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" "sdhci_pci" ];
|
||||||
|
#boot.kernelModules = [ "kvm-intel" "wl" ];
|
||||||
|
#boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
|
||||||
|
#
|
||||||
|
#nix.maxJobs = lib.mkDefault 8;
|
||||||
|
## END from generated hardware-configuration
|
||||||
|
|
||||||
|
# Use the systemd-boot efi boot loader. (From default generated configuration.nix)
|
||||||
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
|
# I use this but not sure whether its needed.
|
||||||
|
# Right click does *NOT* work
|
||||||
|
services.xserver.libinput.enable = true;
|
||||||
|
|
||||||
|
kernelAtleast =
|
||||||
|
[ { version = "4.7"; msg = "Broadcom WiFi confirmed not to work."; }
|
||||||
|
];
|
||||||
|
|
||||||
|
# Couldn't get X to work with nvidia
|
||||||
|
# Also, PTYs don't work after X/nvidia starts
|
||||||
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
|
hardware.opengl.driSupport32Bit = true;
|
||||||
|
|
||||||
|
# Seems to improve battery life *and* keep the CPU cooler
|
||||||
|
services.mbpfan.enable = true;
|
||||||
|
}
|
9
apple/macbook-pro-10-1.wiki
Normal file
9
apple/macbook-pro-10-1.wiki
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
= Apple MacBook Pro 10,1 =
|
||||||
|
|
||||||
|
I presume the associated configuration also will work with to other 10,x models.
|
||||||
|
|
||||||
|
If you don't have an Ethernet adapter, make sure your NixOS installer has a sufficiently modern kernel or you will be stuck without internet and unable to installer.
|
||||||
|
|
||||||
|
Note that (with NixPkgs circa late October 2016) Linux 4.8.1 does not work: everything will boot through X, but then manually-run commands accessing peripherals (nmcli, lspci, etc) will hang inexplicably.
|
||||||
|
|
||||||
|
Thankfully no tweaking of the BIOS or similar was needed. Do note that if your MacOS partition is encrypted, you will have an easier time shrinking it from within MacOS, but this is standard advice.
|
|
@ -20,8 +20,8 @@
|
||||||
#nix.maxJobs = 8;
|
#nix.maxJobs = 8;
|
||||||
## END from generated hardware-configuration
|
## END from generated hardware-configuration
|
||||||
|
|
||||||
# Use the gummiboot efi boot loader. (From default generated configuration.nix)
|
# Use the systemd-boot efi boot loader. (From default generated configuration.nix)
|
||||||
boot.loader.gummiboot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
# Honestly forget if needed or just better for touchpad.
|
# Honestly forget if needed or just better for touchpad.
|
||||||
|
|
|
@ -27,7 +27,7 @@ These settings are needed both for booting the final install, and installer itse
|
||||||
|
|
||||||
=== After installation ===
|
=== After installation ===
|
||||||
|
|
||||||
* ''Add gummiboot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine.
|
* ''Add systemd-boot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine.
|
||||||
|
|
||||||
=== Optional ===
|
=== Optional ===
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue