revamped nix for scalability

flake.nix

@@ -2,66 +2,98 @@
   description = "Mike's Flake";
 
   inputs = {
+    # Nixpkgs
     nixpkgs.url = "nixpkgs/nixos-23.11";
+    # You can access packages and modules from different nixpkgs revs
+    # at the same time. Here's an working example:
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
-
+    # Also see the 'unstable-packages' overlay at 'overlays/default.nix'.
+    
+    # Home manager
     home-manager.url = "github:nix-community/home-manager/release-23.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+
+    # TODO: Add any other flake you might need
+    # hardware.url = "github:nixos/nixos-hardware";
+
+    # Shameless plug: looking for a way to nixify your themes and make
+    # everything match nicely? Try nix-colors!
+    # nix-colors.url = "github:misterio77/nix-colors";
   };
 
-  outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, ...}: 
-  let 
-    lib = nixpkgs.lib;
-    system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
-    pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
+  outputs = { 
+    self, 
+    nixpkgs, 
+    nixpkgs-unstable, 
+    home-manager, 
+    ...
+  } @ inputs: let 
+    inherit (self) outputs;
+    # Supported systems for your flake packages, shell, etc.
+    system = [
+      "aarch64-linux"
+      "i686-linux"
+      "x86_64-linux"
+      "aarch64-darwin"
+      "x86_64-darwin"
+    ];
+    # This is a function that generates an attribute by calling a function you
+    # pass to it, with each system as an argument
+    forAllSystems = nixpkgs.lib.genAttrs systems;
   in {
+    # Your custom packages
+    # Accessible through 'nix build', 'nix shell', etc
+    packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
+    # Formatter for your nix files, available through 'nix fmt'
+    # Other options beside 'alejandra' include 'nixpkgs-fmt'
+    formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
+
+    # Your custom packages and modifications, exported as overlays
+    overlays = import ./overlays {inherit inputs;};
+    # Reusable nixos modules you might want to export
+    # These are usually stuff you would upstream into nixpkgs
+    nixosModules = import ./modules/nixos;
+    # Reusable home-manager modules you might want to export
+    # These are usually stuff you would upstream into home-manager
+    homeManagerModules = import ./modules/home-manager;
+    
+    # NixOS configuration entrypoint
+    # Available through 'nixos-rebuild --flake .#hostname'
     nixosConfigurations = {
-      zion = lib.nixosSystem {
-        inherit system;
+      zion = nixpkgs.lib.nixosSystem {
+        specialArgs = {inherit inputs outputs;};
         modules = [
-          zion/configuration.nix
-         
-          home-manager.nixosModules.home-manager
-          {
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-
-              users.mike = import ./home.nix;
-              
-              extraSpecialArgs = {
-                inherit pkgs-unstable;
-              };
-            };
-          }
+          # > Main NixOS configuration file <
+            ./hosts/zion/configuration.nix
         ];
-        specialArgs = {
-          inherit pkgs-unstable;
-        };
       };
-      thor = lib.nixosSystem {
-        inherit system;
+      thor = nixpkgs.lib.nixosSystem {
+        specialArgs = {inherit inputs outputs;};
         modules = [
-          thor/configuration.nix
-         
-          home-manager.nixosModules.home-manager
-          {
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-
-              users.mike = import ./home.nix;
-              
-              extraSpecialArgs = {
-                inherit pkgs-unstable;
-              };
-            };
-          }
+          # > Main NixOS configuration file <
+            ./hosts/thor/configuration.nix
+        ];
+      };
+    };
+
+    # Standalone home-manager configuration entrypoint
+    # Available through 'home-manager --flake .#username@hostname'
+    homeConfigurations = {
+      "mike@zion" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux; # home-manager requires 'pkgs' instance
+        extraSpecialArgs = {inherit inputs outputs;};
+        modules = [
+          # > Main home-manager configuration file <
+          ./home-manager/home.nix
+        ];
+      };
+      "mike@thor" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux; # home-manager requires 'pkgs' instance
+        extraSpecialArgs = {inherit inputs outputs;};
+        modules = [
+          # > Main home-manager configuration file <
+          ./home-manager/home.nix
         ];
-        specialArgs = {
-          inherit pkgs-unstable;
-        };
       };
     };
   };