9 files changed, 42 insertions, 20 deletions
diff --git a/machines/devhell/eir.nix b/machines/devhell/eir.nix
index a76be6e5..9ffd5bb4 100644
--- a/machines/devhell/eir.nix
+++ b/machines/devhell/eir.nix
@@ -74,11 +74,14 @@
   };
 
   i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "uk";
     defaultLocale = "en_GB.UTF-8";
   };
 
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "uk";
+  };
+
   #### Machine-specific service configuration ####
 
   vuizvui.user.devhell.profiles.services.enable = true;
diff --git a/machines/devhell/gunnr.nix b/machines/devhell/gunnr.nix
index 70a009c4..b3323629 100644
--- a/machines/devhell/gunnr.nix
+++ b/machines/devhell/gunnr.nix
@@ -78,9 +78,12 @@
   };
 
   i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "dvorak";
-    defaultLocale = "en_GB.UTF-8";
+    defaultLocale = "en_US.UTF-8";
+  };
+
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "dvorak";
   };
 
   #### Machine-specific service configuration ####
diff --git a/machines/devhell/hildr.nix b/machines/devhell/hildr.nix
index 19c89029..47959d5e 100644
--- a/machines/devhell/hildr.nix
+++ b/machines/devhell/hildr.nix
@@ -82,11 +82,14 @@
   };
 
   i18n = {
-    consoleFont = "lat9w-16";
-    consoleKeyMap = "uk";
     defaultLocale = "en_GB.UTF-8";
   };
 
+  console = {
+    font = "lat9w-16";
+    keyMap = "uk";
+  };
+
   #### Machine-specific service configuration ####
 
   vuizvui.user.devhell.profiles.services.enable = true;
diff --git a/machines/devhell/sigrun.nix b/machines/devhell/sigrun.nix
index 4fba2ffe..9db7c063 100644
--- a/machines/devhell/sigrun.nix
+++ b/machines/devhell/sigrun.nix
@@ -71,11 +71,14 @@
   nix.maxJobs = 8;
 
   i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "dvorak";
     defaultLocale = "en_US.UTF-8";
   };
 
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "dvorak";
+  };
+
   powerManagement.powerUpCommands = ''
     ${pkgs.hdparm}/sbin/hdparm -B 255 \
   /dev/disk/by-id/ata-ST31500541AS_6XW0NK21
diff --git a/machines/profpatsch/base-workstation.nix b/machines/profpatsch/base-workstation.nix
index 1d70951e..b71ed3e3 100644
--- a/machines/profpatsch/base-workstation.nix
+++ b/machines/profpatsch/base-workstation.nix
@@ -34,9 +34,9 @@ in {
       };
     };
 
-    i18n = {
-      consoleFont = "lat9w-16";
-      consoleKeyMap = "neo";
+    console = {
+      font = "lat9w-16";
+      keyMap = "neo";
     };
 
     # Enables drivers, acpi, power management
diff --git a/machines/sternenseemann/fliewatuet.nix b/machines/sternenseemann/fliewatuet.nix
index 18a17e35..a621270a 100644
--- a/machines/sternenseemann/fliewatuet.nix
+++ b/machines/sternenseemann/fliewatuet.nix
@@ -77,11 +77,14 @@ in {
 
 
   i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "de-latin1";
     defaultLocale = "en_US.UTF-8";
   };
 
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "de-latin1";
+  };
+
   time.timeZone = "Europe/Berlin";
 
   environment.systemPackages = with pkgs; [
diff --git a/machines/sternenseemann/schnurrkadse.nix b/machines/sternenseemann/schnurrkadse.nix
index 685cb779..fc189956 100644
--- a/machines/sternenseemann/schnurrkadse.nix
+++ b/machines/sternenseemann/schnurrkadse.nix
@@ -59,11 +59,14 @@ in {
   };
 
   i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "de";
     defaultLocale = "en_US.UTF-8";
   };
 
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "de";
+  };
+
   time.timeZone = "Europe/Berlin";
 
   environment.systemPackages = with pkgs; [
diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix
index 36f1c209..ff3f3f9f 100644
--- a/modules/user/aszlig/profiles/base.nix
+++ b/modules/user/aszlig/profiles/base.nix
@@ -32,8 +32,8 @@ in {
     networking.useNetworkd = true;
     networking.useDHCP = false;
 
-    i18n.consoleKeyMap = "dvorak";
-    i18n.consoleFont = "lat9w-16";
+    console.keyMap = "dvorak";
+    console.font = "lat9w-16";
 
     programs.ssh.startAgent = false;
     programs.ssh.extraConfig = ''
diff --git a/modules/user/openlab/base.nix b/modules/user/openlab/base.nix
index b37d34c6..accf0271 100644
--- a/modules/user/openlab/base.nix
+++ b/modules/user/openlab/base.nix
@@ -26,10 +26,14 @@ in
     };
 
     i18n = {
-      consoleFont = "lat9w-16";
-      consoleKeyMap = "us";
       defaultLocale = "de_DE.UTF-8";
     };
+
+    console = {
+      font = "lat9w-16";
+      keyMap = "us";
+    };
+
     time.timeZone = "Europe/Berlin";
 
     hardware.enableRedistributableFirmware = true;