diff --git a/home/darwin/default.nix b/home/darwin/default.nix
index c4c9948..01a3db6 100644
--- a/home/darwin/default.nix
+++ b/home/darwin/default.nix
@@ -46,8 +46,8 @@ in {
 
   targets.darwin = {
     defaults = {
-      "com.googlecode.iterm2" = import ./iterm2.nix;
-      "com.apple.finder" = import ./finder.nix;
+      "com.googlecode.iterm2" = ./iterm2.nix;
+      "com.apple.finder" = ./finder.nix;
       NSGlobalDomain = {
         AppleLanguages = [ "en-CA" ];
         AppleLocale = "en_CA";
diff --git a/system/darwin.nix b/system/darwin.nix
index ed8c795..b6addd6 100644
--- a/system/darwin.nix
+++ b/system/darwin.nix
@@ -6,4 +6,25 @@
   nix.package = pkgs.nix;
 
   programs.zsh.enable = true;
+
+  system = {
+    defaults = {
+      loginwindow.SHOWFULLNAME = false;
+      loginwindow.GuestEnabled = false;
+      loginwindow.DisableConsoleAccess = true;
+      finder._FXShowPosixPathInTitle = true;
+      LaunchServices.LSQuarantine = false;
+    };
+    keyboard = {
+    enableKeyMapping = true;
+
+    remapCapsLockToEscape = true;
+
+    # see https://developer.apple.com/library/content/technotes/tn2450/_index.html for more info
+    userKeyMapping = [ {
+      HIDKeyboardModifierMappingSrc = 30064771303; # remap right command to right control.
+      HIDKeyboardModifierMappingDst = 30064771300; 
+    }];
+    };
+  };
 }