From 539e0ec5cceba058fadb08b4ab3e8b0e428ba6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 4 Jun 2025 19:06:02 +0200 Subject: [PATCH] vanadium: pointless overlay infuse --- nix/configurations/vanadium/overlay.nix | 81 ++++++++++++------------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/nix/configurations/vanadium/overlay.nix b/nix/configurations/vanadium/overlay.nix index 07538f52..95e7d31b 100644 --- a/nix/configurations/vanadium/overlay.nix +++ b/nix/configurations/vanadium/overlay.nix @@ -7,51 +7,50 @@ let sugars = infuse-lib.v1.default-sugars; }; - infuse = infuse-lib.v1.infuse; + infuse = lib.flip infuse-lib.v1.infuse; in # Why shouldn't I go crazy with overlays? - (final: prev: - infuse prev { - cmus.__input.alsaSupport = _: false; + (final: infuse { + cmus.__input.alsaSupport = _: false; - fish.__input.usePython = _: false; + fish.__input.usePython = _: false; - tmux.__input.withSixel = _: false; + tmux.__input.withSixel = _: false; - ranger.__input.imagePreviewSupport = _: false; - ranger.__input.sixelPreviewSupport = _: false; + ranger.__input.imagePreviewSupport = _: false; + ranger.__input.sixelPreviewSupport = _: false; - vlc.__input.chromecastSupport = _: false; - vlc.__input.waylandSupport = _: false; + vlc.__input.chromecastSupport = _: false; + vlc.__input.waylandSupport = _: false; - fcitx5.__output.cmakeFlags.__append = [ - (lib.cmakeFeature "ENABLE_EMOJI" "Off") - (lib.cmakeFeature "ENABLE_WAYLAND" "Off") - ]; - fcitx5.__output.patches.__append = [ - ./patches/fcitx5/disable-clipboard.patch - ./patches/fcitx5/disable-quickphrase.patch - ./patches/fcitx5/disable-unicode.patch - ]; - fcitx5-chinese-addons.__output.cmakeFlags.__append = [ - (lib.cmakeFeature "ENABLE_BROWSER" "Off") - (lib.cmakeFeature "ENABLE_CLOUDPINYIN" "Off") - (lib.cmakeFeature "ENABLE_DATA" "Off") - ]; - fcitx5-chinese-addons.__output.patches.__append = [ - ./patches/fcitx5-chinese-addons/disable-chttrans.patch - ./patches/fcitx5-chinese-addons/disable-fullwidth.patch - # Note: disabling pinyin helper breaks canjie - ]; - fcitx5-table-extra.__output.src = _: final.fetchFromGitHub { - owner = "leana8959"; - repo = "fcitx5-table-extra"; - rev = "3fb844280a5154389be17e422a98ad89cafccc38"; - hash = "sha256-8iGNQYQH8tT3p6VedVBgfxHqXVLkFEiDEd1H7CBFXqg="; - fetchSubmodules = true; - }; - fcitx5-table-extra.__output.nativeBuildInputs.__append = [ final.python3 ]; - fcitx5-table-extra.__output.preConfigure.__prepend = '' - python3 ./generate.py - ''; - }) + fcitx5.__output.cmakeFlags.__append = [ + (lib.cmakeFeature "ENABLE_EMOJI" "Off") + (lib.cmakeFeature "ENABLE_WAYLAND" "Off") + ]; + fcitx5.__output.patches.__append = [ + ./patches/fcitx5/disable-clipboard.patch + ./patches/fcitx5/disable-quickphrase.patch + ./patches/fcitx5/disable-unicode.patch + ]; + fcitx5-chinese-addons.__output.cmakeFlags.__append = [ + (lib.cmakeFeature "ENABLE_BROWSER" "Off") + (lib.cmakeFeature "ENABLE_CLOUDPINYIN" "Off") + (lib.cmakeFeature "ENABLE_DATA" "Off") + ]; + fcitx5-chinese-addons.__output.patches.__append = [ + ./patches/fcitx5-chinese-addons/disable-chttrans.patch + ./patches/fcitx5-chinese-addons/disable-fullwidth.patch + # Note: disabling pinyin helper breaks canjie + ]; + fcitx5-table-extra.__output.src = _: final.fetchFromGitHub { + owner = "leana8959"; + repo = "fcitx5-table-extra"; + rev = "3fb844280a5154389be17e422a98ad89cafccc38"; + hash = "sha256-8iGNQYQH8tT3p6VedVBgfxHqXVLkFEiDEd1H7CBFXqg="; + fetchSubmodules = true; + }; + fcitx5-table-extra.__output.nativeBuildInputs.__append = [ final.python3 ]; + fcitx5-table-extra.__output.preConfigure.__prepend = '' + python3 ./generate.py + ''; + })