From 09acd04a14534e6766e7afb1ad5200aab3f3ca48 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sat, 6 Mar 2021 05:59:24 +0100
Subject: [PATCH] sternchen gets de layout

---
 configs/sternchen/configuration.nix | 62 ++++++++++++++++-------------
 system/all/default.nix              |  6 ++-
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/configs/sternchen/configuration.nix b/configs/sternchen/configuration.nix
index 2085a89..3e649e4 100644
--- a/configs/sternchen/configuration.nix
+++ b/configs/sternchen/configuration.nix
@@ -22,15 +22,15 @@
     pumount.source = "${pkgs.pmount}/bin/pumount";
   };
 
-  # keybase
-  services.keybase.enable = false;
-  services.kbfs.enable = false;
-
   programs.custom.steam.enable = false;
   programs.custom.video.enable = true;
 
-  system.custom.suspend.enable = false;
+  # keyboard fiddling
+  i18n.defaultLocale = "de_DE.UTF-8";
+  console.keyMap = "de";
+  services.xserver.layout = "de,us";
 
+  system.custom.suspend.enable = false;
   services.printing.enable = true;
 
   # fonts
@@ -39,21 +39,29 @@
   programs.custom.xterm.fontSize = 12;
   system.custom.fonts.dpi = 100;
 
-  virtualisation = {
-    docker.enable = false;
-
-    virtualbox = {
-      host.enable = false;
-      guest.x11 = false;
-      guest.enable = false;
-    };
-  };
-
+  # x11
+  # ---
   configuration.desktop = {
     width = 1366;
     height = 768;
   };
+  # for congress and streaming
+  hardware.opengl = {
+    enable = true;
+    extraPackages = [ pkgs.vaapiIntel ];
+    driSupport32Bit = true;
+  };
+  nixpkgs.config.packageOverrides = pkgs: {
+    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+  };
 
+  services.xserver.displayManager.defaultSession = "plasma5";
+  services.xserver.desktopManager.pantheon.enable = true;
+  services.xserver.desktopManager.plasma5.enable = true;
+  services.xserver.desktopManager.xfce.enable = true;
+
+  # stuff
+  # -----
   custom.samba-share = {
     enable = false;
     folders = {
@@ -69,21 +77,19 @@
   programs.adb.enable = false;
   users.users.mainUser.extraGroups = [ "adbusers" "video" ];
 
-  # for congress and streaming
-  hardware.opengl = {
-    enable = true;
-    extraPackages = [ pkgs.vaapiIntel ];
-    driSupport32Bit = true;
-  };
-  nixpkgs.config.packageOverrides = pkgs: {
-    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+  virtualisation = {
+    docker.enable = false;
+
+    virtualbox = {
+      host.enable = false;
+      guest.x11 = false;
+      guest.enable = false;
+    };
   };
 
-  services.xserver.displayManager.defaultSession = "plasma5";
-
-  services.xserver.desktopManager.pantheon.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-  services.xserver.desktopManager.xfce.enable = true;
+  # keybase
+  services.keybase.enable = false;
+  services.kbfs.enable = false;
 
 }
 
diff --git a/system/all/default.nix b/system/all/default.nix
index 018f5c0..3ef4fc8 100644
--- a/system/all/default.nix
+++ b/system/all/default.nix
@@ -49,9 +49,11 @@
   #time.timeZone = lib.mkDefault "Asia/Singapore";
   #time.timeZone = lib.mkDefault "Asia/Makassar";
 
-  i18n.defaultLocale = "en_US.UTF-8";
+  # keyboard fiddling
+  i18n.defaultLocale = lib.mkDefault "en_US.UTF-8";
   console.font = "Lat2-Terminus16";
-  console.keyMap = "us";
+  console.keyMap = lib.mkDefault "us";
+  services.xserver.layout = lib.mkDefault "us";
 
   # swappiness
   # ----------