vanadium: move overlays up a level

nix/configurations/vanadium/nixos/overlay.nix

@@ -1,36 +0,0 @@
-let
-  sources = import ../../../sources.nix;
-  lib = import (sources.nixpkgs + "/lib");
-
-  infuse-lib = import sources.infuse {
-    inherit lib;
-    sugars = infuse-lib.v1.default-sugars;
-  };
-
-  infuse = infuse-lib.v1.infuse;
-in
-  # Why shouldn't I go crazy with overlays?
-  (final: prev:
-    infuse prev {
-      cmus.__input.alsaSupport = _: false;
-
-      fish.__input.usePython = _: false;
-
-      tmux.__input.withSixel = _: false;
-
-      ranger.__input.imagePreviewSupport = _: false;
-      ranger.__input.sixelPreviewSupport = _: 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
-      ];
-    })

nix/configurations/vanadium/nixos/patches/fcitx5/disable-clipboard.patch

@@ -1,45 +0,0 @@
-diff --git a/src/modules/clipboard/CMakeLists.txt b/src/modules/clipboard/CMakeLists.txt
-index 997c4e3e..4163cada 100644
---- a/src/modules/clipboard/CMakeLists.txt
-+++ b/src/modules/clipboard/CMakeLists.txt
-@@ -1,21 +1,21 @@
--add_fcitx5_addon(clipboard)
--
--target_sources(clipboard PRIVATE clipboard.cpp)
--target_link_libraries(clipboard Fcitx5::Core)
--
--if (ENABLE_X11)
--    target_sources(clipboard PRIVATE xcbclipboard.cpp)
--    target_link_libraries(clipboard Fcitx5::Module::XCB XCB::XCB)
--endif()
--
--if (WAYLAND_FOUND)
--    target_sources(clipboard PRIVATE waylandclipboard.cpp)
--    target_link_libraries(clipboard Fcitx5::Module::Wayland Fcitx5::Wayland::WLRDataControl Pthread::Pthread)
--endif()
--
--install(TARGETS clipboard DESTINATION "${FCITX_INSTALL_ADDONDIR}")
--install(FILES "${CMAKE_CURRENT_BINARY_DIR}/clipboard.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon"
--        COMPONENT config)
-+# add_fcitx5_addon(clipboard)
-+#
-+# target_sources(clipboard PRIVATE clipboard.cpp)
-+# target_link_libraries(clipboard Fcitx5::Core)
-+#
-+# if (ENABLE_X11)
-+#     target_sources(clipboard PRIVATE xcbclipboard.cpp)
-+#     target_link_libraries(clipboard Fcitx5::Module::XCB XCB::XCB)
-+# endif()
-+#
-+# if (WAYLAND_FOUND)
-+#     target_sources(clipboard PRIVATE waylandclipboard.cpp)
-+#     target_link_libraries(clipboard Fcitx5::Module::Wayland Fcitx5::Wayland::WLRDataControl Pthread::Pthread)
-+# endif()
-+#
-+# install(TARGETS clipboard DESTINATION "${FCITX_INSTALL_ADDONDIR}")
-+# install(FILES "${CMAKE_CURRENT_BINARY_DIR}/clipboard.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon"
-+#         COMPONENT config)
- configure_file(clipboard.conf.in.in clipboard.conf.in @ONLY)
- fcitx5_translate_desktop_file(${CMAKE_CURRENT_BINARY_DIR}/clipboard.conf.in clipboard.conf)
- fcitx5_export_module(Clipboard TARGET clipboard BUILD_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}" HEADERS clipboard_public.h INSTALL)
-

nix/configurations/vanadium/nixos/patches/fcitx5/disable-quickphrase.patch

