Skip to content

Commit

Permalink
fix: working helix build on darwin with custom fork
Browse files Browse the repository at this point in the history
  • Loading branch information
icecreammatt committed Mar 19, 2024
1 parent 9f9d7d9 commit 8171107
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 40 deletions.
80 changes: 47 additions & 33 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
# Text editor branch
helix-flake = {
url = "github:icecreammatt/helix/refs/tags/2024-01-29";
inputs.nixpkgs.follows = "nixpkgs";
# changing this to follows will cause a build error herer
# put this back to follows after rebasing my fork
# inputs.nixpkgs.follows = "nixpkgs";
};

# Build caching
Expand Down
8 changes: 4 additions & 4 deletions hosts/darwin/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
userWork = "mcarrier"; # override default user
in {
# Work laptop config for x86 architecture
MC-DSS-MBPR19 = darwin.lib.darwinSystem {
MC-DSS-MBPR19 = darwin.lib.darwinSystem rec {
system = "x86_64-darwin";
specialArgs = {user = userWork inputs darkmode;};
specialArgs = {user = userWork; inputs = inputs; system = system; darkmode = darkmode; };
modules = [
../../modules/options.nix
./hosts/work/default.nix
Expand All @@ -35,9 +35,9 @@ in {
};

# Personal laptop config for M1 architecture
Bebop = darwin.lib.darwinSystem {
Bebop = darwin.lib.darwinSystem rec {
system = "aarch64-darwin";
specialArgs = {user = user inputs;};
specialArgs = {user = user; inputs = inputs; system = system; };
modules = [
../../modules/options.nix
./hosts/Bebop/default.nix
Expand Down
8 changes: 7 additions & 1 deletion hosts/darwin/hosts/Bebop/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
# hosts/Bebop/default.nix
{pkgs, ...}: {
{pkgs, inputs, system, ...}: {
system.defaults.dock.autohide = true;

users.users.matt = {
shell = pkgs.fish;
home = /Users/matt;
};

environment = {
systemPackages = [
inputs.helix-flake.packages."${system}".helix
];
};

home-manager.users.matt = {pkgs, ...}: {
imports = [
../../../../modules/options.nix
Expand Down
8 changes: 7 additions & 1 deletion hosts/darwin/hosts/work/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
# hosts/mc-2A3MD6R-MBP/default.nix
{pkgs, ...}: {
{pkgs, inputs, system, ...}: {
system.defaults.dock.autohide = false;

users.users.mcarrier = {
shell = pkgs.fish;
home = /Users/mcarrier;
};

environment = {
systemPackages = [
inputs.helix-flake.packages."${system}".helix
];
};

home-manager.users.mcarrier = {pkgs, ...}: {
imports = [
../../../../modules/shell/yazi.nix
Expand Down

0 comments on commit 8171107

Please sign in to comment.