diff --git a/flake.lock b/flake.lock index 53d040bd..c99b237f 100644 --- a/flake.lock +++ b/flake.lock @@ -371,11 +371,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763430944, - "narHash": "sha256-tL2I302ZrTeo13D99vg4v/VajVCSHdOx5RncpMcjqa0=", + "lastModified": 1764123663, + "narHash": "sha256-Q3WxbsjPJV8QHF1fU+B4kz9hDfHkdMarW1CCM0x44Ks=", "owner": "helix-editor", "repo": "helix", - "rev": "68c7e8757f0183adeb01ba1fbbabd1cee2885b70", + "rev": "24f45746cc68e7c90cd4c43334a756f68986a1be", "type": "github" }, "original": { @@ -391,11 +391,11 @@ ] }, "locked": { - "lastModified": 1763416652, - "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", + "lastModified": 1764194569, + "narHash": "sha256-iUM9ktarEzThkayyZrzQ7oycPshAY2XRQqVKz0xX/L0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", + "rev": "9651819d75f6c7ffaf8a9227490ac704f29659f0", "type": "github" }, "original": { @@ -704,11 +704,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1763729389, - "narHash": "sha256-VcToDv3/lw3q3sVIqQsMUhSGKEVdQM4h6rnr/XhPBwM=", + "lastModified": 1764160906, + "narHash": "sha256-6Dud/oe0UnkgCe+JAGF+GjXl6S6ynpcAUYWCdbXjJL4=", "owner": "YaLTeR", "repo": "niri", - "rev": "012700dd549a79c501bcab92839e5dcc46c372b5", + "rev": "8370c539fb584f78924b826d0ac0ad8fa068cf95", "type": "github" }, "original": { @@ -767,11 +767,11 @@ ] }, "locked": { - "lastModified": 1763265660, - "narHash": "sha256-Ad9Rd3ZAidrH01xP73S3CjPiyXo7ywZs3uCESjPwUdc=", + "lastModified": 1763870992, + "narHash": "sha256-NPyc76Wxmv/vAsXJ8F+/8fXECHYcv2YGSqdiSHp/F/A=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "469ef53571ea80890c9497952787920c79c1ee6e", + "rev": "d7423982c7a26586aa237d130b14c8b302c7a367", "type": "github" }, "original": { @@ -782,11 +782,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1764080039, + "narHash": "sha256-b1MtLQsQc4Ji1u08f+C6g5XrmLPkJQ1fhNkCt+0AERQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "da17006633ca9cda369be82893ae36824a2ddf1a", "type": "github" }, "original": { @@ -814,11 +814,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1763966396, + "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "type": "github" }, "original": { @@ -858,11 +858,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1763730167, - "narHash": "sha256-GkVAHiVPF8/IXFn3Ygz+ky//lPi/a3HsaM1vr+A2hh4=", + "lastModified": 1764245472, + "narHash": "sha256-udCSZoKawLiNJKFQgikkN96tvVJggs61ihRq8sRt8tM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5c61264a3eff3d96f39870d27a61ea95774ae2e5", + "rev": "6c16b7ce10e5ef1fee3aecfb327be61888818a7a", "type": "github" }, "original": { @@ -993,11 +993,11 @@ "zen-browser": "zen-browser" }, "locked": { - "lastModified": 1763986668, - "narHash": "sha256-R6R8FHo22CYNUI6vBnwtePdkViJK+nl5SXFdCdSTXtI=", + "lastModified": 1763992843, + "narHash": "sha256-YNaB4sPMqpZ3vacTU2lC4aLydO1WTR13TEjDaHAL1AA=", "owner": "thexyno", "repo": "nixos-config", - "rev": "cea4be6b9e0d951189cf3ebee7e354223c09150f", + "rev": "7e226a95925f9d2b91c15652e23bc8cfeb83cba1", "type": "github" }, "original": { @@ -1177,11 +1177,11 @@ ] }, "locked": { - "lastModified": 1763692705, - "narHash": "sha256-tCKCyMYU0Vy+ph/xswlNsYXXjnFVweWBV+ew/5FS9tA=", + "lastModified": 1764211126, + "narHash": "sha256-p5y13PnMZYd5WdHk+XCzyUaLGBUCwnz2n4KYKEZM0Pw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6fbf5d328dce1828d887b8ee7d44a785196a34e7", + "rev": "895935bff08cfcfb663fb9c8263c43596e7cd1ed", "type": "github" }, "original": { @@ -1218,11 +1218,11 @@ ] }, "locked": { - "lastModified": 1763607916, - "narHash": "sha256-VefBA1JWRXM929mBAFohFUtQJLUnEwZ2vmYUNkFnSjE=", + "lastModified": 1764021963, + "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "877bb495a6f8faf0d89fc10bd142c4b7ed2bcc0b", + "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec", "type": "github" }, "original": { @@ -1472,11 +1472,11 @@ ] }, "locked": { - "lastModified": 1763663426, - "narHash": "sha256-txr1cH5j+b14jYGvE0BQE/6OgSyHQqGoeeEFlJz7Q8o=", + "lastModified": 1764217570, + "narHash": "sha256-vgqUC6lI/gW70uekA0bpNFU6yR0tcZRfLIZcxGfN76g=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "34fd0de7cea96cab0307cf07aa5723b60fd775ef", + "rev": "3dc281d86044322f9182b20abbc21db8824c130a", "type": "github" }, "original": { diff --git a/modules/desktop/ibus.nix b/modules/desktop/ibus.nix index c9e6beff..3ce963b3 100644 --- a/modules/desktop/ibus.nix +++ b/modules/desktop/ibus.nix @@ -21,7 +21,7 @@ in # fuck qt tbh i18n.inputMethod = { enable = true; - package = pkgs.ibus-patched; + package = pkgs.ibus; # ibus.engines = with pkgs.ibus-engines; [ uniemoji ]; }; # home-manager.sharedModules = [ @@ -51,7 +51,7 @@ in # ]; systemd.user.services."org.freedesktop.IBus.session.generic".wantedBy = [ cfg.wantedBy ]; - systemd.packages = [ pkgs.ibus-patched ]; + systemd.packages = [ pkgs.ibus ]; # systemd.user.services.ibus = # let # ibusPackage = config.i18n.inputMethod.package; diff --git a/overlays/default.nix b/overlays/default.nix index e5344178..a5a14de5 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -27,16 +27,6 @@ inputs: self: super: { fido2-hid-bridge = super.callPackage ../packages/fido2-hid-bridge.nix {}; python-uhid = super.callPackage ../packages/uhid.nix {}; caddy-desec = super.callPackage ../packages/caddy-desec.nix {}; - ibus-patched = super.unstable.ibus.overrideAttrs (old: { - patches = old.patches ++ [ - # (builtins.head old.patches) - # (builtins.head (builtins.tail old.patches)) - (self.fetchpatch2 { - url = "https://github.com/ibus/ibus/commit/dde00b1b689037e70d79a703aa028f7c3de289e2.patch"; - hash = "sha256-Q5XANWsN7f9Kcno8Icgn8wlXL489YlcrlUrqeA67nWU="; - }) - ]; - }); }