@@ -1,46 +0,0 @@
-diff --git a/src/modules/quickphrase/CMakeLists.txt b/src/modules/quickphrase/CMakeLists.txt
-index b5bc37ac..04f4da59 100644
---- a/src/modules/quickphrase/CMakeLists.txt
-+++ b/src/modules/quickphrase/CMakeLists.txt
-@@ -1,13 +1,13 @@
--add_fcitx5_addon(quickphrase quickphrase.cpp quickphraseprovider.cpp)
--target_link_libraries(quickphrase Fcitx5::Core Fcitx5::Module::Spell)
--install(TARGETS quickphrase DESTINATION "${FCITX_INSTALL_ADDONDIR}")
-+# add_fcitx5_addon(quickphrase quickphrase.cpp quickphraseprovider.cpp)
-+# target_link_libraries(quickphrase Fcitx5::Core Fcitx5::Module::Spell)
-+# install(TARGETS quickphrase DESTINATION "${FCITX_INSTALL_ADDONDIR}")
- configure_file(quickphrase.conf.in.in quickphrase.conf.in @ONLY)
- fcitx5_translate_desktop_file(${CMAKE_CURRENT_BINARY_DIR}/quickphrase.conf.in quickphrase.conf)
--install(FILES "${CMAKE_CURRENT_BINARY_DIR}/quickphrase.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon"
--        COMPONENT config)
-+# install(FILES "${CMAKE_CURRENT_BINARY_DIR}/quickphrase.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon"
-+#         COMPONENT config)
- fcitx5_export_module(QuickPhrase TARGET quickphrase BUILD_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}" HEADERS quickphrase_public.h INSTALL)
- 
--install(DIRECTORY quickphrase.d DESTINATION "${FCITX_INSTALL_PKGDATADIR}/data"
--        COMPONENT config
--        FILES_MATCHING PATTERN "*.mb")
-+# install(DIRECTORY quickphrase.d DESTINATION "${FCITX_INSTALL_PKGDATADIR}/data"
-+#         COMPONENT config
-+#         FILES_MATCHING PATTERN "*.mb")
- 
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 97eed1f3..53e09977 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -147,10 +147,10 @@ if (ENABLE_KEYBOARD)
-     add_test(NAME testspell COMMAND testspell)
- endif()
- 
--add_executable(testquickphrase testquickphrase.cpp)
--target_link_libraries(testquickphrase Fcitx5::Core Fcitx5::Module::QuickPhrase Fcitx5::Module::TestFrontend Fcitx5::Module::TestIM)
--add_dependencies(testquickphrase copy-addon quickphrase testui testfrontend testim)
--add_test(NAME testquickphrase COMMAND testquickphrase)
-+# add_executable(testquickphrase testquickphrase.cpp)
-+# target_link_libraries(testquickphrase Fcitx5::Core Fcitx5::Module::QuickPhrase Fcitx5::Module::TestFrontend Fcitx5::Module::TestIM)
-+# add_dependencies(testquickphrase copy-addon quickphrase testui testfrontend testim)
-+# add_test(NAME testquickphrase COMMAND testquickphrase)
- 
- if (ENABLE_X11)
- add_executable(testxim testxim.cpp)
-

nix/configurations/vanadium/nixos/patches/fcitx5/disable-unicode.patch

@@ -1,41 +0,0 @@
-diff --git a/src/modules/unicode/CMakeLists.txt b/src/modules/unicode/CMakeLists.txt
-index 73f7e064..afddabee 100644
---- a/src/modules/unicode/CMakeLists.txt
-+++ b/src/modules/unicode/CMakeLists.txt
-@@ -1,11 +1,11 @@
--add_fcitx5_addon(unicode unicode.cpp charselectdata.cpp)
--target_link_libraries(unicode Fcitx5::Core Fcitx5::Module::Clipboard ${FMT_TARGET})
--install(TARGETS unicode DESTINATION "${FCITX_INSTALL_ADDONDIR}")
-+# add_fcitx5_addon(unicode unicode.cpp charselectdata.cpp)
-+# target_link_libraries(unicode Fcitx5::Core Fcitx5::Module::Clipboard ${FMT_TARGET})
-+# install(TARGETS unicode DESTINATION "${FCITX_INSTALL_ADDONDIR}")
- configure_file(unicode.conf.in.in unicode.conf.in @ONLY)
- fcitx5_translate_desktop_file(${CMAKE_CURRENT_BINARY_DIR}/unicode.conf.in unicode.conf)
--install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unicode.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon"
--        COMPONENT config)
-+# install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unicode.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon"
-+#         COMPONENT config)
- fcitx5_export_module(Unicode TARGET unicode BUILD_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}" HEADERS unicode_public.h INSTALL)
- 
--install(FILES charselectdata DESTINATION "${FCITX_INSTALL_PKGDATADIR}/unicode" COMPONENT config)
-+# install(FILES charselectdata DESTINATION "${FCITX_INSTALL_PKGDATADIR}/unicode" COMPONENT config)
- 
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 97eed1f3..ff902c88 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -134,10 +134,10 @@ add_dependencies(testemoji emoji emoji.conf.in-fmt)
- add_test(NAME testemoji COMMAND testemoji)
- endif()
- 
--add_executable(testunicode testunicode.cpp)
--target_link_libraries(testunicode Fcitx5::Core Fcitx5::Module::TestFrontend Fcitx5::Module::TestIM)
--add_dependencies(testunicode copy-addon unicode testui testfrontend testim)
--add_test(NAME testunicode COMMAND testunicode)
-+# add_executable(testunicode testunicode.cpp)
-+# target_link_libraries(testunicode Fcitx5::Core Fcitx5::Module::TestFrontend Fcitx5::Module::TestIM)
-+# add_dependencies(testunicode copy-addon unicode testui testfrontend testim)
-+# add_test(NAME testunicode COMMAND testunicode)
- 
- 
- if (ENABLE_KEYBOARD)