diff --git a/config/home/hyprland.nix b/config/home/hyprland.nix index f22bcb6..d44b950 100644 --- a/config/home/hyprland.nix +++ b/config/home/hyprland.nix @@ -7,7 +7,8 @@ let browser cpuType gpuType wallpaperDir borderAnim theKBDLayout terminal - theSecondKBDLayout sdl-videodriver; + theSecondKBDLayout + theKBDVariant sdl-videodriver; in with lib; { wayland.windowManager.hyprland = { enable = true; @@ -34,7 +35,7 @@ in with lib; { } input { - kb_layout = ${theKBDLayout},${theSecondKBDLayout} + kb_layout = ${theKBDLayout}, ${theSecondKBDLayout} kb_options = grp:alt_shift_toggle kb_options=caps:super follow_mouse = 1 diff --git a/config/system/displaymanager.nix b/config/system/displaymanager.nix index e0803b8..0eca4db 100644 --- a/config/system/displaymanager.nix +++ b/config/system/displaymanager.nix @@ -1,12 +1,13 @@ { pkgs, config, ... }: -let inherit (import ../../options.nix) theKBDLayout; in +let inherit (import ../../options.nix) theKBDVariant +theKBDLayout theSecondKBDLayout; in { services.xserver = { enable = true; xkb = { - variant = ""; - layout = "${theKBDLayout}"; + variant = "${theKBDVariant}"; + layout = "${theKBDLayout}, ${theSecondKBDLayout}"; }; libinput.enable = true; displayManager.sddm = { diff --git a/options.nix b/options.nix index 9f87163..37874ca 100644 --- a/options.nix +++ b/options.nix @@ -34,7 +34,8 @@ in { clock24h = false; theLocale = "en_US.UTF-8"; theKBDLayout = "us"; - theSecondKBDLayout = "pl"; + theSecondKBDLayout = "de"; + theKBDVariant = ""; theLCVariables = "en_US.UTF-8"; theTimezone = "America/Chicago"; theShell = "bash"; # Possible options: bash, zsh