Fix non-NixOS installer branch: auto-detect arch and use correct home config target

flake.nix

@@ -48,7 +48,6 @@
       mkNixosSystem = { system, hostModule, enableHomeManager ? true }:
         let
           pkgs-unstable = mkPkgsUnstable system;
-          hmModules = [];
         in nixpkgs.lib.nixosSystem {
           inherit system;
 
@@ -65,7 +64,17 @@
 
             hostModule
             ./nixos/default.nix
-          ] ++ hmModules;
+          ] ++ nixpkgs.lib.optionals enableHomeManager [
+            home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = {
+                inherit pkgs-unstable sops-nix;
+              };
+              home-manager.users.eliaskohout = import ./home/default.nix;
+            }
+          ];
         };
 
       mkHomeConfig = system: home-manager.lib.homeManagerConfiguration {
@@ -180,7 +189,17 @@
 
           if [ "$ID" != "nixos" ]; then
             echo "Not on NixOS - installing home-manager only"
-            home-manager switch --flake "$FLAKE_DIR#youruser@linux"
+            ARCH=$(uname -m)
+            case "$ARCH" in
+              x86_64)  HM_TARGET="eliaskohout@linux" ;;
+              aarch64) HM_TARGET="eliaskohout@linux-arm" ;;
+              *)
+                echo "Unsupported architecture: $ARCH"
+                exit 1
+                ;;
+            esac
+            echo "Detected architecture: $ARCH -> using config: $HM_TARGET"
+            home-manager switch --flake "$FLAKE_DIR#$HM_TARGET"
             echo "Home manager configured"
             exit 0
           fi

home/default.nix

@@ -68,7 +68,7 @@
   # Home Manager should manage itself
   programs.home-manager.enable = true;
 
-  # Enable nix experimental features
+  # Enable nix experimental features (mkDefault so NixOS module can override)
-  nix.package = pkgs.nix;
+  nix.package = lib.mkDefault pkgs.nix;
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 }