blackadder: update for new nixpkgs rev

auto-flake-update
Yorick van Pelt 2021-11-15 13:34:51 +01:00
parent 851ab28cb5
commit 702f2fa0f7
Signed by: yorick
GPG Key ID: D8D3CC6D951384DE
4 changed files with 13 additions and 3 deletions

9
fixups.nix Normal file
View File

@ -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;
});
})

View File

@ -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;

View File

@ -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;

View File

@ -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)