From ae77147d869ca6fe4fd34b9680761e36680702e4 Mon Sep 17 00:00:00 2001 From: Chris Toph Date: Thu, 8 May 2025 16:49:55 -0400 Subject: [PATCH] Migrates common modules to global - Updates import paths in multiple configurations --- flake.nix | 2 +- home/toph/common/core/default.nix | 2 +- hosts/common/core/default.nix | 2 +- modules/{common => global}/default.nix | 0 modules/{common => global}/host-spec.nix | 0 modules/{common => global}/secret-spec.nix | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename modules/{common => global}/default.nix (100%) rename modules/{common => global}/host-spec.nix (100%) rename modules/{common => global}/secret-spec.nix (100%) diff --git a/flake.nix b/flake.nix index 0c77b94..9bf5122 100644 --- a/flake.nix +++ b/flake.nix @@ -134,7 +134,7 @@ } # Import secrets - ./modules/common/secret-spec.nix + ./modules/global/secret-spec.nix ./secrets.nix # Host-specific configuration diff --git a/home/toph/common/core/default.nix b/home/toph/common/core/default.nix index 96a101c..ece39db 100644 --- a/home/toph/common/core/default.nix +++ b/home/toph/common/core/default.nix @@ -15,7 +15,7 @@ in { imports = lib.flatten [ (map lib.custom.relativeToRoot [ - "modules/common" + "modules/global" "modules/home" ]) ./asdf.nix diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix index 9b427e1..08355eb 100644 --- a/hosts/common/core/default.nix +++ b/hosts/common/core/default.nix @@ -16,7 +16,7 @@ in (lib.custom.scanPaths ./.) (map lib.custom.relativeToRoot [ - "modules/common" + "modules/global" "hosts/users" ]) ]; diff --git a/modules/common/default.nix b/modules/global/default.nix similarity index 100% rename from modules/common/default.nix rename to modules/global/default.nix diff --git a/modules/common/host-spec.nix b/modules/global/host-spec.nix similarity index 100% rename from modules/common/host-spec.nix rename to modules/global/host-spec.nix diff --git a/modules/common/secret-spec.nix b/modules/global/secret-spec.nix similarity index 100% rename from modules/common/secret-spec.nix rename to modules/global/secret-spec.nix