Unverified Commit 075c6ce7 authored by éclairevoyant's avatar éclairevoyant Committed by GitHub
Browse files

nixos/fcitx5: fix evaluation (#338621)

parents d5cbc4d8 4a7f3e03

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

+4 −4
Original line number Diff line number Diff line
@@ -119,15 +119,15 @@ in 
    ];

    environment.etc =

      let

        lib.optionalFile = p: f: v: lib.optionalAttrs (v != { }) {

        optionalFile = p: f: v: lib.optionalAttrs (v != { }) {

          "xdg/fcitx5/${p}".text = f v;

        };

      in

      lib.attrsets.mergeAttrsList [

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

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

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

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

        (lib.concatMapAttrs

          (name: value: lib.optionalFile

          (name: value: optionalFile

            "conf/${name}.conf"

            (lib.generators.toINIWithGlobalSection { })

            value)

nixos/tests/fcitx5/default.nix

+8 −10
Original line number Diff line number Diff line
@@ -14,22 +14,20 @@ rec { 
      pkgs.alacritty

    ];



    services.xserver = {

      enable = true;



      displayManager = {

        lightdm.enable = true;

        autoLogin = {

    services.displayManager.autoLogin = {

      enable = true;

      user = "alice";

    };

      };



    services.xserver = {

      enable = true;

      displayManager.lightdm.enable = true;

      desktopManager.xfce.enable = true;

    };



    i18n.inputMethod = {

      enabled = "fcitx5";

      enable = true;

      type = "fcitx5";

      fcitx5.addons = [

        pkgs.fcitx5-chinese-addons

        pkgs.fcitx5-hangul