diff --git a/nix/system/darwin-configuration.nix b/nix/system/darwin-configuration.nix
index 46f0d51..b23bb60 100644
--- a/nix/system/darwin-configuration.nix
+++ b/nix/system/darwin-configuration.nix
@@ -5,8 +5,8 @@
   # $ nix-env -qaP | grep wget
   environment.systemPackages =
     [
-      pkgs.firefox
-      skhd
+      pkgs.vim
+      pkgs.iterm2
     ];
 
   # Use a custom configuration.nix location.
@@ -18,9 +18,27 @@
   # nix.package = pkgs.nix;
 
   # Create /etc/bashrc that loads the nix-darwin environment.
-  programs.zsh.enable = true;  # default shell on catalina
+  programs.zsh.enable = true; # default shell on catalina
   # programs.fish.enable = true;
 
+  # We need this snippet to allow spotlight to find the applications installed
+  # by nix-darwin
+  system.activationScripts.applications.text = pkgs.lib.mkForce (
+    ''
+      rm -rf ~/Applications/Nix\ Apps
+      mkdir -p ~/Applications/Nix\ Apps
+      for app in $(find ${config.system.build.applications}/Applications -maxdepth 1 -type l); do
+        src="$(/usr/bin/stat -f%Y "$app")"
+        cp -r "$src" ~/Applications/Nix\ Apps
+      done
+    ''
+  );
+
+  system.keyboard = {
+    enableKeyMapping = true;
+    remapCapsLockToEscape = true;
+  };
+
   # Used for backwards compatibility, please read the changelog before changing.
   # $ darwin-rebuild changelog
   system.stateVersion = 4;