diff --git a/home-modules/secretive.nix b/home-modules/secretive.nix
new file mode 100644
index 0000000..b4d5b9c
--- /dev/null
+++ b/home-modules/secretive.nix
@@ -0,0 +1,9 @@
+{ user, ... } : {
+  programs.ssh = {
+    enable = true;
+    extraConfig = ''
+Host *
+  IdentityAgent ${user.homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh
+    '';
+  };
+}
diff --git a/hosts/macbook/configuration.nix b/hosts/macbook/configuration.nix
index b43ac2e..8c37ce0 100644
--- a/hosts/macbook/configuration.nix
+++ b/hosts/macbook/configuration.nix
@@ -46,6 +46,7 @@
       "logi-options+"
       "insta360-link-controller"
       "yubico-authenticator" # TODO: Defer to a module that manages yubikeys for darwin.
+      "google-chrome"
     ];
   };
 
diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix
index 9e1da8a..575fb0e 100644
--- a/hosts/macbook/home.nix
+++ b/hosts/macbook/home.nix
@@ -14,10 +14,12 @@ in {
     ../../home-modules/default.nix
     ../../home-modules/direnv.nix
     ../../home-modules/ghostty-config.nix
+    ../../home-modules/git.nix
     ../../home-modules/homebrew.nix
     ../../home-modules/karabiner.nix
     ../../home-modules/lazygit.nix
     ../../home-modules/nvim.nix
+    ../../home-modules/secretive.nix
     ../../home-modules/starship.nix
     ../../home-modules/tmux.nix
     ../../home-modules/zsh.nix
diff --git a/hosts/macbook/hotkeys.nix b/hosts/macbook/hotkeys.nix
index e010d9b..56af3b1 100644
--- a/hosts/macbook/hotkeys.nix
+++ b/hosts/macbook/hotkeys.nix
@@ -57,6 +57,7 @@ let
   # If you want to keep some hotkeys enabled, simply comment them out or remove them from the following list.
   disableHotKeys = with hotkeyEnums; [
     showSpotlightSearch
+    selectPreviousInputSource
   ];
 
   enabledHotKeys = with hotkeyEnums; [
diff --git a/hosts/msft-mac/home.nix b/hosts/msft-mac/home.nix
index e674811..43b6f9e 100644
--- a/hosts/msft-mac/home.nix
+++ b/hosts/msft-mac/home.nix
@@ -18,6 +18,7 @@ in {
     ../../home-modules/karabiner.nix
     ../../home-modules/lazygit.nix
     ../../home-modules/nvim.nix
+    ../../home-modules/nvim.nix
     ../../home-modules/starship.nix
     ../../home-modules/tmux.nix
     ../../home-modules/zsh.nix
@@ -69,13 +70,6 @@ in {
     stateVersion = "25.05";
   };
 
-  programs.ssh = {
-    enable = true;
-    extraConfig = ''
-Host *
-  IdentityAgent ${homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh
-    '';
-  };
 
   programs.zsh = {
     shellAliases = {
diff --git a/hosts/msft-mac/hotkeys.nix b/hosts/msft-mac/hotkeys.nix
index 6d56148..c1edc7a 100644
--- a/hosts/msft-mac/hotkeys.nix
+++ b/hosts/msft-mac/hotkeys.nix
@@ -55,7 +55,9 @@ let
   # Define which hotkeys you want to disable
   # If you want to disable all hotkeys, you can use the `hotkeyEnums` directly
   # If you want to keep some hotkeys enabled, simply comment them out or remove them from the following list.
-  disableHotKeys = with hotkeyEnums; [];
+  disableHotKeys = with hotkeyEnums; [
+    selectPreviousInputSource
+  ];
 
   enabledHotKeys = with hotkeyEnums; [
     moveLeftASpace