Update for Darwin aarch64 config

home/default.nix

@@ -21,7 +21,9 @@ let
 		username
 	}:
 		let
+			stateVersion = "22.05";
 			homeDirectory = home system username;
+			cfg = { home = { inherit username homeDirectory stateVersion; }; };
 
 			configDir = "${homeDirectory}/.config";
 
@@ -32,12 +34,14 @@ let
 			};
 
 		in home-manager.lib.homeManagerConfiguration rec {
-			inherit pkgs system username homeDirectory;
-			stateVersion = "22.05";
-			configuration = import ./home.nix {
-				inherit pkgs gui gnome;
-				inherit (pkgs) config lib stdenv;
-			};
+			inherit pkgs;
+			modules = [
+				(import ./home.nix {
+					inherit pkgs gui gnome;
+					inherit (pkgs) config lib stdenv;
+				})
+				cfg
+			];
 		};
 
 in flake-utils.lib.eachDefaultSystem (system: {

home/gui/firefox.nix

@@ -15,27 +15,29 @@ in with lib;
 	programs.firefox = {
 		enable = (! pkgs.stdenv.hostPlatform.isDarwin);
 		package = ffPkgs;
-		extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-			bitwarden
-			bypass-paywalls-clean
-			foxyproxy-standard
-			multi-account-containers
-			plasma-integration
-			octotree
-			refined-github
-			tree-style-tab
-			ublock-origin
-			unpaywall
-		];
 		profiles = {
-			default.settings = {
-				"app.update.auto" = false;
-				"browser.ctrlTab.sortByRecentlyUsed" = true;
-				"browser.startup.page" = 3;
-				"browser.startup.homepage" = "https://thehellings.com";
-				"doh-rollout.doorhanger-decision" = "UIDisabled";
-				"doh-rollout.doneFirstRun" = true;
-				"signon.rememberSignons" = false;
+			default = {
+				settings = {
+					"app.update.auto" = false;
+					"browser.ctrlTab.sortByRecentlyUsed" = true;
+					"browser.startup.page" = 3;
+					"browser.startup.homepage" = "https://thehellings.com";
+					"doh-rollout.doorhanger-decision" = "UIDisabled";
+					"doh-rollout.doneFirstRun" = true;
+					"signon.rememberSignons" = false;
+				};
+				extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+					bitwarden
+					bypass-paywalls-clean
+					foxyproxy-standard
+					multi-account-containers
+					plasma-integration
+					octotree
+					refined-github
+					tree-style-tab
+					ublock-origin
+					unpaywall
+				];
 			};
 		};
 	};

home/xonsh_footer.xsh

@@ -6,7 +6,7 @@ def _rebuild(args):
     import os
     system = os.uname()
     if system.sysname == 'Darwin':
-        darwin-rebuild --flake ~/.config/nix switch
+        darwin-rebuild --flake ~/.config/darwin switch
     else:
         sudo nixos-rebuild switch