major fix macos

This commit is contained in:
lsoriano-mcm
2025-08-07 16:03:52 -05:00
parent 2dcdd0b29a
commit 4f7a30197a
4 changed files with 56 additions and 75 deletions
+45 -54
View File
@@ -11,8 +11,10 @@
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland.url = "github:hyprwm/Hyprland";
hyprland.inputs.nixpkgs.follows = "nixpkgs";
hyprland = {
url = "github:hyprwm/Hyprland";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager";
@@ -37,66 +39,55 @@
home-manager,
darwin,
chaotic,
nixovim,
jovian,
...
} @ inputs: let
config = import ./config.nix;
mkArgs = system:
system = "x86_64-linux";
args =
{
inherit inputs system;
}
// config;
systems = ["x86_64-linux" "aarch64-linux"];
in
flake-utils.lib.eachSystem systems (system: let
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
args = mkArgs system;
in {
})
// {
nixosConfigurations = {
hakase = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = mkArgs "x86_64-linux";
modules = [
chaotic.nixosModules.default
home-manager.nixosModules.home-manager
jovian.nixosModules.default
nixovim.nixosModules.default
./hosts/hakase/configuration.nix
];
};
};
homeConfigurations = {
hakase = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
system = "x86_64-linux";
config.allowUnfree = true;
extraSpecialArgs = mkArgs "x86_64-linux";
};
modules = [
home-manager.nixosModules.home-manager
./home/hakase.nix
];
};
};
darwinConfigurations = {
macos = darwin.lib.darwinSystem {
system = "aarch64-darwin";
specialArgs = mkArgs "aarch64-darwin";
modules = [
home-manager.darwinModules.home-manager
./hosts/macos/darwin.nix
];
};
in {
nixosConfigurations = {
hakase = nixpkgs.lib.nixosSystem {
specialArgs = args;
modules = [
chaotic.nixosModules.default
home-manager.nixosModules.home-manager
jovian.nixosModules.default
./hosts/hakase/configuration.nix
];
};
};
homeConfigurations = {
hakase = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
config.allowUnfree = true;
extraSpecialArgs = args;
};
modules = [
home-manager.nixosModules.home-manager
./home/hakase.nix
];
};
};
darwinConfigurations = {
macos = darwin.lib.darwinSystem {
system = "aarch64-darwin";
specialArgs =
{
inherit inputs;
system = "aarch64-darwin";
}
// config;
modules = [
home-manager.darwinModules.home-manager
./hosts/macos/darwin.nix
];
};
};
};
}