From d76a0bc50e5573f302cc226d288b987f4a7f1013 Mon Sep 17 00:00:00 2001 From: Victor Mignot Date: Fri, 22 Dec 2023 23:18:58 +0100 Subject: [PATCH] Make london QWERTY --- configurations/london/default.nix | 2 ++ modules/workstation/default.nix | 1 + modules/workstation/home-manager/desktop/sway.nix | 7 ++++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configurations/london/default.nix b/configurations/london/default.nix index d44330a..95ad268 100644 --- a/configurations/london/default.nix +++ b/configurations/london/default.nix @@ -58,6 +58,8 @@ /* Hardware acceleration */ hwAccelerationGPU = "nvidia"; + keymap = "us"; + /* System secrets */ sops = { gnupg.sshKeyPaths = [ ]; diff --git a/modules/workstation/default.nix b/modules/workstation/default.nix index 256f062..d841f09 100644 --- a/modules/workstation/default.nix +++ b/modules/workstation/default.nix @@ -26,6 +26,7 @@ with lib; ./home-manager sopsHmModule ]; + home-manager.extraSpecialArgs.keymap = config.keymap; home-manager.users = builtins.mapAttrs (name: value: mkIf value.enableHomeManagerProfile ({ diff --git a/modules/workstation/home-manager/desktop/sway.nix b/modules/workstation/home-manager/desktop/sway.nix index 8a144f1..cfbda06 100644 --- a/modules/workstation/home-manager/desktop/sway.nix +++ b/modules/workstation/home-manager/desktop/sway.nix @@ -1,6 +1,7 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, keymap, ... }: with lib; let + isQwerty = keymap == "us"; gnomeSchema = "org.gnome.desktop.interface"; monitorModule = types.submodule { options = { @@ -48,8 +49,8 @@ in input = { "*" = { - xkb_layout = "fr"; - # xkb_options = "compose:ralt"; + xkb_layout = keymap; + xkb_options = mkIf isQwerty "compose:ralt"; }; };