nyancat/flake
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: nyancat:0aa66218edf20f8d4a249b1e2495514248d10992
Branches Tags
nyancat:master
..
compare: nyancat:e945e2bbe8fd6f0513b9cbc13332b5a96865a5fc
Branches Tags
nyancat:master

No commits in common. "0aa66218edf20f8d4a249b1e2495514248d10992" and "e945e2bbe8fd6f0513b9cbc13332b5a96865a5fc" have entirely different histories.
0aa66218ed ... e945e2bbe8

4 changed files with 24 additions and 40 deletions
Show stats Expand all files Collapse all files

22
home/applications/fcitx5/default.nix
View file

@ -1,27 +1,13 @@
{
lib,
pkgs,
...
}: let
package = pkgs.qt6Packages.fcitx5-with-addons.override {
addons = with pkgs; [
{pkgs, ...}: {
i18n.inputMethod = {
enabled = "fcitx5";
fcitx5.addons = with pkgs; [
qt6Packages.fcitx5-chinese-addons
fcitx5-pinyin-minecraft
fcitx5-pinyin-moegirl
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 = ''
Vertical Candidate List=True

3
home/applications/sway/default.nix
View file

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

5
home/applications/sway/unset-im-module.nix Normal file
View file

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

34
overlays/default.nix
View file

@ -22,38 +22,28 @@ in {
};
# HACK: no more qt5
qt6Packages = prev.qt6Packages.overrideScope (_qt6final: qt6prev: {
fcitx5-with-addons = qt6prev.fcitx5-with-addons.override {
libsForQt5.fcitx5-qt = prev.emptyDirectory;
};
libsForQt5 = prev.libsForQt5.overrideScope (_qt5final: _qt5prev: {
fcitx5-with-addons = prev.qt6Packages.fcitx5-with-addons;
fcitx5-qt = prev.emptyDirectory;
});
# HACK: no more gtk2
gnome-themes-extra =
(prev.gnome-themes-extra.override {
gtk2 = prev.emptyDirectory;
})
.overrideAttrs {
configureFlags = ["--disable-gtk2-engine"];
};
sway-unwrapped = addPatches prev.sway-unwrapped [
# text_input: Implement input-method popups
# https://github.com/swaywm/sway/pull/7226
(prev.fetchpatch2 {
(prev.fetchpatch2 rec {
name = "0001-text_input-Implement-input-method-popups.patch";
url = "https://github.com/swaywm/sway/commit/de74d1f6360810c0a5fd11d8022fbffe56fc97c5.patch";
hash = "sha256-iTZIYHBp8vxjVdmH/k+jlN0/Zj6Ofe/qefv7ubtowHs=";
url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=sway-im&id=b8434b3ad9e8c6946dbf7b14b0f7ef5679452b94";
hash = "sha256-aO21HgHVccD8vOlffcenSAn2spW7iEs0nTa5Tmebe3o=";
})
(prev.fetchpatch2 {
(prev.fetchpatch2 rec {
name = "0002-chore-fractal-scale-handle.patch";
url = "https://github.com/swaywm/sway/commit/2aa72e8dfd3b3d051fdec6b2d05c5635adcfb57b.patch";
hash = "sha256-aJYXoZ7xEEy8J8DjxANOe14HdHRni6IXSNcAzLzNvIo=";
url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=sway-im&id=b8434b3ad9e8c6946dbf7b14b0f7ef5679452b94";
hash = "sha256-QuV8J0sqh5L9kyYEOTDjWlPNKVb6zolG/cHO+wq2Qa8=";
})
(prev.fetchpatch2 {
(prev.fetchpatch2 rec {
name = "0003-chore-left_pt-on-method-popup.patch";
url = "https://github.com/swaywm/sway/commit/0789c12a8edf46fbc1c7024e153f3e8f8f35fe12.patch";
hash = "sha256-zvhp5eXqDngMNtctzVpryZY3zKi3IVjV7oFIBMC2jMk=";
url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=sway-im&id=b8434b3ad9e8c6946dbf7b14b0f7ef5679452b94";
hash = "sha256-4zvVbAdxK05UWy+QMsHPHrVBwmO5279GqhYgJUPsCNI=";
})
# Tray D-Bus Menu