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

refactor(nix/darwin): Simplify code

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-11-03 08:18:30 +07:00
parent 539e282cda
commit 472e3e05db
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
2 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@
let
mkCommon = import ../../lib/mkCommon.nix;
mkSystem = import ../../lib/mkSystem.nix;
mkBrew = import ../../overlays/darwin/brew.nix;
in
{
# Host list
@ -21,10 +22,7 @@ in
unstable = nixpkgs-unstable;
extraOverlays = [
inputs.firefox-darwin.overlay
(import ../../overlays/darwin/brew.nix {
inherit system brew-api;
nixpkgs = nixpkgs-stable;
})
(mkBrew { inherit system brew-api; nixpkgs = nixpkgs-stable; })
(import ../../overlays/darwin/heliport.nix)
];
}
@ -50,10 +48,7 @@ in
unstable = nixpkgs-unstable;
extraOverlays = [
inputs.firefox-darwin.overlay
(import ../../overlays/darwin/brew.nix {
inherit system brew-api;
nixpkgs = nixpkgs-stable;
})
(mkBrew { inherit system brew-api; nixpkgs = nixpkgs-stable; })
];
}
) pkgs pkgs-unstable;

8
.config/nix/users/default.nix
View file

@ -2,6 +2,7 @@
let
mkSystem = import ../lib/mkSystem.nix;
mkBrew = import ../../overlays/darwin/brew.nix
in
{
# Host list
@ -21,15 +22,12 @@ in
system = "x86_64-darwin";
inherit (
mkSystem {
arch = "x86_64-darwin";
arch = system;
stable = nixpkgs-stable;
unstable = nixpkgs-unstable;
extraOverlays = [
inputs.firefox-darwin.overlay
(import ../../overlays/darwin/brew.nix {
inherit system brew-api;
nixpkgs = nixpkgs-stable;
})
(mkBrew { inherit system brew-api; nixpkgs = nixpkgs-stable; })
];
}
) pkgs pkgs-unstable;