From 702f2fa0f704944ab6abd45af1751ea887f66876 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Mon, 15 Nov 2021 13:34:51 +0100
Subject: [PATCH] blackadder: update for new nixpkgs rev

---
 fixups.nix               | 9 +++++++++
 home-manager/home.nix    | 4 ++--
 nixos/physical/3950x.nix | 2 +-
 overlays.nix             | 1 +
 4 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 fixups.nix

diff --git a/fixups.nix b/fixups.nix
new file mode 100644
index 0000000..8cea416
--- /dev/null
+++ b/fixups.nix
@@ -0,0 +1,9 @@
+(pkgs: super: {
+  # https://github.com/NixOS/nixpkgs/pull/145738
+  tree = super.tree.overrideAttrs (o: {
+    preConfigure = o.preConfigure + ''
+      makeFlags+=("CC=$CC")
+    '';
+    makeFlags = pkgs.lib.filter (x: x != "CC=$CC") o.makeFlags;
+  });
+})
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 1bc36a5..e1d1477 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -26,7 +26,7 @@ in {
     # todo: .aws/config default region
     gh = {
       enable = true;
-      aliases.co = "pr checkout";
+      settings.aliases.co = "pr checkout";
     };
     direnv.enable = true;
     home-manager = {
@@ -218,10 +218,10 @@ in {
         lumi = "pushd ~/engineering/lumi; cached-nix-shell; popd";
       };
       interactiveShellInit = ''
+        set fish_greeting
         source ${thefuck-alias "fish"}
         source ~/dotfiles/nr.fish
       '';
-      promptInit = "set fish_greeting";
     };
     bash = {
       enable = true;
diff --git a/nixos/physical/3950x.nix b/nixos/physical/3950x.nix
index a2a9659..0cb141a 100644
--- a/nixos/physical/3950x.nix
+++ b/nixos/physical/3950x.nix
@@ -11,7 +11,7 @@ in {
   boot.loader.efi.canTouchEfiVariables = true;
   boot.supportedFilesystems = [ "zfs" ];
   boot.kernelModules = [ "nct6775" ];
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelPackages = pkgs.linuxPackages_5_14; # todo: zfs
   networking.hostId = "c7736638";
   services.zfs.autoScrub.enable = true;
   services.zfs.trim.enable = true;
diff --git a/overlays.nix b/overlays.nix
index be76006..eb76837 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -1,5 +1,6 @@
 let sources = import ./nix/sources.nix;
 in [
+  (import ./fixups.nix)
   (import "${sources.nixpkgs-wayland}/overlay.nix")
   (import sources.nixpkgs-mozilla)
   (import sources.emacs-overlay)