From 6466379e98ae6d22e9b18111ddc35707e8a6b3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= Date: Thu, 28 Aug 2025 14:39:48 -0600 Subject: [PATCH] chore: upgrade syd-fcitx5-tables --- flake.lock | 89 +++++++++++++++++++++++++---- flake.nix | 1 + modules/home/users/crumb/fcitx5.nix | 10 +--- 3 files changed, 82 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index e0cd217..721ed85 100644 --- a/flake.lock +++ b/flake.lock @@ -71,7 +71,7 @@ "inputs": { "devshell": "devshell", "nix-fetcher-data": "nix-fetcher-data", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1732920288, @@ -326,6 +326,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -592,6 +610,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1737632463, "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", @@ -607,7 +641,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1743568003, "narHash": "sha256-ZID5T65E8ruHqWRcdvZLsczWDOAWIE7om+vQOREwiX0=", @@ -737,16 +771,16 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1756819007, + "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -812,6 +846,7 @@ "nur": "nur", "sops-nix": "sops-nix", "stylix": "stylix", + "syd-fcitx5-tables": "syd-fcitx5-tables", "sydnix-cli": "sydnix-cli", "tf2-nix": "tf2-nix", "vpn-confinement": "vpn-confinement" @@ -867,11 +902,30 @@ "type": "github" } }, + "syd-fcitx5-tables": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1756999223, + "narHash": "sha256-OwgHcwxdbHB7lf9W9RpYkZp/0C4iRG/XSMaqpwzz9lw=", + "owner": "msyds", + "repo": "syd-fcitx5-tables", + "rev": "9366fad23a9e5a6f7bb8405426d34530ed63bd19", + "type": "gitlab" + }, + "original": { + "owner": "msyds", + "repo": "syd-fcitx5-tables", + "type": "gitlab" + } + }, "sydnix-cli": { "inputs": { "clj-nix": "clj-nix", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_10" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1742862380, @@ -929,10 +983,25 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tf2-nix": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_11" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1744886451, diff --git a/flake.nix b/flake.nix index 56c79d3..3767954 100755 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; tf2-nix.url = "gitlab:msyds/tf2-nix"; + syd-fcitx5-tables.url = "gitlab:msyds/syd-fcitx5-tables"; }; outputs = { self, nixpkgs, ... }@inputs: diff --git a/modules/home/users/crumb/fcitx5.nix b/modules/home/users/crumb/fcitx5.nix index fa2a9ba..8530814 100644 --- a/modules/home/users/crumb/fcitx5.nix +++ b/modules/home/users/crumb/fcitx5.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, inputs, system, ... }: let cfg = config.sydnix.users.crumb.fcitx5; in { @@ -17,13 +17,7 @@ in { pkgs.fcitx5-table-other pkgs.libsForQt5.fcitx5-chinese-addons pkgs.fcitx5-anthy - (let - repo = pkgs.fetchgit { - url = "https://gitlab.com/msyds/syd-fcitx5-tables"; - tag = "v1.1.0"; - hash = "sha256-Ndm+XUMFmkcrVH9tLvyiXP4gvShx3ELrURYdp2KfOyQ="; - }; - in pkgs.callPackage "${repo}/package.nix" {}) + inputs.syd-fcitx5-tables.packages.${system}.default ]; settings = { # Bind QuickPhrase to `s-;`.