diff options
| author | Franck Cuny <franck@fcuny.net> | 2025-11-03 07:23:57 -0800 |
|---|---|---|
| committer | Franck Cuny <franck@fcuny.net> | 2025-11-03 07:23:57 -0800 |
| commit | 8eebaf8cee812bd07d8d890040e403bacb1777fb (patch) | |
| tree | 2991267489e3387e1c36a718a54b35fa2b695937 | |
| parent | fix remote script (diff) | |
| download | infra-8eebaf8cee812bd07d8d890040e403bacb1777fb.tar.gz | |
consolidate all modules under modules/
| -rw-r--r-- | flake/hosts.nix | 9 | ||||
| -rw-r--r-- | modules/backups.nix (renamed from modules/nixos/backups.nix) | 0 | ||||
| -rw-r--r-- | modules/default-darwin.nix (renamed from modules/common/default.nix) | 0 | ||||
| -rw-r--r-- | modules/default.nix (renamed from modules/nixos/default.nix) | 3 | ||||
| -rw-r--r-- | modules/home-manager.nix (renamed from modules/nixos/home-manager.nix) | 0 | ||||
| -rw-r--r-- | modules/home.nix (renamed from modules/common/home.nix) | 0 | ||||
| -rw-r--r-- | modules/host-config.nix (renamed from modules/common/host-config.nix) | 0 | ||||
| -rw-r--r-- | modules/nas-client.nix (renamed from modules/nixos/nas-client.nix) | 0 | ||||
| -rw-r--r-- | modules/ssh.nix (renamed from modules/common/ssh.nix) | 0 | ||||
| -rw-r--r-- | modules/user.nix (renamed from modules/nixos/user.nix) | 0 |
10 files changed, 7 insertions, 5 deletions
diff --git a/flake/hosts.nix b/flake/hosts.nix index df19f45..2a3f062 100644 --- a/flake/hosts.nix +++ b/flake/hosts.nix @@ -71,15 +71,14 @@ let inputs.agenix.nixosModules.age inputs.disko.nixosModules.disko inputs.home-manager.nixosModules.home-manager - "${self}/modules/common" - "${self}/modules/nixos" + ../modules/default.nix ]; darwinDefaultModules = [ nixSettings inputs.agenix.darwinModules.age inputs.home-manager.darwinModules.home-manager - "${self}/modules/common" + ../modules/default-darwin.nix ]; darwinConfigurations = mapAttrs' ( @@ -124,7 +123,7 @@ let } ); } - ) (mapMacs (mapSystems "${self}/machines/darwin")); + ) (mapMacs (mapSystems ../machines/darwin)); nixosConfigurations = mapAttrs' ( name: conf: @@ -174,7 +173,7 @@ let } ); } - ) (mapHosts (mapSystems "${self}/machines/nixos")); + ) (mapHosts (mapSystems ../machines/nixos)); in { flake = { diff --git a/modules/nixos/backups.nix b/modules/backups.nix index 78b3144..78b3144 100644 --- a/modules/nixos/backups.nix +++ b/modules/backups.nix diff --git a/modules/common/default.nix b/modules/default-darwin.nix index 5984f10..5984f10 100644 --- a/modules/common/default.nix +++ b/modules/default-darwin.nix diff --git a/modules/nixos/default.nix b/modules/default.nix index 21f6d26..0671724 100644 --- a/modules/nixos/default.nix +++ b/modules/default.nix @@ -3,7 +3,10 @@ imports = [ ./backups.nix ./home-manager.nix + ./home.nix + ./host-config.nix ./nas-client.nix + ./ssh.nix ./user.nix ]; } diff --git a/modules/nixos/home-manager.nix b/modules/home-manager.nix index 7a9ae43..7a9ae43 100644 --- a/modules/nixos/home-manager.nix +++ b/modules/home-manager.nix diff --git a/modules/common/home.nix b/modules/home.nix index 6b6b518..6b6b518 100644 --- a/modules/common/home.nix +++ b/modules/home.nix diff --git a/modules/common/host-config.nix b/modules/host-config.nix index b10d85f..b10d85f 100644 --- a/modules/common/host-config.nix +++ b/modules/host-config.nix diff --git a/modules/nixos/nas-client.nix b/modules/nas-client.nix index fe0952e..fe0952e 100644 --- a/modules/nixos/nas-client.nix +++ b/modules/nas-client.nix diff --git a/modules/common/ssh.nix b/modules/ssh.nix index 3e975ee..3e975ee 100644 --- a/modules/common/ssh.nix +++ b/modules/ssh.nix diff --git a/modules/nixos/user.nix b/modules/user.nix index 8a9dafb..8a9dafb 100644 --- a/modules/nixos/user.nix +++ b/modules/user.nix |