diff --git a/enviroments/client/default.nix b/enviroments/client/default.nix
index bf2b35e..75265b8 100644
--- a/enviroments/client/default.nix
+++ b/enviroments/client/default.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
     ../common
   ];
diff --git a/enviroments/common/default.nix b/enviroments/common/default.nix
index 691acc7..83201c4 100644
--- a/enviroments/common/default.nix
+++ b/enviroments/common/default.nix
@@ -1,21 +1,4 @@
 {...}: {
-  imports = [];
-
-  nix = {
-    settings = {
-      experimental-features = ["nix-command" "flakes"];
-    };
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 7d";
-    };
-    optimise = {
-      automatic = true;
-      dates = ["weekly"];
-    };
-  };
-
   # Enable networking
   networking.networkmanager.enable = true;
 
@@ -32,20 +15,4 @@
     LC_TELEPHONE = "en_US.UTF-8";
     LC_TIME = "en_US.UTF-8";
   };
-
-  services = {
-    automatic-timezoned = {
-      enable = true;
-    };
-
-    openssh = {
-      enable = true;
-      ports = [22];
-      settings = {
-        PasswordAuthentication = false;
-        UseDns = true;
-        X11Forwarding = false;
-      };
-    };
-  };
 }
diff --git a/modules/default.nix b/modules/default.nix
index 58b93a0..2087f1a 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,5 +1,6 @@
 {...}: {
   imports = [
+    ./system.nix
     ./hardware.nix
     ./users.nix
     ./desktop.nix
diff --git a/modules/desktop.nix b/modules/desktop.nix
index e349abe..6f119af 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -43,6 +43,10 @@
           # no need to redefine it in your config for now)
           #media-session.enable = true;
         };
+
+        automatic-timezoned = {
+          enable = true;
+        };
       };
 
       # Enable sound with pipewire.
diff --git a/modules/system.nix b/modules/system.nix
new file mode 100644
index 0000000..918c219
--- /dev/null
+++ b/modules/system.nix
@@ -0,0 +1,28 @@
+{...}: {
+  nix = {
+    settings = {
+      experimental-features = ["nix-command" "flakes"];
+    };
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 7d";
+    };
+    optimise = {
+      automatic = true;
+      dates = ["weekly"];
+    };
+  };
+
+  services = {
+    openssh = {
+      enable = true;
+      ports = [22];
+      settings = {
+        PasswordAuthentication = false;
+        UseDns = true;
+        X11Forwarding = false;
+      };
+    };
+  };
+}