diff --git a/hosts/default.nix b/hosts/common.nix
similarity index 99%
rename from hosts/default.nix
rename to hosts/common.nix
index 8926cc0..c913cae 100644
--- a/hosts/default.nix
+++ b/hosts/common.nix
@@ -10,7 +10,6 @@
         trusted-users = ["root" "@wheel"];
     };
 
-    console.keyMap = "de-latin1-nodeadkeys";
     time.timeZone = "Europe/Berlin";
     i18n.defaultLocale = "en_US.UTF-8";
     i18n.extraLocaleSettings = {
@@ -25,6 +24,8 @@
         LC_TIME = "de_DE.UTF-8";
     };
 
+    console.keyMap = "de-latin1-nodeadkeys";
+
     environment.systemPackages = [
         pkgs.git
         pkgs.neovim
diff --git a/hosts/dell-laptop/default.nix b/hosts/dell-laptop/default.nix
index 0aecc4e..80cfb61 100644
--- a/hosts/dell-laptop/default.nix
+++ b/hosts/dell-laptop/default.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
     imports = [
-        ../default.nix
+        ../common.nix
         ./hardware.nix
     ];
 
diff --git a/hosts/seb-desktop/default.nix b/hosts/seb-desktop/default.nix
index cceb497..21bcc4d 100644
--- a/hosts/seb-desktop/default.nix
+++ b/hosts/seb-desktop/default.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
     imports = [
-        ../default.nix
+        ../common.nix
         ./hardware.nix
     ];
 
diff --git a/users/default.nix b/users/common.nix
similarity index 100%
rename from users/default.nix
rename to users/common.nix
index 92b7862..4709aa6 100644
--- a/users/default.nix
+++ b/users/common.nix
@@ -6,6 +6,7 @@
 
     home-manager.sharedModules = [
         ../modules/home
+
         {
             programs.home-manager.enable = true;
             home.stateVersion = "23.11";
@@ -13,7 +14,6 @@
 
             xdg = {
                 enable = true;
-
                 userDirs = {
                     enable = true;
                     createDirectories = true;
diff --git a/users/seb/default.nix b/users/seb/default.nix
index 8e64c2c..bca946a 100644
--- a/users/seb/default.nix
+++ b/users/seb/default.nix
@@ -1,5 +1,5 @@
 {config, ...}: {
-    imports = [../default.nix];
+    imports = [../common.nix];
 
     sops.secrets."password/seb".neededForUsers = true;