Add unified nix configuration

nix/flake.nix

@@ -1,89 +1,90 @@
 {
-  description = "Home Manager configuration of moustachioed";
+  description = "Unified Nix Configuration";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nix-darwin.url = "github:LnL7/nix-darwin";
-    nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
+
+    nixos-wsl = {
+      url = "github:nix-community/NixOS-WSL";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nix-darwin = {
+      url = "github:LnL7/nix-darwin";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nix-darwin, nixpkgs, home-manager, ... }:
+  outputs = { self, nixpkgs, nixos-wsl, home-manager, nix-darwin, ... }@inputs:
     let
-      #system = "x86_64-darwin";
-      system = "x86_64-linux";
-      pkgs = nixpkgs.legacyPackages.${system};
+      linuxSystem = "x86_64-linux";
+      linuxAarchSystem = "aarch64-linux";
+      darwinSystem = "aarch64-darwin";
 
-      configuration = { pkgs, ... }: {
-        environment.systemPackages =
-          [
-            pkgs.vim
-          ];
+      pkgsLinux = nixpkgs.legacyPackages.${linuxSystem};
+      pkgsLinuxAarch = nixpkgs.legacyPackages.${linuxAarchSystem};
+      pkgsDarwin = nixpkgs.legacyPackages.${darwinSystem};
+    in
+    {
 
-        # Auto upgrade nix package and the daemon service.
-        services.nix-daemon.enable = true;
-        # nix.package = pkgs.nix;
+      # --- NixOS Systems ---
+      nixosConfigurations = {
 
-        nix.settings.experimental-features = "nix-command flakes";
-
-        programs.zsh.enable = true;  # default shell on catalina
-
-        # Set Git commit hash for darwin-version.
-        system.configurationRevision = self.rev or self.dirtyRev or null;
-
-        # Used for backwards compatibility, please read the changelog before changing.
-        # $ darwin-rebuild changelog
-        system.stateVersion = 4;
-
-        # The platform the configuration will be used on.
-        nixpkgs.hostPlatform = system;
-      };
-    in {
-      # Build darwin flake using:
-      # $ darwin-rebuild build --flake .#Martins-MacBook-Pro
-      darwinConfigurations."Martins-MacBook-Pro" = nix-darwin.lib.darwinSystem {
-        modules = [ configuration ];
-      };
-
-      # Expose the package set, including overlays, for convenience.
-      darwinPackages = self.darwinConfigurations."Martins-MacBook-Pro".pkgs;
-
-      homeConfigurations = { 
-        "moustachioed" = home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-
-          modules = [ 
-            ./user/profiles/moustachioedBook.nix
-            ./common.nix
-            ./user/task_home.nix
-          ];
-        };
-
-        "martin" = home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-
-          modules = [ 
-            ./user/profiles/martin.nix
-            ./common.nix
-            ./user/task_home.nix
-          ];
-        };
-
-        "pan" = home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-
-          modules = [ 
-            ./user/profiles/work.nix
-            ./common.nix
-            ./user/task.nix
+        # Work WSL
+        work = nixpkgs.lib.nixosSystem {
+          system = linuxSystem;
+          specialArgs = { inherit self; };
+          modules = [
+            nixos-wsl.nixosModules.wsl
+            ./hosts/work/nixos/configuration.nix
+            home-manager.nixosModules.home-manager
             {
-              nixpkgs.config.allowUnfree = true;
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.users.pan = import ./hosts/work/nixos/home.nix;
+            }
+          ];
+        };
+
+        # Home
+        home = nixpkgs.lib.nixosSystem {
+          system = linuxAarchSystem;
+          specialArgs = { inherit self; };
+          modules = [
+            ./hosts/home/nixos/configuration.nix
+            home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.users.martin = import ./hosts/home/nixos/home.nix;
             }
           ];
         };
       };
+
+      # --- Darwin Systems (Mac) ---
+      darwinConfigurations."Martins-MacBook-Pro" = nix-darwin.lib.darwinSystem {
+        system = darwinSystem;
+        specialArgs = { inherit self; };
+        modules = [ ./hosts/home/darwin/configuration.nix ];
+      };
+
+      # --- Standalone Home Manager ---
+      homeConfigurations = { 
+        "pan@work" = home-manager.lib.homeManagerConfiguration {
+          pkgs = pkgsLinux;
+          modules = [ ./hosts/work/nix/home.nix ];
+        };
+
+        "martin@mac" = home-manager.lib.homeManagerConfiguration {
+          pkgs = pkgsDarwin;
+          modules = [ ./hosts/home/nix/home.nix ];
+        };
+      };
     };
 }