null2264/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(nix/darwin): Include modified brew-nix overlay

Browse source 
This one should work on nix v2.18.x since v2.19.x is reported to have
regressions
This commit is contained in:
Ahmad Ansori Palembani 2024-11-02 12:11:48 +07:00
parent 96590a271e
commit 60964a91e2
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
5 changed files with 128 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.config/nix/systems/darwin/configuration.nix
View file

@ -32,7 +32,8 @@
pkgs.pinentry_mac
pkgs.iina
pkgs.floorp-bin
pkgs.brewCasks.zotero
pkgs.casks.zotero
pkgs.lf
pkgs.yazi # lf replacement, need further testing
@ -41,7 +42,7 @@
# Auto upgrade nix package and the daemon service.
services.nix-daemon.enable = true;
nix = {
package = pkgs.nixVersions.nix_2_19; # brew-nix requires nix v2.19
package = pkgs.nix;
settings.experimental-features = "nix-command flakes"; # stopping nix from crying about using experimental features flakes and nix-command
};

22
.config/nix/systems/darwin/default.nix
View file

@ -1,4 +1,4 @@
{ inputs, nixpkgs-stable, nixpkgs-unstable, nix-darwin, vars, ... }:
{ inputs, nixpkgs-stable, nixpkgs-unstable, nix-darwin, brew-api, vars, ... }:
let
mkCommon = import ../../lib/mkCommon.nix;
@ -13,18 +13,22 @@ in
# Lenovo ThinkPad L460; Intel Core i5-6300U
"ThiccBook-Pro" =
let
system = "x86_64-darwin";
inherit (
mkSystem {
arch = "x86_64-darwin";
arch = system;
stable = nixpkgs-stable;
unstable = nixpkgs-unstable;
extraOverlays = [
inputs.firefox-darwin.overlay
inputs.brew-nix.overlays.default
(import ../../overlays/darwin/brew.nix {
inherit system brew-api;
nixpkgs = nixpkgs-stable;
})
(import ../../overlays/darwin/inkscape.nix)
];
}
) system pkgs pkgs-unstable;
) pkgs pkgs-unstable;
common = (mkCommon { inherit pkgs pkgs-unstable; });
in
nix-darwin.lib.darwinSystem {
@ -38,18 +42,22 @@ in
# Imaginary M1, just for reference
MacBookProM1 =
let
system = "aarch64-darwin";
inherit (
mkSystem {
arch = "aarch64-darwin";
arch = system;
stable = nixpkgs-stable;
unstable = nixpkgs-unstable;
extraOverlays = [
inputs.firefox-darwin.overlay
inputs.brew-nix.overlays.default
(import ../../overlays/darwin/brew.nix {
inherit system brew-api;
nixpkgs = nixpkgs-stable;
})
(import ../../overlays/darwin/inkscape.nix)
];
}
) system pkgs pkgs-unstable;
) pkgs pkgs-unstable;
common = (mkCommon { inherit pkgs pkgs-unstable; });
in
nix-darwin.lib.darwinSystem {