modules/fcitx5/default.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 
 with import ../theme; let
   themeFolder = ".local/share/fcitx5/themes/${theme}/";
@@ -6,18 +6,7 @@ in
 {
   i18n.inputMethod = {
     enabled = "fcitx5";
-    fcitx5.addons = with pkgs; [
+    fcitx5.addons = with pkgs; [ fcitx5-anthy ];
-      (fcitx5-anthy.overrideAttrs (oldAttrs: {
-        # bugged custom Nicola tables fixed in master
-        # https://github.com/fcitx/fcitx5-anthy/issues/8
-        src = fetchFromGitHub {
-          owner = "fcitx";
-          repo = "fcitx5-anthy";
-          rev = "9031b56c334dd0a2da6a5b5d3ab3570e06395ca0";
-          hash = "sha256-a0z3OoSiiVslrTZuI5PDws+ykWFFKdev7fSpGgjNAA8=";
-        };
-      }))
-    ];
   };
 
   home.file = {
@@ -30,16 +19,4 @@ in
     "${themeFolder}radio.png".source = ./radio.png;
     ".config/fcitx5/conf/classicui.conf".text = "Theme=${theme}";
   };
-  # Generating patch:
-  # $ source="$(find /nix/store -maxdepth 1 -type d -name '*fcitx5-anthy*' | head -n 1)/share/fcitx5/anthy/nicola-j.sty"
-  # $ cp $source nicola.sty
-  # $ chmod 644 nicola.sty
-  # $ vim nicola.sty
-  # $ diff $source nicola.sty > nicola.patch
-  home.activation.nicola = let
-    target = ".local/share/fcitx5/anthy/nicola.sty";
-  in lib.hm.dag.entryAfter["writeBoundary"] ''
-    rm -f -- ${target}
-    patch -ruN ${pkgs.fcitx5-anthy}/share/fcitx5/anthy/nicola-j.sty ${./nicola.patch} -o ${target}
-  '';
 }

modules/fcitx5/nicola.patch

@@ -1,4 +0,0 @@
-24c24
-< -=−,』,』
----
-> -=ー,』,』

modules/xborders/xborders.nix

@@ -5,9 +5,9 @@ with pkgs; callPackage python3Packages.buildPythonPackage rec {
   version = "3.4"; # in version.txt
 
   src = fetchFromGitHub {
-    owner = "deter0";
+    owner = "ElnuDev";
     repo = "xborder";
-    rev = "8a031736c9e89a031428f33adcd42da7512d558e";
+    rev = "6a096b4df29e19fee45879c678c33c1a9ada2234";
     sha256 = "sha256-y+Cip5fcDqnJr0aI3jqJMTt6iCV0faunM+Gk6HFZ5iA=";
   };