mbessette/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes cleo-darwin

Browse Source
This commit is contained in:
Matthew Bessette
2026-06-24 13:55:25 -04:00
parent ef8af5c732
commit aff29b3a6c
8 changed files with 109 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.nix
+15 -22
View File
@@ -11,7 +11,7 @@
darwin.inputs.nixpkgs.follows = "nixpkgs";
home-manager = {
url = "github:nix-community/home-manager";
url = "github:nix-community/home-manager/release-26.05";
inputs.nixpkgs.follows = "nixpkgs";
};
@@ -20,19 +20,18 @@
inputs.nixpkgs.follows = "nixpkgs";
};
firefox-addons = {
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
# Pinned nixpkgs for a specific nodejs_22 + yarn version required by cleo-app
nixpkgs-nodejs.url = "github:NixOS/nixpkgs/21808d22b1cda1898b71cf1a1beb524a97add2c4";
};
outputs = { self, darwin, nixpkgs, nixos-hardware, nixos-wsl, home-manager, mac-app-util, nix-flatpak, ... }@inputs:
let
system = "x86_64-linux";
linuxSystem = "x86_64-linux";
darwinSystem = "aarch64-darwin";
pkgs = import nixpkgs {
inherit system;
system = linuxSystem;
config = {
allowUnfree = true;
};
@@ -40,8 +39,7 @@
in {
# Framework - argon
nixosConfigurations.argon = nixpkgs.lib.nixosSystem {
specialArgs = { inherit system; inherit inputs; };
specialArgs = { system = linuxSystem; inherit inputs; };
modules = [
nixos-hardware.nixosModules.framework-12th-gen-intel
@@ -51,7 +49,7 @@
};
nixosConfigurations.bromine = nixpkgs.lib.nixosSystem {
specialArgs = { inherit system; inherit inputs; };
specialArgs = { system = linuxSystem; inherit inputs; };
modules = [
nixos-hardware.nixosModules.framework-11th-gen-intel
@@ -61,7 +59,7 @@
};
nixosConfigurations.caesium = nixpkgs.lib.nixosSystem {
specialArgs = { inherit system; inherit inputs; };
specialArgs = { system = linuxSystem; inherit inputs; };
modules = [
nix-flatpak.nixosModules.nix-flatpak
@@ -82,7 +80,7 @@
};
nixosConfigurations.caesium-wsl = nixpkgs.lib.nixosSystem {
specialArgs = { inherit system; inherit inputs; };
specialArgs = { system = linuxSystem; inherit inputs; };
modules = [
nixos-wsl.nixosModules.default
@@ -91,8 +89,8 @@
};
darwinConfigurations.cleo-darwin = darwin.lib.darwinSystem {
specialArgs = { inherit system; inherit inputs; };
system = "aarch64-darwin";
specialArgs = { system = darwinSystem; inherit inputs; };
system = darwinSystem;
modules = [
./cleo.darwin.nix
mac-app-util.darwinModules.default
@@ -108,15 +106,12 @@
};
darwinConfigurations.hydrogen = darwin.lib.darwinSystem {
specialArgs = { inherit system; inherit inputs; };
system = "aarch64-darwin";
specialArgs = { system = darwinSystem; inherit inputs; };
system = darwinSystem;
modules = [
./hydrogen.darwin.nix
mac-app-util.darwinModules.default
home-manager.darwinModules.home-manager
# home-manager.sharedModules = [
# mac-app-util.homeManagerModules.default
# ]
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
@@ -126,7 +121,5 @@
}
];
};
homeManagerModules.default = "./nixos-modules/home-manager";
};
}