Fix keyboard layout for gdm
This commit is contained in:
parent
69e05f6599
commit
464a4a9be8
5 changed files with 45 additions and 1 deletions
|
|
@ -8,5 +8,25 @@ lib.mkIf (config.jalr.gui.enable && config.jalr.gui.gnome.enable) {
|
|||
enable = true;
|
||||
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" ])
|
||||
];
|
||||
};
|
||||
};
|
||||
}];
|
||||
};
|
||||
};
|
||||
*/
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
lib.mkIf (config.jalr.gui.enable && config.jalr.gui.sway.enable) {
|
||||
services.displayManager.sessionPackages = [ pkgs.sway ];
|
||||
|
||||
programs = {
|
||||
wshowkeys.enable = true;
|
||||
dconf.enable = true;
|
||||
|
|
@ -12,7 +14,7 @@ lib.mkIf (config.jalr.gui.enable && config.jalr.gui.sway.enable) {
|
|||
};
|
||||
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
enable = !config.jalr.gui.gnome.enable;
|
||||
settings =
|
||||
let
|
||||
command = pkgs.writeShellScript "sway-init" ''
|
||||
|
|
|
|||
15
users/jalr/modules/dconf.nix
Normal file
15
users/jalr/modules/dconf.nix
Normal 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" ])
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -6,6 +6,7 @@
|
|||
./aws.nix
|
||||
./cli
|
||||
./communication
|
||||
./dconf.nix
|
||||
./direnv.nix
|
||||
./do-not-disturb
|
||||
./dynamic-colors.nix
|
||||
|
|
|
|||
|
|
@ -101,6 +101,12 @@ in
|
|||
terminal = "${terminalEmulator}";
|
||||
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 = {
|
||||
"*".bg = "${wallpaper} fill";
|
||||
} // matchHostname "copper" {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue