diff --git a/apps/rebuild/default.nix b/apps/rebuild/default.nix
index 1a0eb11..21242c7 100644
--- a/apps/rebuild/default.nix
+++ b/apps/rebuild/default.nix
@@ -6,7 +6,7 @@
   home-manager,
   hostname,
   nix,
-  nixos-rebuild,
+  nixos-rebuild-ng,
   ...
 }:
 
@@ -25,6 +25,6 @@ writeShellApplication {
     home-manager
     hostname
     nix
-    nixos-rebuild
+    nixos-rebuild-ng
   ];
 }
diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix
index ea794ce..af54412 100644
--- a/modules/home/waybar/default.nix
+++ b/modules/home/waybar/default.nix
@@ -129,5 +129,7 @@ in
         };
       };
     };
+
+    services.batsignal.enable = builtins.elem "battery" cfg.settings.mainBar.modules-right;
   };
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 2cc8b2d..2d87a7a 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -18,6 +18,7 @@
   quicknote = pkgs.callPackage ./quicknote { };
   synapse_change_display_name = pkgs.callPackage ./synapse_change_display_name { };
   synix-docs = pkgs.callPackage ./synix-docs { };
+  tinyfugue = pkgs.callPackage ./tinyfugue { };
   trelis-gitingest-mcp = pkgs.callPackage ./trelis-gitingest-mcp { };
   tunerstudio = pkgs.callPackage ./tunerstudio { };
 
diff --git a/pkgs/tinyfugue/default.nix b/pkgs/tinyfugue/default.nix
new file mode 100644
index 0000000..f675682
--- /dev/null
+++ b/pkgs/tinyfugue/default.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  ncurses,
+  openssl,
+  pcre2,
+  zlib,
+
+  lua5_4,
+  python3,
+  icu,
+
+  enableLua ? true,
+  enablePython ? true,
+  enableWidechar ? true,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tinyfugue";
+  version = "5.2.2";
+
+  src = fetchFromGitHub {
+    owner = "ingwarsw";
+    repo = "tinyfugue";
+    rev = version;
+    hash = "sha256-nHgu0XJ2Nd0JYrs3o/NLZ9gq1D4ubdPyowQLyhOzDDA=";
+  };
+
+  buildInputs = [
+    ncurses
+    openssl
+    pcre2
+    zlib
+  ]
+  ++ lib.optional enableLua lua5_4
+  ++ lib.optional enablePython python3
+  ++ lib.optional enableWidechar icu;
+
+  env.NIX_CFLAGS_COMPILE = "-D_DEFAULT_SOURCE";
+
+  configureFlags = [
+    "--enable-termcap=ncurses"
+  ]
+  ++ lib.optional enableLua "--enable-lua"
+  ++ lib.optional enablePython "--enable-python"
+  ++ lib.optional (!enableWidechar) "--disable-widechar";
+
+  installPhase = ''
+    make install
+  '';
+
+  meta = {
+    description = "TinyFugue - Rebirth";
+    homepage = "https://github.com/ingwarsw/tinyfugue";
+    changelog = "https://github.com/ingwarsw/tinyfugue/blob/${src.rev}/CHANGES";
+    license = lib.licenses.gpl2Only;
+    mainProgram = "tf";
+    platforms = lib.platforms.all;
+  };
+}