4 files changed, 17 insertions, 12 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index fc64f2f2..0b0a9238 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -351,12 +351,6 @@ in {
         extraProfileCommands = ''
           export XDG_DATA_DIRS="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}''${XDG_DATA_DIRS:+:''${XDG_DATA_DIRS}}"
         '';
-
-        keyboard = {
-          layout = "us";
-          variant = "dvp";
-          options = [ "ctl:nocaps" "compose:caps" ];
-        };
       };
 
       xdg.configFile = {
diff --git a/hosts/eostre/default.nix b/hosts/eostre/default.nix
index 92e4e41c..c8964d99 100644
--- a/hosts/eostre/default.nix
+++ b/hosts/eostre/default.nix
@@ -4,7 +4,7 @@ with lib;
 
 {
   imports = with flake.nixosModules.systemProfiles; [
-    nfsroot
+    default-locale nfsroot
   ];
 
   config = {
@@ -69,9 +69,8 @@ with lib;
     system.stateVersion = "22.11";
 
 
-    time.timeZone = "Europe/Berlin";
+    console.keyMap = "us";
     time.hardwareClockInLocalTime = true;
-    i18n.defaultLocale = "en_DK.UTF-8";
 
 
     environment.systemPackages = with pkgs; [ cifs-utils ];
diff --git a/system-profiles/default-locale.nix b/system-profiles/default-locale.nix
index 6915184a..6c95504b 100644
--- a/system-profiles/default-locale.nix
+++ b/system-profiles/default-locale.nix
@@ -3,8 +3,14 @@
 with lib;
 
 {
-  i18n.defaultLocale = "en_DK.UTF-8";
-  console.keyMap = "dvorak-programmer";
+  i18n = {
+    defaultLocale = "en_DK.UTF-8";
+    extraLocaleSettings = {
+      "TIME_STYLE" = "posix-long-iso";
+    };
+    supportedLocales = [ "C.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" "en_DK.UTF-8/UTF-8" ];
+  };
+  console.keyMap = mkDefault "dvorak-programmer";
 
   time.timeZone = mkDefault "Europe/Berlin";
 }
diff --git a/users/gkleen/default.nix b/users/gkleen/default.nix
index 9ae2c1d0..f7de3924 100644
--- a/users/gkleen/default.nix
+++ b/users/gkleen/default.nix
@@ -3,7 +3,7 @@
   imports = with flake.nixosModules.userProfiles.${userName}; [
     zsh tmux utils direnv
   ];
-  
+
   users.users.${userName} = {
     description = "Gregor Kleen";
     extraGroups = [ "wheel" "networkmanager" "lp" "dialout" "audio" "video" "xmpp" "mail" "ssh" "vboxusers" "libvirtd" "wireshark" "games" "webdav"];
@@ -16,6 +16,12 @@
   };
 
   home-manager.users.${userName} = {
+    home.keyboard = {
+      layout = "us";
+      variant = "dvp";
+      options = [ "ctl:nocaps" "compose:caps" ];
+    };
+
     programs = {
       git = {
         enable = true;