fix(gnome): fix input sources

- add input sources to system-level config
- use lib.hm.gvariant.mkTuple for dconf.settings
This commit is contained in:
Felix Schröter 2020-10-20 15:40:57 +02:00
parent e7a8fdd252
commit 13766c34a6
No known key found for this signature in database
GPG key ID: 910ACB9F6BD26F58
2 changed files with 7 additions and 3 deletions

View file

@ -33,6 +33,10 @@ in {
services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.enable = true;
services.xserver.displayManager.gdm.wayland = false; services.xserver.displayManager.gdm.wayland = false;
services.xserver.desktopManager.gnome3.enable = true; services.xserver.desktopManager.gnome3.enable = true;
services.xserver.desktopManager.gnome3.extraGSettingsOverrides = ''
[org/gnome/desktop/input-sources]
sources=[('xkb', 'gb'), ('xkb', 'mozc-jp')]
'';
# exclude some default applications # exclude some default applications
environment.gnome3.excludePackages = with pkgs; [ environment.gnome3.excludePackages = with pkgs; [

View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { config, lib, pkgs, ... }:
let let
left = "h"; left = "h";
@ -6,7 +6,7 @@ let
up = "k"; up = "k";
right = "l"; right = "l";
in { in {
dconf.settings = { dconf.settings = with lib.hm.gvariant; {
"org/gnome/shell" = { "org/gnome/shell" = {
enabled-extensions = [ enabled-extensions = [
"user-theme@gnome-shell-extensions.gcampax.github.com" "user-theme@gnome-shell-extensions.gcampax.github.com"
@ -29,7 +29,7 @@ in {
}; };
"org/gnome/desktop/sound" = { theme-name = "Pop"; }; "org/gnome/desktop/sound" = { theme-name = "Pop"; };
"org/gnome/desktop/input-sources" = { "org/gnome/desktop/input-sources" = {
sources = [ "('xkb', 'gb')" "('ibus', 'mozc-jp')" ]; sources = map mkTuple [ [ "xkb" "gb" ] [ "ibus" "mozc-jp" ] ];
xkb-options = [ "compose:ralt" ]; xkb-options = [ "compose:ralt" ];
}; };