diff --git a/.config/nix/flake.nix b/.config/nix/flake.nix
index dda66c1..1a57777 100644
--- a/.config/nix/flake.nix
+++ b/.config/nix/flake.nix
@@ -32,6 +32,7 @@
 
       modules = [
         ./modules/nix-core.nix
+        ./modules/system.nix
         ./modules/darwin
         home-manager.darwinModules.home-manager
         {
diff --git a/.config/nix/modules/darwin/default.nix b/.config/nix/modules/darwin/default.nix
index 3e543ba..0573ac5 100644
--- a/.config/nix/modules/darwin/default.nix
+++ b/.config/nix/modules/darwin/default.nix
@@ -21,26 +21,6 @@
     })
   ];
 
-  system.defaults = {
-    dock.autohide = true;
-    dock.autohide-time-modifier = 0.1;
-    dock.expose-animation-duration = 0.0;
-    dock.mru-spaces = false;
-    dock.orientation = "right";
-    NSGlobalDomain.InitialKeyRepeat = 14;
-    NSGlobalDomain.KeyRepeat = 1;
-    NSGlobalDomain.AppleShowAllExtensions = true;
-    NSGlobalDomain.AppleShowAllFiles = true;
-    NSGlobalDomain."com.apple.mouse.tapBehavior" = 1;
-    finder.AppleShowAllExtensions = true;
-    finder.AppleShowAllFiles = true;
-    finder.CreateDesktop = false;
-    finder.FXPreferredViewStyle = "Nlsv";
-    finder.QuitMenuItem = true;
-    finder._FXShowPosixPathInTitle = true;
-    menuExtraClock.ShowDate = 0;
-    menuExtraClock.ShowDayOfWeek = false;
-  };
   users.users.tobi.description = "Tobias Ostner";
   users.users.tobi.home = "/Users/tobi";
   users.users.tobi.shell = pkgs.zshInteractive;
diff --git a/.config/nix/modules/system.nix b/.config/nix/modules/system.nix
new file mode 100644
index 0000000..861a762
--- /dev/null
+++ b/.config/nix/modules/system.nix
@@ -0,0 +1,35 @@
+{ pkgs, ...}:
+{
+  system = {
+    activationScripts.postUserActivation.text = ''
+    /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u
+    '';
+
+    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;
+    };
+  };
+
+  security.pam.enableSudoTouchIdAuth = true;
+
+    programs.zsh.enable = true;
+
+}