Unverified Commit df770ba9 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents bb945f3c b51db7ec

maintainers/team-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -413,6 +413,7 @@ with lib.maintainers; { 


  jupyter = {

    members = [

      GaetanLepage

      natsukium

    ];

    scope = "Maintain Jupyter and related packages.";

nixos/modules/i18n/input-method/fcitx5.nix

+3 −3
Original line number Diff line number Diff line
@@ -107,14 +107,14 @@ in 
        };

      in

      lib.attrsets.mergeAttrsList [

        (optionalFile "config" (lib.generators.toINI { }) sts.globalOptions)

        (optionalFile "profile" (lib.generators.toINI { }) sts.inputMethod)

        (optionalFile "config" (lib.generators.toINI { }) cfg.settings.globalOptions)

        (optionalFile "profile" (lib.generators.toINI { }) cfg.settings.inputMethod)

        (lib.concatMapAttrs

          (name: value: optionalFile

            "conf/${name}.conf"

            (lib.generators.toINIWithGlobalSection { })

            value)

          sts.addons)

          cfg.settings.addons)

      ];



    environment.variables = {

nixos/tests/fcitx5/config

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
[Hotkey]

EnumerateSkipFirst=False



[Hotkey/TriggerKeys]

0=Control+space



[Hotkey/EnumerateForwardKeys]

0=Alt+Shift_L



[Hotkey/EnumerateBackwardKeys]

0=Alt+Shift_R

nixos/tests/fcitx5/default.nix

+37 −10
Original line number Diff line number Diff line
@@ -36,6 +36,43 @@ rec { 
        pkgs.fcitx5-m17n

        pkgs.fcitx5-mozc

      ];

      fcitx5.settings = {

        globalOptions = {

          "Hotkey"."EnumerateSkipFirst" = "False";

          "Hotkey/TriggerKeys"."0" = "Control+space";

          "Hotkey/EnumerateForwardKeys"."0" = "Alt+Shift_L";

          "Hotkey/EnumerateBackwardKeys"."0" = "Alt+Shift_R";

        };

        inputMethod = {

          "GroupOrder" = {

            "0" = "NixOS_test";

          };

          "Groups/0" = {

            "Default Layout" = "us";

            "DefaultIM" = "wbx";

            "Name" = "NixOS_test";

          };

          "Groups/0/Items/0" = {

            "Name" = "keyboard-us";

          };

          "Groups/0/Items/1" = {

            "Layout" = "us";

            "Name" = "wbx";

          };

          "Groups/0/Items/2" = {

            "Layout" = "us";

            "Name" = "hangul";

          };

          "Groups/0/Items/3" = {

            "Layout" = "us";

            "Name" = "m17n_sa_harvard-kyoto";

          };

          "Groups/0/Items/4" = {

            "Layout" = "us";

            "Name" = "mozc";

          };

        };

      };

    };

  };
@@ -43,7 +80,6 @@ rec { 
    let

      user = nodes.machine.users.users.alice;

      xauth         = "${user.home}/.Xauthority";

      fcitx_confdir = "${user.home}/.config/fcitx5";

    in

      ''

            start_all()
@@ -56,15 +92,6 @@ rec { 
            machine.succeed("su - ${user.name} -c 'kill $(pgrep fcitx5)'")

            machine.sleep(1)



            machine.copy_from_host(

                "${./profile}",

                "${fcitx_confdir}/profile",

            )

            machine.copy_from_host(

                "${./config}",

                "${fcitx_confdir}/config",

            )



            machine.succeed("su - ${user.name} -c 'alacritty >&2 &'")

            machine.succeed("su - ${user.name} -c 'fcitx5 >&2 &'")

            machine.sleep(10)

nixos/tests/fcitx5/profile

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
[Groups/0]

Name=NixOS_test

Default Layout=us

DefaultIM=wbx



[Groups/0/Items/0]

Name=keyboard-us

Layout=



[Groups/0/Items/1]

Name=wbx

Layout=us



[Groups/0/Items/2]

Name=hangul

Layout=us



[Groups/0/Items/3]

Name=m17n_sa_harvard-kyoto

Layout=us



[Groups/0/Items/4]

Name=mozc

Layout=us



[GroupOrder]

0=NixOS_test