mirror of
https://gitlab.com/Zaney/zaneyos.git
synced 2025-02-17 00:50:48 +01:00
Fix switchable and dual keyboard layout configurations
This commit is contained in:
parent
f4c143795e
commit
93b2dede38
@ -7,7 +7,8 @@ let
|
|||||||
browser cpuType gpuType
|
browser cpuType gpuType
|
||||||
wallpaperDir borderAnim
|
wallpaperDir borderAnim
|
||||||
theKBDLayout terminal
|
theKBDLayout terminal
|
||||||
theSecondKBDLayout sdl-videodriver;
|
theSecondKBDLayout
|
||||||
|
theKBDVariant sdl-videodriver;
|
||||||
in with lib; {
|
in with lib; {
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -34,7 +35,7 @@ in with lib; {
|
|||||||
}
|
}
|
||||||
|
|
||||||
input {
|
input {
|
||||||
kb_layout = ${theKBDLayout},${theSecondKBDLayout}
|
kb_layout = ${theKBDLayout}, ${theSecondKBDLayout}
|
||||||
kb_options = grp:alt_shift_toggle
|
kb_options = grp:alt_shift_toggle
|
||||||
kb_options=caps:super
|
kb_options=caps:super
|
||||||
follow_mouse = 1
|
follow_mouse = 1
|
||||||
|
@ -1,12 +1,13 @@
|
|||||||
{ pkgs, config, ... }:
|
{ pkgs, config, ... }:
|
||||||
|
|
||||||
let inherit (import ../../options.nix) theKBDLayout; in
|
let inherit (import ../../options.nix) theKBDVariant
|
||||||
|
theKBDLayout theSecondKBDLayout; in
|
||||||
{
|
{
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
xkb = {
|
xkb = {
|
||||||
variant = "";
|
variant = "${theKBDVariant}";
|
||||||
layout = "${theKBDLayout}";
|
layout = "${theKBDLayout}, ${theSecondKBDLayout}";
|
||||||
};
|
};
|
||||||
libinput.enable = true;
|
libinput.enable = true;
|
||||||
displayManager.sddm = {
|
displayManager.sddm = {
|
||||||
|
@ -34,7 +34,8 @@ in {
|
|||||||
clock24h = false;
|
clock24h = false;
|
||||||
theLocale = "en_US.UTF-8";
|
theLocale = "en_US.UTF-8";
|
||||||
theKBDLayout = "us";
|
theKBDLayout = "us";
|
||||||
theSecondKBDLayout = "pl";
|
theSecondKBDLayout = "de";
|
||||||
|
theKBDVariant = "";
|
||||||
theLCVariables = "en_US.UTF-8";
|
theLCVariables = "en_US.UTF-8";
|
||||||
theTimezone = "America/Chicago";
|
theTimezone = "America/Chicago";
|
||||||
theShell = "bash"; # Possible options: bash, zsh
|
theShell = "bash"; # Possible options: bash, zsh
|
||||||
|
Loading…
Reference in New Issue
Block a user