Commit graph

98 commits

Author SHA1 Message Date
Arnout Engelen
eb9ce0eed3
treewide: remove inactive maintainer ericsagnes 2025-05-09 12:03:09 +02:00
linsui
53440690a7 nixos/i18n/input-method: add option for Gtk2 and Gtk3 2025-04-24 22:10:29 +08:00
Silvan Mosberger
374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
linsui
6975dea4d3 nixos/fcitx5: fix quickphrase 2024-12-28 15:10:34 +08:00
linsui
97728d9f5a nixos/fcitx5: handle multi-line string and escape in quickPhrase 2024-12-22 17:14:15 +08:00
linsui
fedf16bc04 nixos/fcitx5: format 2024-12-22 17:09:02 +08:00
Silvan Mosberger
4f0dadbf38 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:26:33 +01:00
Felix Buehler
387be4f6c3 nixos/i18n.inputMethod.uim: remove with lib; 2024-11-27 22:26:56 +01:00
Felix Buehler
d5a377e94e nixos/i18n.inputMethod.nabi: remove with lib; 2024-11-27 22:26:56 +01:00
Felix Buehler
3eb92bcce7 nixos/i18n.inputMethod.ibus: remove with lib; 2024-11-27 22:26:56 +01:00
Felix Buehler
17c011592a nixos/i18n.inputMethod.hime: remove with lib; 2024-11-27 22:26:56 +01:00
Aleksana
63bbfc75b3
doc: document ibus-engine for Chinese input in input-methods section (#319953) 2024-11-01 22:28:44 +08:00
Nick Cao
38cabf32f8
nixos/fcitx5: fix evaluation 2024-08-31 09:20:31 -04:00
Felix Buehler
2c2cb598fe nixos/i18n.inputMethod.fcitx5: remove with lib; 2024-08-30 22:59:24 +02:00
Felix Buehler
76dd427ca9 nixos/i18n.input-method: remove with lib; 2024-08-30 22:59:24 +02:00
éclairevoyant
9665639708
Merge pull request #310708 from importantblimp/180654
nixos/input-method: deprecate .enabled option; add .type and .enable options
2024-07-14 00:02:13 +00:00
GY
bcc7eff2c5
nixos/input-method: deprecate .enabled option; add .type and .enable options
This commit introduces two new properties:
`enable` and `type`, to replace the `enabled` property.
`enable` has the same meaning as is common across nixpkgs.
`type` has the same meaning as the existing `enabled` property.
`enabled` property is now deprecated and will be removed in a future release.

Fixes #180654
2024-07-12 03:59:20 -04:00
Kaleo
ffb7668703 nixos/ibus: document ibus-engine for Chinese input
Add `ibus-engines.libpinyin` in the input-methods section
2024-06-15 09:43:56 +08:00
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