From 3b37e1d53bee0daef2d77ab795ceb2ea564fd624 Mon Sep 17 00:00:00 2001 From: UnstoppableMango Date: Mon, 27 Apr 2026 16:53:14 -0500 Subject: [PATCH 1/2] Mac fixes --- flake.nix | 17 +++++++++++------ users/erasmussen/default.nix | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 827e0f6..b382feb 100644 --- a/flake.nix +++ b/flake.nix @@ -165,28 +165,33 @@ inherit (inputs.home-manager.lib) homeManagerConfiguration; inherit (inputs.nixpkgs) legacyPackages; - extraSpecialArgs = { inherit inputs; }; - modules = [ - self.homeModules.erik { nixpkgs.overlays = [ overlay ]; } { nixpkgs.config.allowUnfree = true; } + self.homeModules.erik ]; in { "erik@darter" = homeManagerConfiguration { - inherit modules extraSpecialArgs; pkgs = legacyPackages.x86_64-linux; + extraSpecialArgs = { inherit inputs; }; + inherit modules; }; "erik@hades" = homeManagerConfiguration { - inherit modules extraSpecialArgs; pkgs = legacyPackages.x86_64-linux; + extraSpecialArgs = { inherit inputs; }; + inherit modules; }; "erasmussen@Eriks-MacBook-Pro.local" = homeManagerConfiguration { - inherit modules extraSpecialArgs; pkgs = legacyPackages.aarch64-darwin; + extraSpecialArgs = { inherit inputs; }; + modules = [ + { nixpkgs.overlays = [ overlay ]; } + { nixpkgs.config.allowUnfree = true; } + self.homeModules.erasmussen + ]; }; }; diff --git a/users/erasmussen/default.nix b/users/erasmussen/default.nix index 3b4c920..620b96f 100644 --- a/users/erasmussen/default.nix +++ b/users/erasmussen/default.nix @@ -39,7 +39,7 @@ in neovim.enable = true; vscode.enable = true; zsh.enable = true; - ghostty.enable = true; + ghostty.enable = false; # They prefer to distribute via brew right now kitty.enable = true; zed.enable = true; c.enable = true; From 968fbe6c910fac54ec7dae9641200822ae8a5cbc Mon Sep 17 00:00:00 2001 From: UnstoppableMango Date: Thu, 30 Apr 2026 16:25:20 -0500 Subject: [PATCH 2/2] git normal --- toolchain/git/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/git/default.nix b/toolchain/git/default.nix index 899f705..82a3f8c 100644 --- a/toolchain/git/default.nix +++ b/toolchain/git/default.nix @@ -2,7 +2,7 @@ { programs.git = { enable = true; - package = pkgs.gitFull; + package = pkgs.git; lfs.enable = true; settings = {