From 973fa2f27f5e6a6447aa9439c7e90e25a58fa29b Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Sun, 26 May 2024 15:52:40 -0400
Subject: [PATCH] switch to altgr keyboard layout

---
 homeManagerModules/desktop/hyprland/default.nix | 1 +
 homeManagerModules/desktop/sway/default.nix     | 4 ++++
 nixosModules/desktop/default.nix                | 2 +-
 nixosModules/system/default.nix                 | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/homeManagerModules/desktop/hyprland/default.nix b/homeManagerModules/desktop/hyprland/default.nix
index d951b1dc..70e4e787 100644
--- a/homeManagerModules/desktop/hyprland/default.nix
+++ b/homeManagerModules/desktop/hyprland/default.nix
@@ -175,6 +175,7 @@
       # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
       input {
           kb_layout = us
+          kb_variant = altgr-intl
           follow_mouse = 1
           sensitivity = 0 # -1.0 to 1.0, 0 means no modification.
           touchpad {
diff --git a/homeManagerModules/desktop/sway/default.nix b/homeManagerModules/desktop/sway/default.nix
index f83c4d86..62582895 100644
--- a/homeManagerModules/desktop/sway/default.nix
+++ b/homeManagerModules/desktop/sway/default.nix
@@ -210,6 +210,10 @@
           tap = "enabled";
           tap_button_map = "lrm";
         };
+        "type:keyboard" = {
+          xkb_layout = "us";
+          xkb_variant = "altgr-intl";
+        };
         "1386:21186:Wacom_HID_52C2_Finger" = {
           map_to_output = "'Samsung Display Corp. 0x4152 Unknown'";
         };
diff --git a/nixosModules/desktop/default.nix b/nixosModules/desktop/default.nix
index 93ab6026..e5036207 100644
--- a/nixosModules/desktop/default.nix
+++ b/nixosModules/desktop/default.nix
@@ -31,7 +31,7 @@
       xserver = {
         enable = true;
         xkb.layout = "us";
-        xkb.variant = "";
+        xkb.variant = "altgr-intl";
         excludePackages = with pkgs; [xterm];
       };
     };
diff --git a/nixosModules/system/default.nix b/nixosModules/system/default.nix
index be4f8450..1735ef8b 100644
--- a/nixosModules/system/default.nix
+++ b/nixosModules/system/default.nix
@@ -9,6 +9,7 @@
   alyraffauf.system.power-profiles-daemon.enable = lib.mkDefault true;
 
   console = {
+    useXkbConfig = true;
     colors = [
       "303446"
       "e78284"