diff --git a/hosts/Infini-DESKTOP/default.nix b/hosts/Infini-DESKTOP/default.nix
index f5942fe..e4fb34b 100644
--- a/hosts/Infini-DESKTOP/default.nix
+++ b/hosts/Infini-DESKTOP/default.nix
@@ -33,14 +33,6 @@
     wireless.interfaces = [ "wlp41s0" ];
   };
 
-  i18n.defaultLocale = "en_US.UTF-8";
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "us";
-    earlySetup = true;
-    packages = [ ];
-  };
-  services.kmscon.enable = true;
 
 
 }
diff --git a/profiles/core/console.nix b/profiles/core/console.nix
new file mode 100644
index 0000000..fc46477
--- /dev/null
+++ b/profiles/core/console.nix
@@ -0,0 +1,9 @@
+{ ... }: {
+  console = {
+    font = "Lat2-Terminus16";
+    earlySetup = true;
+    packages = [ ];
+  };
+
+  services.kmscon.enable = true;
+}
diff --git a/profiles/core/locale.nix b/profiles/core/locale.nix
new file mode 100644
index 0000000..0ddd230
--- /dev/null
+++ b/profiles/core/locale.nix
@@ -0,0 +1,7 @@
+{ ... }: {
+  i18n.defaultLocale = "en_US.UTF-8";
+  console.keyMap = "us";
+  services.xserver.layout = "us";
+
+  time.timeZone = "America/New_York";
+}
diff --git a/profiles/graphical/xserver.nix b/profiles/graphical/xserver.nix
index e3da52e..4097a10 100644
--- a/profiles/graphical/xserver.nix
+++ b/profiles/graphical/xserver.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }: {
   services.xserver = {
     enable = true;
-    layout = "us";
   };
 
   environment.systemPackages = with pkgs; [