From 1df7df00f4ffeeed618a6c2c68aa7100dc94c2bb Mon Sep 17 00:00:00 2001 From: willifan Date: Wed, 1 Jan 2025 18:19:04 +0100 Subject: [PATCH] switched to eurkey keyboard layout --- modules/default/common/default.nix | 2 +- modules/default/common/keyd.nix | 6 ------ modules/default/home-manager/desktop/hyprland/hyprland.nix | 4 ++-- modules/default/home-manager/desktop/niri/niri.nix | 3 +-- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/modules/default/common/default.nix b/modules/default/common/default.nix index b25025c..bd5a650 100644 --- a/modules/default/common/default.nix +++ b/modules/default/common/default.nix @@ -28,7 +28,7 @@ networkmanager.enable = true; hostName = "${hostname}"; }; - console.keyMap = "de"; + console.keyMap = "en"; nix.settings.experimental-features = [ "nix-command" "flakes" ]; nixpkgs.config.allowUnfree = true; system.stateVersion = "23.11"; diff --git a/modules/default/common/keyd.nix b/modules/default/common/keyd.nix index f9f1d84..0afd332 100644 --- a/modules/default/common/keyd.nix +++ b/modules/default/common/keyd.nix @@ -10,12 +10,6 @@ rightalt = "overload(altgr, rightalt)"; capslock = "overload(control, esc)"; }; - altgr = { - a = ''macro(compose a ")''; - o = ''macro(compose o ")''; - u = ''macro(compose u ")''; - s = ''macro(compose s s)''; - }; }; }; }; diff --git a/modules/default/home-manager/desktop/hyprland/hyprland.nix b/modules/default/home-manager/desktop/hyprland/hyprland.nix index 77a419a..825b6d7 100644 --- a/modules/default/home-manager/desktop/hyprland/hyprland.nix +++ b/modules/default/home-manager/desktop/hyprland/hyprland.nix @@ -40,10 +40,10 @@ lib.mkIf config.desktop.hyprland.enable { xwayland.force_zero_scaling = true; input = { - kb_layout = "us"; + kb_layout = "eu"; kb_variant = ""; kb_model = ""; - kb_options = "compose:menu"; + kb_options = ""; kb_rules = ""; diff --git a/modules/default/home-manager/desktop/niri/niri.nix b/modules/default/home-manager/desktop/niri/niri.nix index 5da4d2c..887767d 100644 --- a/modules/default/home-manager/desktop/niri/niri.nix +++ b/modules/default/home-manager/desktop/niri/niri.nix @@ -30,8 +30,7 @@ lib.mkIf config.desktop.enable { input = { keyboard.xkb = { - layout = "us(euro)"; - options = "compose:menu"; + layout = "eu"; }; };