diff --git a/darwin-configuration.nix b/darwin-configuration.nix
index 76c6043..f22423d 100644
--- a/darwin-configuration.nix
+++ b/darwin-configuration.nix
@@ -1,6 +1,11 @@
 { pkgs, lib, ... }:
 
 {
+  imports = [
+    ./system/defaults.nix
+    ./system/fonts.nix
+  ];
+
   nix = {
     binaryCaches = [
       "https://nix-community.cachix.org"
@@ -37,11 +42,4 @@
   services = {
     nix-daemon.enable = true;
   };
-
-  fonts = {
-    enableFontDir = true;
-    fonts = with pkgs; [
-      (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-    ];
-  };
 }
diff --git a/flake.lock b/flake.lock
index 1c0c0e9..8346139 100644
--- a/flake.lock
+++ b/flake.lock
@@ -81,11 +81,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1643987241,
-        "narHash": "sha256-s94M2ta+BkdVUrrSQQvwz7kenc+GPP7W1vvkwBLD0zk=",
+        "lastModified": 1644113939,
+        "narHash": "sha256-n5rTM+kjEoXxTqaHle4AhrSiqRW2fc2U+Kor1whbaXQ=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "dcbf9f93e9038d9b4eb782aff2a07e2560f6e04e",
+        "rev": "8215c05945054755b2c3cadae198894372dbfe0f",
         "type": "github"
       },
       "original": {
@@ -104,11 +104,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1644048646,
-        "narHash": "sha256-wYTDoEI+ImMZN9oYvoNGQcFTxTDvrrLZKwohRIS+SN4=",
+        "lastModified": 1644135144,
+        "narHash": "sha256-ga02Em84w/rmDVoHha8PG9wiznz9Ew7ReETbXnokj7M=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "002d0079996c03a318ee6ca389c4df87d3bbec31",
+        "rev": "98a805c76bf18c9a45b0e0c729cc0e2975c25628",
         "type": "github"
       },
       "original": {
diff --git a/system/defaults.nix b/system/defaults.nix
new file mode 100644
index 0000000..5156864
--- /dev/null
+++ b/system/defaults.nix
@@ -0,0 +1,13 @@
+{
+  system.defaults = {
+    dock = {
+      autohide = true;
+      orientation = "left";
+      mineffect = "scale";
+      minimize-to-application = true;
+      showhidden = true;
+      show-recents = false;
+      tilesize = 40;
+    };
+  };
+}
diff --git a/system/fonts.nix b/system/fonts.nix
new file mode 100644
index 0000000..1d587e8
--- /dev/null
+++ b/system/fonts.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  fonts = {
+    enableFontDir = true;
+
+    fonts = with pkgs; [
+      (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+    ];
+  };
+}