Fix(system): Switch to dvorak-programmer layout

2 files changed, 13 insertions, 14 deletions

diff --git a/home-manager/wms/river/init b/home-manager/wms/river/init
index cff3409d..d8c15a12 100755
--- a/home-manager/wms/river/init
+++ b/home-manager/wms/river/init
@@ -20,6 +20,7 @@ err_fail export XDG_CURRENT_DESKTOP=river
 #}}}
 
 # Setup of mappings {{{
+err_fail riverctl keyboard-layout 'us(dvp)'
 err_fail river_init_lesser ~/.config/river/res/keys.ron
 # }}}
 
diff --git a/system/locale/default.nix b/system/locale/default.nix
index 2fcc2115..e93066be 100644
--- a/system/locale/default.nix
+++ b/system/locale/default.nix
@@ -1,3 +1,4 @@
+# vim: ts=2
 {
   config,
   pkgs,
@@ -7,20 +8,17 @@
   time.timeZone = "Europe/Berlin";
 
   # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "de_DE.UTF-8";
-    LC_IDENTIFICATION = "de_DE.UTF-8";
-    LC_MEASUREMENT = "de_DE.UTF-8";
-    LC_MONETARY = "de_DE.UTF-8";
-    LC_NAME = "de_DE.UTF-8";
-    LC_NUMERIC = "de_DE.UTF-8";
-    LC_PAPER = "de_DE.UTF-8";
-    LC_TELEPHONE = "de_DE.UTF-8";
-    LC_TIME = "de_DE.UTF-8";
+  i18n = {
+    defaultLocale = "en_CA.UTF-8";
+    extraLocaleSettings = {
+      LANGUAGE="en_CA:en_US:en";
+      LC_TIME = "en_DK.UTF-8";
+      LC_COLLATE = "C.UTF-8";
+    };
   };
 
-  # Configure console keymap
-  console.keyMap = "dvorak";
+  # Layout
+  console = {
+    keyMap = "dvorak-programmer";
+  };
 }