diff --git a/nixcfgs/modules/home/programs/rime.nix b/nixcfgs/modules/home/programs/rime.nix deleted file mode 100644 index 6302060..0000000 --- a/nixcfgs/modules/home/programs/rime.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs, ... }: - -{ - i18n.inputMethod = { - enable = true; - # enabled = "fcitx5"; dep. - # enableGtk2 = true; - # enableGtk3 = true; - type = "fcitx5"; - fcitx5 = { - waylandFrontend = true; - addons = with pkgs; [ - fcitx5-rime - kdePackages.fcitx5-configtool - kdePackages.fcitx5-qt - fcitx5-gtk - fcitx5-chinese-addons - ]; - }; - }; -} diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index 286d50b..ddf883d 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ kitty diff --git a/nixcfgs/users/js0ny/programs/rime.nix b/nixcfgs/users/js0ny/programs/rime.nix new file mode 100644 index 0000000..ad8d66a --- /dev/null +++ b/nixcfgs/users/js0ny/programs/rime.nix @@ -0,0 +1,31 @@ +{ pkgs, ... }: + +let + version = "v13.1.3"; + rimeConfig = pkgs.fetchzip { + url = "https://github.com/amzxyz/rime_wanxiang/releases/download/${version}/rime-wanxiang-zrm-fuzhu.zip"; + sha256 = "sha256-UokSOfGCt7C8/F13BEyy02+rJCqyZcYBWrP/m/Me4D4="; + stripRoot = false; + }; + rimePath = if pkgs.stdenv.isDarwin then "Library/Rime" else ".local/share/fcitx5/rime"; +in +{ + i18n.inputMethod = { + enable = true; + type = "fcitx5"; + fcitx5 = { + waylandFrontend = true; + addons = with pkgs; [ + fcitx5-rime + kdePackages.fcitx5-configtool + kdePackages.fcitx5-qt + fcitx5-gtk + fcitx5-chinese-addons + ]; + }; + }; + home.file.${rimePath} = { + source = rimeConfig; + recursive = true; + }; +} diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix index 832855f..81846c8 100644 --- a/nixcfgs/users/js0ny/zephyrus.nix +++ b/nixcfgs/users/js0ny/zephyrus.nix @@ -36,6 +36,7 @@ in ./programs/distrobox.nix ./programs/mime.nix ./programs/zed-editor.nix + ./programs/rime.nix # ./programs/floorp.nix ../../modules/home/gnome-keyrings.nix ../../modules/home/dev/c.nix