diff --git a/cranberry/hardware.nix b/cranberry/hardware.nix index 5af44bc..027113c 100644 --- a/cranberry/hardware.nix +++ b/cranberry/hardware.nix @@ -42,12 +42,18 @@ }; }; - # Alt key swallowed the Meta one - home-manager.users.geoffrey = - { ... }: - { - wayland.windowManager.sway.config.modifier = "Mod1"; + # The LeftMeta key doesn't exist, but there's a 🔍 that triggers LetMeta at CapsLock's place + # So let's just put Meta in place of LeftAlt and LeftAlt in place of 🔍 (who cares about CapsLock) + services.keyd = { + enable = true; + keyboards.internal = { + ids = [ "0001:0001:70533846" ]; + settings.main = { + leftalt = "layer(meta)"; + leftmeta = "overload(alt, esc)"; + }; }; + }; # 8 makes it run out of memory when rebuilding. nix.settings.max-jobs = 1; diff --git a/os/desktop/default.nix b/os/desktop/default.nix index 32ac05b..71c19ea 100644 --- a/os/desktop/default.nix +++ b/os/desktop/default.nix @@ -24,6 +24,14 @@ default_session = initial_session; }; }; + # Rebind CapsLock to Escape (when tapped) + keyd = { + enable = true; + keyboards.default = { + ids = [ "*" ]; + settings.main.capslock = "overload(capslock, esc)"; + }; + }; udev.packages = with pkgs; [ ddcutil ]; # TODO Doesn't seem to help pipewire = { enable = true;