diff --git a/flake.nix b/flake.nix
index 6386ed9..2837fc4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -354,14 +354,6 @@
             modules = [ module ];
           }
         ) aarch64-linux-hosts);
-      # builtins.mapAttrs buildNixos {
-      #   pkgs = pkgsBySystem.x86_64-linux;
-      #   modules = import ./hosts/x86_64-linux;
-      # }
-      # // builtins.mapAttrs buildNixos {
-      #   pkgs = pkgsBySystem.aarch64-linux;
-      #   modules = import ./hosts/aarch64-linux;
-      # };
 
       # Contains my full Mac system builds, including home-manager
       # darwin-rebuild switch --flake .#lookingglass
@@ -372,10 +364,6 @@
           modules = [ module ];
         }
       ) aarch64-darwin-hosts;
-      # darwinConfigurations = builtins.mapAttrs buildDarwin {
-      #   pkgs = pkgsBySystem.aarch64-darwin;
-      #   modules = import ./hosts/darwin;
-      # };
 
       # For quickly applying home-manager settings with:
       # home-manager switch --flake .#tempest
diff --git a/hosts-by-platform/aarch64-darwin/lookingglass/default.nix b/hosts-by-platform/aarch64-darwin/lookingglass/default.nix
index e3259ff..b8b16f9 100644
--- a/hosts-by-platform/aarch64-darwin/lookingglass/default.nix
+++ b/hosts-by-platform/aarch64-darwin/lookingglass/default.nix
@@ -34,6 +34,4 @@ rec {
       email = "${nmasur.settings.username}@take2games.com";
     };
   };
-
-  identityFile = "/Users/${nmasur.settings.username}/.ssh/id_ed25519";
 }
diff --git a/platforms/home-manager/modules/nmasur/profiles/darwin-base.nix b/platforms/home-manager/modules/nmasur/profiles/darwin-base.nix
index 8fdf40f..0a5f884 100644
--- a/platforms/home-manager/modules/nmasur/profiles/darwin-base.nix
+++ b/platforms/home-manager/modules/nmasur/profiles/darwin-base.nix
@@ -22,6 +22,12 @@ in
     # Used for aerc
     xdg.enable = lib.mkDefault pkgs.stdenv.isDarwin;
 
+    # Add homebrew paths to CLI path
+    home.sessionPath = [
+      "/opt/homebrew/bin/"
+      "/opt/homebrew/opt/trash/bin"
+    ];
+
     home.packages = [
       pkgs.noti # Create notifications programmatically
     ];
diff --git a/platforms/nix-darwin/modules/nmasur/presets/programs/homebrew.nix b/platforms/nix-darwin/modules/nmasur/presets/programs/homebrew.nix
index 640be79..eab31eb 100644
--- a/platforms/nix-darwin/modules/nmasur/presets/programs/homebrew.nix
+++ b/platforms/nix-darwin/modules/nmasur/presets/programs/homebrew.nix
@@ -24,9 +24,6 @@ in
       fi
     '';
 
-    # Add homebrew paths to CLI path
-    home.sessionPath = [ "/opt/homebrew/bin/" ];
-
     homebrew = {
       enable = true;
       onActivation = {
diff --git a/platforms/nix-darwin/modules/nmasur/presets/services/finder.nix b/platforms/nix-darwin/modules/nmasur/presets/services/finder.nix
index 191eebf..401478b 100644
--- a/platforms/nix-darwin/modules/nmasur/presets/services/finder.nix
+++ b/platforms/nix-darwin/modules/nmasur/presets/services/finder.nix
@@ -59,7 +59,7 @@ in
     };
 
     # User-level settings
-    activationScripts.postUserActivation.text = ''
+    system.activationScripts.postUserActivation.text = ''
       echo "Show the ~/Library folder"
       chflags nohidden ~/Library
     '';
diff --git a/platforms/nix-darwin/modules/nmasur/presets/services/menubar.nix b/platforms/nix-darwin/modules/nmasur/presets/services/menubar.nix
index 048592b..bc1d758 100644
--- a/platforms/nix-darwin/modules/nmasur/presets/services/menubar.nix
+++ b/platforms/nix-darwin/modules/nmasur/presets/services/menubar.nix
@@ -15,7 +15,7 @@ in
   config = lib.mkIf cfg.enable {
 
     # User-level settings
-    activationScripts.postUserActivation.text = ''
+    system.activationScripts.postUserActivation.text = ''
       echo "Reduce Menu Bar padding"
       defaults write -globalDomain NSStatusItemSelectionPadding -int 6
       defaults write -globalDomain NSStatusItemSpacing -int 6
diff --git a/platforms/nix-darwin/modules/nmasur/profiles/base.nix b/platforms/nix-darwin/modules/nmasur/profiles/base.nix
index 88e2589..774c52d 100644
--- a/platforms/nix-darwin/modules/nmasur/profiles/base.nix
+++ b/platforms/nix-darwin/modules/nmasur/profiles/base.nix
@@ -14,7 +14,7 @@ in
 
   config = lib.mkIf cfg.enable {
 
-    nmasur.presets = {
+    nmasur.presets.programs = {
       fish = lib.mkDefault true;
       homebrew = lib.mkDefault true;
     };
@@ -27,11 +27,6 @@ in
       "notunes" # Don't launch Apple Music with the play button
     ];
 
-    # Add homebrew paths to CLI path
-    home.sessionPath = [
-      "/opt/homebrew/opt/trash/bin"
-    ];
-
     # Include home-manager config in nix-darwin
     home-manager = {
       sharedModules = [ ../../../../home-manager ];
diff --git a/platforms/nix-darwin/modules/secrets.nix b/platforms/nix-darwin/modules/secrets.nix
new file mode 100644
index 0000000..82f8a16
--- /dev/null
+++ b/platforms/nix-darwin/modules/secrets.nix
@@ -0,0 +1,19 @@
+{
+  config,
+  lib,
+  ...
+}:
+
+{
+
+  options = {
+
+    identityFile = lib.mkOption {
+      type = lib.types.path;
+      description = "Path containing decryption identity.";
+      default = "/Users/${config.nmasur.settings.username}/.ssh/id_ed25519";
+    };
+
+  };
+
+}