Skip to content

Commit

Permalink
Vendor git and bash
Browse files Browse the repository at this point in the history
Vendoring bash makes flake evaluations on MacOS faster. Vendoring git
protects me from xtools upgrades borking git
  • Loading branch information
jisantuc committed Nov 25, 2024
1 parent f7ce655 commit 5964902
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use flake
11 changes: 8 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@
inherit nixpkgs home-manager system;
};
in
flake-utils.lib.eachDefaultSystem (system: {
homeConfigurations = mkHome { inherit system; };
});
flake-utils.lib.eachDefaultSystem (system:
let pkgs = nixpkgs.legacyPackages.${system};
in {
devShells.default = pkgs.mkShell {
packages = [ pkgs.bash ];
};
homeConfigurations = mkHome { inherit system; };
});
}
4 changes: 4 additions & 0 deletions home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ in
# Let Home Manager install and manage itself.
home-manager.enable = true;

git = {
enable = true;
};

lazygit = {
enable = true;
settings = {
Expand Down
2 changes: 1 addition & 1 deletion scripts/switch
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function build_macos_x86() {
}

function activate_home() {
nix run nixpkgs#bash -- ./result/activate
nix develop --command ./result/activate
}

if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
Expand Down

0 comments on commit 5964902

Please sign in to comment.