From e7b5647341ff9f57102022debc20aa0f5b493b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= Date: Wed, 11 Mar 2026 13:36:28 -0600 Subject: [PATCH] use fcitx5-toki-pona from sydpkgs --- flake.lock | 41 ++++++++++------------------- flake.nix | 5 +++- modules/home/users/crumb/fcitx5.nix | 5 ++-- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 7dccc82..e249df8 100644 --- a/flake.lock +++ b/flake.lock @@ -500,22 +500,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1750386251, - "narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "076e8c6678d8c54204abcb4b1b14c366835a58bb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1743568003, "narHash": "sha256-ZID5T65E8ruHqWRcdvZLsczWDOAWIE7om+vQOREwiX0=", @@ -797,20 +781,23 @@ }, "sydpkgs": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1767975357, - "narHash": "sha256-MDVh3/aVhkD1bh/r8c0gs9DL4e78CrUbUxOZHWlCwLM=", - "owner": "msyds", - "repo": "sydpkgs", - "rev": "233479ab277d47b1dbda202eafca50e61c659151", - "type": "github" + "lastModified": 1773258212, + "narHash": "sha256-IRP7jRzSQ9wyaT+uagY8x0e2C5FjkTMifiTwyMKpNhc=", + "ref": "fcitx5-toki-pona", + "rev": "12a5095325ae50c2d096c6e9a70825f48656c8a7", + "revCount": 37, + "type": "git", + "url": "https://git.deertopia.net/msyds/sydpkgs" }, "original": { - "owner": "msyds", - "repo": "sydpkgs", - "type": "github" + "ref": "fcitx5-toki-pona", + "type": "git", + "url": "https://git.deertopia.net/msyds/sydpkgs" } }, "systems": { @@ -861,7 +848,7 @@ "tf2-nix": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1761467191, diff --git a/flake.nix b/flake.nix index a0fb48c..89858a2 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,10 @@ tf2-nix.url = "gitlab:msyds/tf2-nix"; syd-fcitx5-tables.url = "git+https://git.deertopia.net/msyds/syd-fcitx5-tables"; - sydpkgs.url = "github:msyds/sydpkgs"; + sydpkgs = { + url = "git+https://git.deertopia.net/msyds/sydpkgs?ref=fcitx5-toki-pona"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, ... }@inputs: diff --git a/modules/home/users/crumb/fcitx5.nix b/modules/home/users/crumb/fcitx5.nix index c6be6c6..45d0b76 100644 --- a/modules/home/users/crumb/fcitx5.nix +++ b/modules/home/users/crumb/fcitx5.nix @@ -18,6 +18,7 @@ in { pkgs.kdePackages.fcitx5-chinese-addons pkgs.fcitx5-hangul inputs.syd-fcitx5-tables.packages.${system}.default + pkgs.fcitx5-toki-pona ]; settings = { # Bind QuickPhrase to `s-;`. @@ -26,8 +27,8 @@ in { }; globalOptions = { - # Disable shift to toggle. I accidentally press it all the time. - # 날 미치게 만들어요. + # Disable shift to toggle. I accidentally press it all + # the time. 날 미치게 만들어요. Hotkey.AltTriggerKeys = ""; };