diff --git a/.config/nix/modules/darwin/default.nix b/.config/nix/modules/darwin/default.nix
index 1a2e14f..13bce3d 100644
--- a/.config/nix/modules/darwin/default.nix
+++ b/.config/nix/modules/darwin/default.nix
@@ -9,17 +9,5 @@
     pathsToLink = [ "/Applications" ];
   };
 
-  fonts.fonts = [
-    (pkgs.nerdfonts.override {
-      fonts = [
-        "FiraCode"
-        "Iosevka"
-        "IosevkaTerm"
-        "JetBrainsMono"
-        "SourceCodePro"
-      ];
-    })
-  ];
-
   users.users.tobi.shell = pkgs.zshInteractive;
 })
diff --git a/.config/nix/modules/system.nix b/.config/nix/modules/system.nix
index 861a762..7cb87be 100644
--- a/.config/nix/modules/system.nix
+++ b/.config/nix/modules/system.nix
@@ -6,30 +6,64 @@
     '';
 
     defaults = {
-      NSGlobalDomain."com.apple.mouse.tapBehavior" = 1;
-      NSGlobalDomain.AppleShowAllExtensions = true;
-      NSGlobalDomain.AppleShowAllFiles = true;
-      NSGlobalDomain.InitialKeyRepeat = 14;
-      NSGlobalDomain.KeyRepeat = 1;
-      dock.autohide = true;
-      dock.autohide-time-modifier = 0.1;
-      dock.expose-animation-duration = 0.0;
-      dock.mru-spaces = false;
-      dock.orientation = "right";
-      finder.AppleShowAllExtensions = true;
-      finder.AppleShowAllFiles = true;
-      finder.CreateDesktop = false;
-      finder.FXPreferredViewStyle = "Nlsv";
-      finder.QuitMenuItem = true;
-      finder._FXShowPosixPathInTitle = true;
-      menuExtraClock.Show24Hour = true;
-      menuExtraClock.ShowDate = 0;
-      menuExtraClock.ShowDayOfWeek = false;
+      dock= {
+        autohide = true;
+        autohide-time-modifier = 0.1;
+        expose-animation-duration = 0.0;
+        mru-spaces = false;
+        orientation = "right";
+        show-recents = false;
+      };
+
+      finder = {
+        AppleShowAllExtensions = true;
+        AppleShowAllFiles = true;
+        CreateDesktop = false;
+        FXPreferredViewStyle = "Nlsv";
+        QuitMenuItem = true;
+        ShowPathbar = true;
+        ShowStatusBar = true;
+        _FXShowPosixPathInTitle = true;
+      };
+
+      trackpad = {
+        Clicking = true;
+        TrackpadRightClick = true;
+        TrackpadThreeFingerDrag = true;
+      };
+
+      menuExtraClock = {
+        Show24Hour = true;
+        ShowDate = 0;
+        ShowDayOfWeek = false;
+      };
+
+      NSGlobalDomain = {
+        AppleInterfaceStyle = "Dark";
+        AppleShowAllExtensions = true;
+        AppleShowAllFiles = true;
+        InitialKeyRepeat = 14;
+        KeyRepeat = 1;
+        "com.apple.mouse.tapBehavior" = 1;
+      };
     };
   };
 
   security.pam.enableSudoTouchIdAuth = true;
 
-    programs.zsh.enable = true;
+  programs.zsh.enable = true;
 
+  fonts.fonts = [
+    pkgs.material-design-icons
+    pkgs.font-awesome
+    (pkgs.nerdfonts.override {
+      fonts = [
+        "FiraCode"
+        "Iosevka"
+        "IosevkaTerm"
+        "JetBrainsMono"
+        "SourceCodePro"
+      ];
+    })
+  ];
 }