From 13766c34a6527693c9cab8aa842e43908d861ca8 Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Tue, 20 Oct 2020 15:40:57 +0200
Subject: [PATCH] fix(gnome): fix input sources

- add input sources to system-level config
- use lib.hm.gvariant.mkTuple for dconf.settings
---
 desktop/gnome.nix      | 4 ++++
 home/desktop/gnome.nix | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/desktop/gnome.nix b/desktop/gnome.nix
index 7622d8f..f79d8db 100644
--- a/desktop/gnome.nix
+++ b/desktop/gnome.nix
@@ -33,6 +33,10 @@ in {
   services.xserver.displayManager.gdm.enable = true;
   services.xserver.displayManager.gdm.wayland = false;
   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
   environment.gnome3.excludePackages = with pkgs; [
diff --git a/home/desktop/gnome.nix b/home/desktop/gnome.nix
index 1ed82f4..26eb02e 100644
--- a/home/desktop/gnome.nix
+++ b/home/desktop/gnome.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   left = "h";
@@ -6,7 +6,7 @@ let
   up = "k";
   right = "l";
 in {
-  dconf.settings = {
+  dconf.settings = with lib.hm.gvariant; {
     "org/gnome/shell" = {
       enabled-extensions = [
         "user-theme@gnome-shell-extensions.gcampax.github.com"
@@ -29,7 +29,7 @@ in {
     };
     "org/gnome/desktop/sound" = { theme-name = "Pop"; };
     "org/gnome/desktop/input-sources" = {
-      sources = [ "('xkb', 'gb')" "('ibus', 'mozc-jp')" ];
+      sources = map mkTuple [ [ "xkb" "gb" ] [ "ibus" "mozc-jp" ] ];
       xkb-options = [ "compose:ralt" ];
     };