Rearrange the config structure

This commit is contained in:
Yan Lin 2025-08-28 20:25:28 +02:00
parent 61db648993
commit 4689a4f69c
10 changed files with 114 additions and 33 deletions

View file

@ -19,9 +19,9 @@
outputs = inputs@{ self, nix-darwin, nixpkgs, home-manager, nixvim, claude-code, firefox-addons, nix-homebrew }:
let
configuration = { pkgs, ... }: {
# Common system configuration shared across all Darwin systems
commonSystemConfig = { pkgs, ... }: {
imports = [
./system
./modules/tailscale.nix
];
@ -63,8 +63,8 @@
./modules/ghostty.nix
./modules/syncthing.nix
./config/fonts.nix
./config/packages-common.nix
./config/packages-macos.nix
./config/packages/common.nix
./config/packages/darwin.nix
];
nixpkgs.config.allowUnfree = true;
@ -81,14 +81,16 @@
{
darwinConfigurations."iMac" = nix-darwin.lib.darwinSystem {
modules = [
configuration
commonSystemConfig
./hosts/darwin/iMac
nix-homebrew.darwinModules.nix-homebrew
];
};
darwinConfigurations."MacBook-Air" = nix-darwin.lib.darwinSystem {
modules = [
configuration
commonSystemConfig
./hosts/darwin/MacBook-Air
nix-homebrew.darwinModules.nix-homebrew
];
};