nixos: nuke gtk2

This commit is contained in:
Guanran Wang 2024-07-31 14:13:52 +08:00
parent e732851aa1
commit 2f57cad936
Signed by: nyancat
GPG key ID: 91F97D9ED12639CF
4 changed files with 25 additions and 14 deletions

View file

@ -1,13 +1,27 @@
{pkgs, ...}: { {
i18n.inputMethod = { lib,
enabled = "fcitx5"; pkgs,
fcitx5.addons = with pkgs; [ ...
}: let
package = pkgs.qt6Packages.fcitx5-with-addons.override {
addons = with pkgs; [
qt6Packages.fcitx5-chinese-addons qt6Packages.fcitx5-chinese-addons
fcitx5-pinyin-minecraft fcitx5-pinyin-minecraft
fcitx5-pinyin-moegirl fcitx5-pinyin-moegirl
fcitx5-pinyin-zhwiki fcitx5-pinyin-zhwiki
]; ];
}; };
in {
home.packages = [
package
];
systemd.user.services.fcitx5-daemon = {
Unit.Description = "Fcitx5 input method editor";
Unit.PartOf = ["graphical-session.target"];
Service.ExecStart = lib.getExe' package "fcitx5";
Install.WantedBy = ["graphical-session.target"];
};
xdg.configFile."fcitx5/conf/classicui.conf".text = '' xdg.configFile."fcitx5/conf/classicui.conf".text = ''
Vertical Candidate List=True Vertical Candidate List=True

View file

@ -11,9 +11,6 @@
../mako ../mako
../swayidle ../swayidle
../swaylock ../swaylock
# FIXME: hack
./unset-im-module.nix
]; ];
home.sessionVariables = { home.sessionVariables = {

View file

@ -1,5 +0,0 @@
{lib, ...}: {
options.home.sessionVariables = lib.mkOption {
apply = x: removeAttrs x ["QT_IM_MODULE" "GTK_IM_MODULE"];
};
}

View file

@ -23,10 +23,15 @@ in {
# HACK: no more qt5 # HACK: no more qt5
libsForQt5 = prev.libsForQt5.overrideScope (_qt5final: _qt5prev: { libsForQt5 = prev.libsForQt5.overrideScope (_qt5final: _qt5prev: {
fcitx5-with-addons = prev.qt6Packages.fcitx5-with-addons;
fcitx5-qt = prev.emptyDirectory; fcitx5-qt = prev.emptyDirectory;
}); });
# HACK: no more gtk2
gtk2 = prev.emptyDirectory;
gnome-themes-extra = prev.gnome-themes-extra.overrideAttrs {
configureFlags = ["--disable-gtk2-engine"];
};
sway-unwrapped = addPatches prev.sway-unwrapped [ sway-unwrapped = addPatches prev.sway-unwrapped [
# text_input: Implement input-method popups # text_input: Implement input-method popups
# https://github.com/swaywm/sway/pull/7226 # https://github.com/swaywm/sway/pull/7226
@ -35,7 +40,7 @@ in {
url = "https://github.com/swaywm/sway/commit/de74d1f6360810c0a5fd11d8022fbffe56fc97c5.patch"; url = "https://github.com/swaywm/sway/commit/de74d1f6360810c0a5fd11d8022fbffe56fc97c5.patch";
hash = "sha256-iTZIYHBp8vxjVdmH/k+jlN0/Zj6Ofe/qefv7ubtowHs="; hash = "sha256-iTZIYHBp8vxjVdmH/k+jlN0/Zj6Ofe/qefv7ubtowHs=";
}) })
(prev.fetchpatch2 { (prev.fetchpatch2 {
name = "0002-chore-fractal-scale-handle.patch"; name = "0002-chore-fractal-scale-handle.patch";
url = "https://github.com/swaywm/sway/commit/2aa72e8dfd3b3d051fdec6b2d05c5635adcfb57b.patch"; url = "https://github.com/swaywm/sway/commit/2aa72e8dfd3b3d051fdec6b2d05c5635adcfb57b.patch";
hash = "sha256-aJYXoZ7xEEy8J8DjxANOe14HdHRni6IXSNcAzLzNvIo="; hash = "sha256-aJYXoZ7xEEy8J8DjxANOe14HdHRni6IXSNcAzLzNvIo=";