about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2016-02-26 18:48:47 -0600
committerThomas Tuegel <ttuegel@gmail.com>2016-02-26 18:48:47 -0600
commit96425dfa09a7a5ec4556a4a23102c481c72f5a4e (patch)
treeb29bf8f162a394781ef7b424146727bf8c175072
parent272cf5c44fbe973c33e9dde9a40c458a341d48cc (diff)
parent639c6b91a920b1129af298a598abc1ebc2d6c794 (diff)
downloadnixlib-96425dfa09a7a5ec4556a4a23102c481c72f5a4e.tar
nixlib-96425dfa09a7a5ec4556a4a23102c481c72f5a4e.tar.gz
nixlib-96425dfa09a7a5ec4556a4a23102c481c72f5a4e.tar.bz2
nixlib-96425dfa09a7a5ec4556a4a23102c481c72f5a4e.tar.lz
nixlib-96425dfa09a7a5ec4556a4a23102c481c72f5a4e.tar.xz
nixlib-96425dfa09a7a5ec4556a4a23102c481c72f5a4e.tar.zst
nixlib-96425dfa09a7a5ec4556a4a23102c481c72f5a4e.zip
Merge branch 'ibus'
-rw-r--r--nixos/modules/i18n/inputMethod/ibus.nix14
1 files changed, 9 insertions, 5 deletions
diff --git a/nixos/modules/i18n/inputMethod/ibus.nix b/nixos/modules/i18n/inputMethod/ibus.nix
index 5d01311c91bd..bb80f43634d3 100644
--- a/nixos/modules/i18n/inputMethod/ibus.nix
+++ b/nixos/modules/i18n/inputMethod/ibus.nix
@@ -17,7 +17,7 @@ let
       [Desktop Entry]
       Name=IBus
       Type=Application
-      Exec=${ibusPackage}/bin/ibus-daemon -dx
+      Exec=${ibusPackage}/bin/ibus-daemon --daemonize --xim --cache=refresh
     '';
   };
 in
@@ -28,10 +28,14 @@ in
         type    = with types; listOf ibusEngine;
         default = [];
         example = literalExample "with pkgs.ibus-engines; [ mozc hangul ]";
-        description = ''
-          Enabled IBus engines.
-          Available engines can be found by running `nix-env "&lt;nixpkgs&gt;" . -qaP -A ibus-engines`.
-        '';
+        description =
+          let
+            engines =
+              lib.concatStringsSep ", "
+              (map (name: "<literal>${name}</literal>")
+               (lib.attrNames pkgs.ibus-engines));
+          in
+            "Enabled IBus engines. Available engines are: ${engines}.";
       };
     };
   };