Vendor git and bash (#106)

Vendoring bash makes flake evaluations on MacOS faster. Vendoring git protects me from xtools upgrades borking git
jisantuc · Nov 27, 2024 · 5ebd774 · 5ebd774
1 parent f7ce655
commit 5ebd774
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/flake.nix b/flake.nix
@@ -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; };
+      });
 }
diff --git a/home.nix b/home.nix
@@ -101,6 +101,10 @@ in
     # Let Home Manager install and manage itself.
     home-manager.enable = true;
 
+    git = {
+      enable = true;
+    };
+
     lazygit = {
       enable = true;
       settings = {

diff --git a/scripts/switch b/scripts/switch
@@ -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