diff --git a/.gitignore b/.gitignore
index 7dea58b..fc4c42b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,6 @@ shell.nix
 .vscode
 **/*/*.py
 .envrc
-.DS_Store
\ No newline at end of file
+.DS_Store
+*.qcow2
+keys
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 55bc725..4f7b05e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -758,6 +758,27 @@
         "type": "github"
       }
     },
+    "nix-rosetta-builder": {
+      "inputs": {
+        "nixos-generators": "nixos-generators",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1756177999,
+        "narHash": "sha256-aSbB7/jrt7ujiJ55f2uGhOo+usGxVSkqbAMVgg2jDls=",
+        "owner": "cpick",
+        "repo": "nix-rosetta-builder",
+        "rev": "ebb7162a975074fb570a2c3ac02bc543ff2e9df4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cpick",
+        "repo": "nix-rosetta-builder",
+        "type": "github"
+      }
+    },
     "nix-vscode-extensions": {
       "inputs": {
         "nixpkgs": "nixpkgs_9"
@@ -795,6 +816,21 @@
         "type": "github"
       }
     },
+    "nixlib": {
+      "locked": {
+        "lastModified": 1736643958,
+        "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixos-apple-silicon": {
       "inputs": {
         "flake-compat": "flake-compat_4",
@@ -814,6 +850,28 @@
         "type": "github"
       }
     },
+    "nixos-generators": {
+      "inputs": {
+        "nixlib": "nixlib",
+        "nixpkgs": [
+          "nix-rosetta-builder",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737057290,
+        "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
+        "owner": "nix-community",
+        "repo": "nixos-generators",
+        "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixos-generators",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1764440730,
@@ -1277,6 +1335,7 @@
         "nix-homebrew": "nix-homebrew",
         "nix-index-database": "nix-index-database",
         "nix-plist-manager": "nix-plist-manager",
+        "nix-rosetta-builder": "nix-rosetta-builder",
         "nix-vscode-extensions": "nix-vscode-extensions",
         "nixai": "nixai",
         "nixos-apple-silicon": "nixos-apple-silicon",
diff --git a/flake.nix b/flake.nix
index 77c6bd0..12f87b7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -86,6 +86,11 @@
     };
 
     nix-plist-manager.url = "github:sushydev/nix-plist-manager";
+
+    nix-rosetta-builder = {
+      url = "github:cpick/nix-rosetta-builder";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   # We will handle this in the next section.
@@ -111,6 +116,7 @@
           lanzaboote.nixosModules.lanzaboote
           sops-nix.nixosModules.sops
           home-manager.nixosModules.home-manager
+          nix-index-database.nixosModules.nix-index
         ];
 
         # common darwin modules
@@ -118,6 +124,8 @@
           nix-homebrew.darwinModules.nix-homebrew
           home-manager.darwinModules.home-manager
           nix-plist-manager.darwinModules.default
+          nix-rosetta-builder.darwinModules.default
+          nix-index-database.darwinModules.nix-index
         ];
 
         # Host config
diff --git a/homes/aarch64-darwin/mattjallen@macbook-pro/default.nix b/homes/aarch64-darwin/mattjallen@macbook-pro/default.nix
index 63d217e..9dccfbd 100755
--- a/homes/aarch64-darwin/mattjallen@macbook-pro/default.nix
+++ b/homes/aarch64-darwin/mattjallen@macbook-pro/default.nix
@@ -208,7 +208,7 @@ in
           focus = {
             shareAcrossDevices = true;
           };
-          general.dateAndTime."24HourTime" = false;
+          # general.dateAndTime."24HourTime" = false;
           notifications = {
             notificationCenter = {
               showPreviews = "When Unlocked";
diff --git a/modules/darwin/home/default.nix b/modules/darwin/home/default.nix
index f4f14a1..2fb3f7f 100644
--- a/modules/darwin/home/default.nix
+++ b/modules/darwin/home/default.nix
@@ -44,6 +44,7 @@
       sharedModules = with inputs; [
         sops-nix.homeManagerModules.sops
         nix-plist-manager.homeManagerModules.default
+        nix-index-database.homeModules.nix-index
         # Add any other external HM modules here
       ];
 
diff --git a/modules/home/home/default.nix b/modules/home/home/default.nix
index dec7ca5..3037426 100644
--- a/modules/home/home/default.nix
+++ b/modules/home/home/default.nix
@@ -51,6 +51,7 @@
   };
 
   programs = {
+    nix-index-database.comma.enable = true;
     btop.enable = lib.mkDefault true;
     fastfetch.enable = lib.mkDefault true;
     home-manager.enable = lib.mkDefault true;
diff --git a/modules/nixos/home/default.nix b/modules/nixos/home/default.nix
index b2900e3..f3f6d07 100644
--- a/modules/nixos/home/default.nix
+++ b/modules/nixos/home/default.nix
@@ -64,6 +64,7 @@ in
         [
           sops-nix.homeManagerModules.sops
           nix-plist-manager.homeManagerModules.default
+          nix-index-database.homeModules.nix-index
           # Add any other external HM modules here
         ]
         ++ (if (!isArm) then with inputs; [ steam-rom-manager.homeManagerModules.default ] else [ ])
diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix
index 0f78f23..aca1189 100644
--- a/modules/nixos/programs/default.nix
+++ b/modules/nixos/programs/default.nix
@@ -13,6 +13,7 @@ let
 in
 {
   programs = {
+    nix-index-database.comma.enable = true;
     zsh.enable = lib.mkDefault true;
     gnupg.agent = {
       enable = lib.mkDefault true;
diff --git a/systems/aarch64-darwin/macbook-pro/default.nix b/systems/aarch64-darwin/macbook-pro/default.nix
index 8f2983a..60364ad 100755
--- a/systems/aarch64-darwin/macbook-pro/default.nix
+++ b/systems/aarch64-darwin/macbook-pro/default.nix
@@ -30,4 +30,13 @@
     name = "mattjallen";
     home = "/Users/mattjallen";
   };
+
+  # nix = {
+  #   linux-builder.enable = true;
+  # };
+
+  nix-rosetta-builder = {
+    enable = true;
+    onDemand = true;
+  };
 }