1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 11:40:45 +00:00
Commit graph

80 commits

Author SHA1 Message Date
Guillaume Girol 470ab4f971 nixos/ibus: improve error message for non-engine packages
when setting the option i18n.inputMethod.ibus.engines to a non-engine, like this:
    i18n.inputMethod.ibus.engines = [ pkgs.sl ];

the error message would be quite misleading:

error: A definition for option `nodes.machine.i18n.inputMethod.ibus.engines."[definition 1-entry 1]"' is not of type `package'. Definition values:
- In `makeTest parameters': <derivation sl-5.05>

sl is rejected and yet it *is* a package.

This change improves the error message to this:
error: A definition for option `nodes.machine.i18n.inputMethod.ibus.engines."[definition 1-entry 1]"' is not of type `ibus-engine'. Definition values:
- In `makeTest parameters': <derivation sl-5.05>
2024-06-02 12:00:00 +00:00
stuebinm 6afb255d97 nixos: remove all uses of lib.mdDoc
these changes were generated with nixq 0.0.2, by running

  nixq ">> lib.mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> Inherit >> mdDoc[remove]" --batchmode nixos/**.nix

two mentions of the mdDoc function remain in nixos/, both of which
are inside of comments.

Since lib.mdDoc is already defined as just id, this commit is a no-op as
far as Nix (and the built manual) is concerned.
2024-04-13 10:07:35 -07:00
Janne Heß fcc95ff817 treewide: Fix all Nix ASTs in all markdown files
This allows for correct highlighting and maybe future automatic
formatting. The AST was verified to work with nixfmt only.
2024-03-28 09:28:12 +01:00
Janne Heß bc77c7a973 treewide: Mark Nix blocks in markdown as Nix
This should help us with highlighting and future formatting.
2024-03-28 09:28:12 +01:00
Maciej Krüger 061b88c7f4
nixos/fcitx5: fix warning about plasma6 option 2024-03-20 15:18:51 +01:00
Nick Cao 48e5de444b
nixos/fcitx5: enable plasma6Support by default if plasma6 is enabled 2024-03-01 22:43:56 -05:00
Nick Cao 6e2d4054ae
nixos/fcitx5: add plasma6 support option 2024-03-01 11:34:09 -05:00
Nick Cao 75b9953daf
nixos/fcitx5: allow using the wayland frontend instead of the fcitx5 one 2024-01-04 15:06:58 -05:00
K900 54c8998ba1 treewide: /lib/libexec -> /libexec
/lib/libexec doesn't exist.
2023-11-26 10:55:37 +03:00
ajs124 308baf3049 uim: remove qt4, fix qt5 2023-09-04 13:54:50 +02:00
Nick Cao 2af24d4417
nixos/fcitx5: fix evaluation 2023-08-15 08:15:41 +08:00
linsui 30bb15152e nixos/fcitx5: add settings 2023-08-14 16:25:17 +08:00
Lin Jian 74fadae942
treewide: stop using types.string
It is an error[1] now.

[1]: https://github.com/NixOS/nixpkgs/pull/247848
2023-08-08 21:31:21 +08:00
linsui 71540ff216 nixos/fcitx5: add quickPhrase 2023-07-29 00:54:25 +08:00
Felix Buehler 327b0cff7a treewide: use more lib.optionalString 2023-04-07 13:38:33 +02:00
Lin Yinfeng e4246ae1e7
{ibus,fcitx5}-rime: Refactor RIME data support 2023-04-02 10:36:36 +08:00
Vonfry 4e8ad00ae8
fcitx: remove packages and update documentations and aliases to fcitx5 2023-03-13 18:50:05 +08:00
Vonfry 051b74fe7d
nixos/fcitx: deprecated, and suggestions to use fcitx5 instead 2023-03-13 18:47:05 +08:00
pennae 0a6e6cf7e6 nixos/manual: render module chapters with nixos-render-docs
this converts meta.doc into an md pointer, not an xml pointer. since we
no longer need xml for manual chapters we can also remove support for
manual chapters from md-to-db.sh

since pandoc converts smart quotes to docbook quote elements and our
nixos-render-docs does not we lose this distinction in the rendered
output. that's probably not that bad, our stylesheet didn't make use of
this anyway (and pre-23.05 versions of the chapters didn't use quote
elements either).

also updates the nixpkgs manual to clarify that option docs support all
extensions (although it doesn't support headings at all, so heading
anchors don't work by extension).
2023-01-27 20:07:34 +01:00
Riey 0db47bd50e kime: 2.5.6 -> 3.0.2 2023-01-22 19:57:34 +01:00
pennae 53fc887582 nixos/manual: move "edit the MD file" comments to generated XML 2023-01-10 12:34:37 +01:00
pennae bf92eaebe4 nixos/manual: generate module chapters with md-to-db.sh 2023-01-10 10:32:00 +01:00
pennae 23ea73b416 nixos/manual: enable smart quotes for all MD chapters 2023-01-10 10:31:59 +01:00
pennae 3395f41bd1 nixos/input-method: convert manual chapter to MD 2023-01-10 10:31:54 +01:00
pennae 80a78f2e1e nixos/manual: remove links from program listings
markdown cannot represent those links. remove them all now instead of in
each chapter conversion to keep the diff for each chapter small and more
understandable.
2023-01-10 10:31:52 +01:00
pennae 9547123258 nixos/*: convert internal option descriptions to MD
we'll have to do it eventually, may as well be now.
2022-08-31 16:32:54 +02:00
pennae ef176dcf7e nixos/*: automatically convert option descriptions
conversions were done using https://github.com/pennae/nix-doc-munge
using (probably) rev f34e145 running

    nix-doc-munge nixos/**/*.nix
    nix-doc-munge --import nixos/**/*.nix

the tool ensures that only changes that could affect the generated
manual *but don't* are committed, other changes require manual review
and are discarded.
2022-08-31 16:32:53 +02:00
pennae c915b915b5 nixos/*: md-convert options with unordered lists
mostly no rendering changes. some lists (like simplelist) don't have an
exact translation to markdown, so we use a comma-separated list of
literals instead.
2022-08-31 16:32:53 +02:00
pennae 2e751c0772 treewide: automatically md-convert option descriptions
the conversion procedure is simple:

 - find all things that look like options, ie calls to either `mkOption`
   or `lib.mkOption` that take an attrset. remember the attrset as the
   option
 - for all options, find a `description` attribute who's value is not a
   call to `mdDoc` or `lib.mdDoc`
 - textually convert the entire value of the attribute to MD with a few
   simple regexes (the set from mdize-module.sh)
 - if the change produced a change in the manual output, discard
 - if the change kept the manual unchanged, add some text to the
   description to make sure we've actually found an option. if the
   manual changes this time, keep the converted description

this procedure converts 80% of nixos options to markdown. around 2000
options remain to be inspected, but most of those fail the "does not
change the manual output check": currently the MD conversion process
does not faithfully convert docbook tags like <code> and <package>, so
any option using such tags will not be converted at all.
2022-07-30 15:16:34 +02:00
pennae 77d56dfc22 nixos/i18n: invariant option docs MD conversions 2022-07-24 13:01:18 +02:00
Guillaume Girol 419e07c382
Merge pull request #174218 from NickCao/fcitx5-qt6
fcitx5-qt: add support for qt6 applications
2022-06-11 16:20:20 +00:00
Jan Tojnar c60d526995
Merge pull request #176881 from jian-lin/fix-nixos/ibus-gnome-autostart
nixos/ibus: don't use xdg autostart for Gnome
2022-06-09 14:59:05 +02:00
linj cdfd2b9f57 nixos/ibus: don't use xdg autostart for Gnome
Gnome uses systemd to start ibus.
2022-06-08 18:37:42 +02:00
linj 34b85dfb85 nixos/ibus: fix services.dbus.package 2022-06-08 14:37:59 +02:00
Nick Cao 79b8d186a8
nixos/fcitx5: add self to QT_PLUGIN_PATH 2022-05-27 21:41:57 +08:00
Vonfry 2474c8c89a
nixos/fcitx5: add the setting of RIME_DATA_DIR and options for rime-data 2022-04-25 13:39:19 +08:00
oxalica 3855e83c49 nixos/fcitx5: remove systemd service via XDG autostart files 2022-04-18 01:14:00 +08:00
pennae fc614c37c6 nixos/documentation: split options doc build
most modules can be evaluated for their documentation in a very
restricted environment that doesn't include all of nixpkgs. this
evaluation can then be cached and reused for subsequent builds, merging
only documentation that has changed into the cached set. since nixos
ships with a large number of modules of which only a few are used in any
given config this can save evaluation a huge percentage of nixos
options available in any given config.

in tests of this caching, despite having to copy most of nixos/, saves
about 80% of the time needed to build the system manual, or about two
second on the machine used for testing. build time for a full system
config shrank from 9.4s to 7.4s, while turning documentation off
entirely shortened the build to 7.1s.
2022-01-02 19:46:13 +01:00
Naïm Favier 2ddc335e6f
nixos/doc: clean up defaults and examples 2021-10-04 12:47:20 +02:00
Vonfry 195b26b95e
nixos/fcitx5: autostart with xserver 2021-06-05 09:22:58 +08:00
Riey 767cc9fa4d
input methods: add kime 2021-04-19 03:05:07 +09:00
Potato Hatsue e8ffe04c79
fcitx5: update doc 2021-01-24 02:10:23 +01:00
Frederik Rietdijk b209617ff0 plasma5Packages: alias to the libsForQt5 used to build the plasma5 desktop
For in NixOS it is beneficial if both plasma5 and pam use the same Qt5
version. Because the plasma5 desktop may use a different version as the
default Qt5 version, we introduce plasma5Packages.
2021-01-10 15:59:45 +01:00
Poscat 14227a94b2
nixos/input-methods: add fcitx5 2021-01-10 14:31:08 +08:00
Antonio Yang 52b903b3c4 hime: fix enable hime, remove hime-all package
- fix inputMethod.enable hime by adding module list
- rm hime-all package, because chewing, anthy modules does not work well
2020-10-17 10:48:31 +08:00
Antonio Yang 0c138794af input methods: add hime 2020-10-03 22:27:22 +08:00
Jörg Thalheim ba930d8679
nixos/modules: remove trailing whitespace
This leads to ci failure otherwise if the file gets changed.
git-blame can ignore whitespace changes.
2020-08-07 14:45:39 +01:00
Symphorien Gibol 3dbd629fa4 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
2020-06-02 22:32:03 +02:00
worldofpeace ee5cba24c3
Revert "ibus: fix dconf db installation" 2020-04-24 18:22:59 -04:00
Symphorien Gibol a71dc0b27e 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
2020-04-24 13:15:56 +02:00