From fb3f35e153da00b7ee932adccc03bfb2798475d8 Mon Sep 17 00:00:00 2001 From: Poby <87608318+smg1024@users.noreply.github.com> Date: Mon, 16 Mar 2026 22:01:29 +0900 Subject: [PATCH] refactor(darwin): import via `./hosts` rename modules/ -> hosts/ --- flake.nix | 7 +------ {modules => hosts}/apps.nix | 0 hosts/default.nix | 8 ++++++++ {modules => hosts}/host-users.nix | 0 {modules => hosts}/nix-core.nix | 0 {modules => hosts}/system.nix | 0 6 files changed, 9 insertions(+), 6 deletions(-) rename {modules => hosts}/apps.nix (100%) create mode 100644 hosts/default.nix rename {modules => hosts}/host-users.nix (100%) rename {modules => hosts}/nix-core.nix (100%) rename {modules => hosts}/system.nix (100%) diff --git a/flake.nix b/flake.nix index cfc6764..25ea9f8 100644 --- a/flake.nix +++ b/flake.nix @@ -57,8 +57,6 @@ nvf, sops-nix, nix-homebrew, - homebrew-core, - homebrew-cask, ... }: let system = "aarch64-darwin"; @@ -75,10 +73,7 @@ darwinConfigurations."${hostname}" = darwin.lib.darwinSystem { inherit system specialArgs; modules = [ - ./modules/nix-core.nix - ./modules/system.nix - ./modules/apps.nix - ./modules/host-users.nix + ./hosts nix-homebrew.darwinModules.nix-homebrew home-manager.darwinModules.home-manager { diff --git a/modules/apps.nix b/hosts/apps.nix similarity index 100% rename from modules/apps.nix rename to hosts/apps.nix diff --git a/hosts/default.nix b/hosts/default.nix new file mode 100644 index 0000000..2c9da03 --- /dev/null +++ b/hosts/default.nix @@ -0,0 +1,8 @@ +{...}: { + imports = [ + ./apps.nix + ./host-users.nix + ./nix-core.nix + ./system.nix + ]; +} diff --git a/modules/host-users.nix b/hosts/host-users.nix similarity index 100% rename from modules/host-users.nix rename to hosts/host-users.nix diff --git a/modules/nix-core.nix b/hosts/nix-core.nix similarity index 100% rename from modules/nix-core.nix rename to hosts/nix-core.nix diff --git a/modules/system.nix b/hosts/system.nix similarity index 100% rename from modules/system.nix rename to hosts/system.nix