diff options
author | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2020-04-23 12:00:00 +0000 |
---|---|---|
committer | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2020-06-02 22:32:03 +0200 |
commit | 3dbd629fa4fa6bb36eb96c8b7f2d675c30981ac1 (patch) | |
tree | 385b6abb70a4c0236b1d7df3ed11770702197105 /nixos/modules | |
parent | 135073a87b7e2c631739f4ffa016e1859b1a425e (diff) | |
download | nixpkgs-3dbd629fa4fa6bb36eb96c8b7f2d675c30981ac1.tar nixpkgs-3dbd629fa4fa6bb36eb96c8b7f2d675c30981ac1.tar.gz nixpkgs-3dbd629fa4fa6bb36eb96c8b7f2d675c30981ac1.tar.bz2 nixpkgs-3dbd629fa4fa6bb36eb96c8b7f2d675c30981ac1.tar.lz nixpkgs-3dbd629fa4fa6bb36eb96c8b7f2d675c30981ac1.tar.xz nixpkgs-3dbd629fa4fa6bb36eb96c8b7f2d675c30981ac1.tar.zst nixpkgs-3dbd629fa4fa6bb36eb96c8b7f2d675c30981ac1.zip |
ibus: fix installation of dconf database
Fixes this warning at ibus-daemon startup: (ibus-dconf:15691): dconf-WARNING **: 21:49:24.018: unable to open file '/etc/dconf/db/ibus': Failed to open file ?/etc/dconf/db/ibus?: open() failed: No such file or directory; expect degraded performance
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/i18n/input-method/ibus.nix | 2 | ||||
-rw-r--r-- | nixos/modules/programs/dconf.nix | 37 |
2 files changed, 28 insertions, 11 deletions
diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index b4746b21b65..cf24ecf5863 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -64,7 +64,7 @@ in # Without dconf enabled it is impossible to use IBus programs.dconf.enable = true; - programs.dconf.profiles.ibus = "${ibusPackage}/etc/dconf/profile/ibus"; + programs.dconf.packages = [ ibusPackage ]; services.dbus.packages = [ ibusAutostart diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index 6702e8efd1c..ec85cb9d18c 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -4,13 +4,24 @@ with lib; let cfg = config.programs.dconf; - - mkDconfProfile = name: path: - { - name = "dconf/profile/${name}"; - value.source = path; - }; - + cfgDir = pkgs.symlinkJoin { + name = "dconf-system-config"; + paths = map (x: "${x}/etc/dconf") cfg.packages; + postBuild = '' + mkdir -p $out/profile + mkdir -p $out/db + '' + ( + concatStringsSep "\n" ( + mapAttrsToList ( + name: path: '' + ln -s ${path} $out/profile/${name} + '' + ) cfg.profiles + ) + ) + '' + ${pkgs.dconf}/bin/dconf update $out/db + ''; + }; in { ###### interface @@ -22,18 +33,24 @@ in profiles = mkOption { type = types.attrsOf types.path; default = {}; - description = "Set of dconf profile files."; + description = "Set of dconf profile files, installed at <filename>/etc/dconf/profiles/<replaceable>name</replaceable></filename>."; internal = true; }; + packages = mkOption { + type = types.listOf types.package; + default = []; + description = "A list of packages which provide dconf profiles and databases in <filename>/etc/dconf</filename>."; + }; }; }; ###### implementation config = mkIf (cfg.profiles != {} || cfg.enable) { - environment.etc = optionalAttrs (cfg.profiles != {}) - (mapAttrs' mkDconfProfile cfg.profiles); + environment.etc.dconf = mkIf (cfg.profiles != {} || cfg.packages != []) { + source = cfgDir; + }; services.dbus.packages = [ pkgs.dconf ]; |