Skip to content

Commit 1b76b47

Browse files
Some macbook fixes (#124)
* Mac fixes * git normal
1 parent 3865b6a commit 1b76b47

3 files changed

Lines changed: 13 additions & 8 deletions

File tree

flake.nix

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,28 +165,33 @@
165165
inherit (inputs.home-manager.lib) homeManagerConfiguration;
166166
inherit (inputs.nixpkgs) legacyPackages;
167167

168-
extraSpecialArgs = { inherit inputs; };
169-
170168
modules = [
171-
self.homeModules.erik
172169
{ nixpkgs.overlays = [ overlay ]; }
173170
{ nixpkgs.config.allowUnfree = true; }
171+
self.homeModules.erik
174172
];
175173
in
176174
{
177175
"erik@darter" = homeManagerConfiguration {
178-
inherit modules extraSpecialArgs;
179176
pkgs = legacyPackages.x86_64-linux;
177+
extraSpecialArgs = { inherit inputs; };
178+
inherit modules;
180179
};
181180

182181
"erik@hades" = homeManagerConfiguration {
183-
inherit modules extraSpecialArgs;
184182
pkgs = legacyPackages.x86_64-linux;
183+
extraSpecialArgs = { inherit inputs; };
184+
inherit modules;
185185
};
186186

187187
"erasmussen@Eriks-MacBook-Pro.local" = homeManagerConfiguration {
188-
inherit modules extraSpecialArgs;
189188
pkgs = legacyPackages.aarch64-darwin;
189+
extraSpecialArgs = { inherit inputs; };
190+
modules = [
191+
{ nixpkgs.overlays = [ overlay ]; }
192+
{ nixpkgs.config.allowUnfree = true; }
193+
self.homeModules.erasmussen
194+
];
190195
};
191196
};
192197

toolchain/git/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
programs.git = {
44
enable = true;
5-
package = pkgs.gitFull;
5+
package = pkgs.git;
66
lfs.enable = true;
77

88
settings = {

users/erasmussen/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ in
3939
neovim.enable = true;
4040
vscode.enable = true;
4141
zsh.enable = true;
42-
ghostty.enable = true;
42+
ghostty.enable = false; # They prefer to distribute via brew right now
4343
kitty.enable = true;
4444
zed.enable = true;
4545
c.enable = true;

0 commit comments

Comments
 (0)