From 7e0a707db500a2a2f6d6ceee95b597c32d61ad70 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 21 Jul 2023 18:44:32 +0200 Subject: [PATCH] Common: set up default keyboard layout --- machines/Archie/configuration.nix | 4 ---- machines/Everest/configuration.nix | 9 --------- machines/SurfaceGo/configuration.nix | 4 ---- roles/common/configuration.nix | 5 +++++ 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/machines/Archie/configuration.nix b/machines/Archie/configuration.nix index 020dc55..dfd748a 100644 --- a/machines/Archie/configuration.nix +++ b/machines/Archie/configuration.nix @@ -30,10 +30,6 @@ # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - console = { - keyMap = "es"; - }; - # Enable the X11 windowing system. services.xserver.enable = true; diff --git a/machines/Everest/configuration.nix b/machines/Everest/configuration.nix index b97449a..8cd3198 100755 --- a/machines/Everest/configuration.nix +++ b/machines/Everest/configuration.nix @@ -32,15 +32,6 @@ nameservers = [ "8.8.8.8" ]; }; - # Configure keymap in X11 - services.xserver = { - layout = "es"; - xkbVariant = ""; - }; - - # Configure console keymap - console.keyMap = "es"; - # Define a user account. Don't forget to set a password with ‘passwd’. users.users.toast = { isNormalUser = true; diff --git a/machines/SurfaceGo/configuration.nix b/machines/SurfaceGo/configuration.nix index 05f9686..3f91f65 100644 --- a/machines/SurfaceGo/configuration.nix +++ b/machines/SurfaceGo/configuration.nix @@ -30,10 +30,6 @@ # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - console = { - keyMap = "es"; - }; - # Enable the X11 windowing system. services.xserver.enable = true; diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix index 9fc3089..67ea919 100755 --- a/roles/common/configuration.nix +++ b/roles/common/configuration.nix @@ -18,6 +18,11 @@ cleanOnBoot = !config.boot.tmp.useTmpfs; }; + # Set up keyboard layout + services.xserver.layout = "es"; + # Make the console use X's keyboard configuration + console.useXkbConfig = true; + # Set up localisation i18n = { defaultLocale = "en_US.UTF-8";