Fix keyboard layout for gdm

This commit is contained in:
Jakob Lechner 2025-08-06 02:58:45 +02:00
parent 69e05f6599
commit 464a4a9be8
5 changed files with 45 additions and 1 deletions

View file

@ -8,5 +8,25 @@ lib.mkIf (config.jalr.gui.enable && config.jalr.gui.gnome.enable) {
enable = true; enable = true;
autoSuspend = false; autoSuspend = false;
}; };
exportConfiguration = true;
}; };
/*
programs.dconf = {
enable = true;
profiles = {
user.databases = [{
settings = with lib.gvariant; {
"org/gnome/desktop/input-sources" = {
sources = [
(mkTuple [ "xkb" "de" ])
(mkTuple [ "xkb" "de+neo" ])
(mkTuple [ "xkb" "us" ])
];
};
};
}];
};
};
*/
} }

View file

@ -1,6 +1,8 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
lib.mkIf (config.jalr.gui.enable && config.jalr.gui.sway.enable) { lib.mkIf (config.jalr.gui.enable && config.jalr.gui.sway.enable) {
services.displayManager.sessionPackages = [ pkgs.sway ];
programs = { programs = {
wshowkeys.enable = true; wshowkeys.enable = true;
dconf.enable = true; dconf.enable = true;
@ -12,7 +14,7 @@ lib.mkIf (config.jalr.gui.enable && config.jalr.gui.sway.enable) {
}; };
services.greetd = { services.greetd = {
enable = true; enable = !config.jalr.gui.gnome.enable;
settings = settings =
let let
command = pkgs.writeShellScript "sway-init" '' command = pkgs.writeShellScript "sway-init" ''

View file

@ -0,0 +1,15 @@
{ lib, nixosConfig, ... }:
lib.mkIf nixosConfig.jalr.gui.enable {
dconf.settings = {
"org/gnome/desktop/input-sources" = {
xkb-options = [ "grp:win_space_toggle" ];
show-all-sources = true;
sources = [
(lib.hm.gvariant.mkTuple [ "xkb" "de" ])
(lib.hm.gvariant.mkTuple [ "xkb" "de+neo" ])
(lib.hm.gvariant.mkTuple [ "xkb" "us" ])
];
};
};
}

View file

@ -6,6 +6,7 @@
./aws.nix ./aws.nix
./cli ./cli
./communication ./communication
./dconf.nix
./direnv.nix ./direnv.nix
./do-not-disturb ./do-not-disturb
./dynamic-colors.nix ./dynamic-colors.nix

View file

@ -101,6 +101,12 @@ in
terminal = "${terminalEmulator}"; terminal = "${terminalEmulator}";
menu = "${pkgs.wofi}/bin/wofi --allow-images --show drun --color=$HOME/.config/wofi/color"; menu = "${pkgs.wofi}/bin/wofi --allow-images --show drun --color=$HOME/.config/wofi/color";
input."type:keyboard" = {
xkb_layout = "de,de,us";
xkb_variant = "neo,,";
xkb_options = "grp:win_space_toggle";
};
output = { output = {
"*".bg = "${wallpaper} fill"; "*".bg = "${wallpaper} fill";
} // matchHostname "copper" { } // matchHostname "copper" {