From a2b20351e0557192f7be9c40fb5ead04e9fa9dfc Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Fri, 3 Jun 2016 16:07:56 -0700
Subject: [PATCH 1/3] s/gummiboot/systemd-boot -- fixes warnings on unstable

---
 dell/xps-15-9550.nix  | 4 ++--
 dell/xps-15-9550.wiki | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dell/xps-15-9550.nix b/dell/xps-15-9550.nix
index 20aad2b..ac935ac 100644
--- a/dell/xps-15-9550.nix
+++ b/dell/xps-15-9550.nix
@@ -20,8 +20,8 @@
   #nix.maxJobs = 8;
   ## END from generated hardware-configuration
 
-  # Use the gummiboot efi boot loader. (From default generated configuration.nix)
-  boot.loader.gummiboot.enable = true;
+  # Use the systemd-boot efi boot loader. (From default generated configuration.nix)
+  boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   # Honestly forget if needed or just better for touchpad.
diff --git a/dell/xps-15-9550.wiki b/dell/xps-15-9550.wiki
index 1f695a6..d673955 100644
--- a/dell/xps-15-9550.wiki
+++ b/dell/xps-15-9550.wiki
@@ -27,7 +27,7 @@ These settings are needed both for booting the final install, and installer itse
 
 === 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 ===
 

From f51cdd05356c2169dd2e31be96d487752603dd33 Mon Sep 17 00:00:00 2001
From: John Ericson <jericson@galois.com>
Date: Thu, 20 Oct 2016 14:28:23 -0400
Subject: [PATCH 2/3] Add .gitignore adapted from NixPkgs

---
 .gitignore | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2151b35
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+*~
+,*
+.*.swp
+.*.swo
+result
+result-*
+.version-suffix
+
+.DS_Store

From e5cc44520fecf4b257f33cd6acf615d528c2a110 Mon Sep 17 00:00:00 2001
From: John Ericson <jericson@galois.com>
Date: Thu, 20 Oct 2016 14:53:52 -0400
Subject: [PATCH 3/3] Apple MacBook Pro 10,1

---
 apple/macbook-pro-10-1.nix  | 41 +++++++++++++++++++++++++++++++++++++
 apple/macbook-pro-10-1.wiki |  9 ++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 apple/macbook-pro-10-1.nix
 create mode 100644 apple/macbook-pro-10-1.wiki

diff --git a/apple/macbook-pro-10-1.nix b/apple/macbook-pro-10-1.nix
new file mode 100644
index 0000000..f9ba24d
--- /dev/null
+++ b/apple/macbook-pro-10-1.nix
@@ -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;
+}
diff --git a/apple/macbook-pro-10-1.wiki b/apple/macbook-pro-10-1.wiki
new file mode 100644
index 0000000..149b30e
--- /dev/null
+++ b/apple/macbook-pro-10-1.wiki
@@ -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.