Rearrange file structure

flake.nix

@@ -21,14 +21,14 @@
   {
     darwinConfigurations."iMac" = nix-darwin.lib.darwinSystem {
       modules = [ 
-        ./hosts/darwin/iMac
+        ./hosts/darwin/iMac/system.nix
       ];
       specialArgs = { inherit nix-homebrew; };
     };
 
     darwinConfigurations."MacBook-Air" = nix-darwin.lib.darwinSystem {
       modules = [ 
-        ./hosts/darwin/MacBook-Air
+        ./hosts/darwin/MacBook-Air/system.nix
       ];
       specialArgs = { inherit nix-homebrew; };
     };

hosts/darwin/MacBook-Air/home.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../../../home/common.nix
+    ../home-default.nix
   ];
 
   # MacBook Air-specific home configuration

hosts/darwin/MacBook-Air/system.nix

@@ -7,7 +7,6 @@
   
   # Import common Darwin configuration
   imports = [
-    ../../../system
-    ../../../system/darwin
+    ../system-default.nix
   ];
 }

hosts/darwin/home-default.nix

@@ -3,20 +3,20 @@
 {
   imports = [ 
     nixvim.homeModules.nixvim
-    ../modules/nvim.nix 
-    ../modules/tmux.nix 
-    ../modules/zsh.nix 
-    ../modules/ssh.nix
-    ../modules/git.nix
-    ../modules/lazygit.nix
-    ../modules/papis.nix
-    ../modules/termscp.nix
-    ../modules/rsync.nix
-    ../modules/btop.nix
-    ../modules/firefox.nix
-    ../modules/ghostty.nix
-    ../modules/syncthing.nix
-    ../config/fonts.nix
+    ../../modules/nvim.nix 
+    ../../modules/tmux.nix 
+    ../../modules/zsh.nix 
+    ../../modules/ssh.nix
+    ../../modules/git.nix
+    ../../modules/lazygit.nix
+    ../../modules/papis.nix
+    ../../modules/termscp.nix
+    ../../modules/rsync.nix
+    ../../modules/btop.nix
+    ../../modules/firefox.nix
+    ../../modules/ghostty.nix
+    ../../modules/syncthing.nix
+    ../../config/fonts.nix
   ];
 
   nixpkgs.config.allowUnfree = true;

hosts/darwin/iMac/home.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../../../home/common.nix
+    ../home-default.nix
   ];
 
   # iMac-specific home configuration

hosts/darwin/iMac/system.nix

@@ -7,7 +7,6 @@
   
   # Import common Darwin configuration
   imports = [
-    ../../../system
-    ../../../system/darwin
+    ../system-default.nix
   ];
 }

system/default.nix

@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-  ];
-
-}