diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock
deleted file mode 100644
index 30e48b7febbe..000000000000
--- a/pkgs/applications/office/timetrap/Gemfile.lock
+++ /dev/null
@@ -1,19 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    chronic (0.10.2)
-    sequel (5.30.0)
-    sqlite3 (1.4.2)
-    timetrap (1.15.2)
-      chronic (~> 0.10.2)
-      sequel (~> 5.30.0)
-      sqlite3 (~> 1.4.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  timetrap
-
-BUNDLED WITH
-   2.1.4
diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix
deleted file mode 100644
index 16419444ee25..000000000000
--- a/pkgs/applications/office/timetrap/gemset.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  chronic = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
-      type = "gem";
-    };
-    version = "0.10.2";
-  };
-  sequel = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0gqqnqrfayhwhkp0vy3frv68sgc7klyd6mfisx1j3djjvlyc7hmr";
-      type = "gem";
-    };
-    version = "5.30.0";
-  };
-  sqlite3 = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78";
-      type = "gem";
-    };
-    version = "1.4.2";
-  };
-  timetrap = {
-    dependencies = [
-      "chronic"
-      "sequel"
-      "sqlite3"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0pfg5c3kmh1jfaaszw253bi93ixa6cznqmsafrcpccrdg9r8j2k8";
-      type = "gem";
-    };
-    version = "1.15.2";
-  };
-}
diff --git a/pkgs/applications/office/timetrap/Gemfile b/pkgs/by-name/ti/timetrap/Gemfile
similarity index 100%
rename from pkgs/applications/office/timetrap/Gemfile
rename to pkgs/by-name/ti/timetrap/Gemfile
diff --git a/pkgs/by-name/ti/timetrap/Gemfile.lock b/pkgs/by-name/ti/timetrap/Gemfile.lock
new file mode 100644
index 000000000000..15e399079253
--- /dev/null
+++ b/pkgs/by-name/ti/timetrap/Gemfile.lock
@@ -0,0 +1,23 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    bigdecimal (3.1.9)
+    chronic (0.10.2)
+    mini_portile2 (2.8.8)
+    sequel (5.90.0)
+      bigdecimal
+    sqlite3 (1.7.3)
+      mini_portile2 (~> 2.8.0)
+    timetrap (1.15.5)
+      chronic (~> 0.10.2)
+      sequel (~> 5.90.0)
+      sqlite3 (~> 1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  timetrap
+
+BUNDLED WITH
+   2.6.6
diff --git a/pkgs/by-name/ti/timetrap/gemset.nix b/pkgs/by-name/ti/timetrap/gemset.nix
new file mode 100644
index 000000000000..81c9b13ae61c
--- /dev/null
+++ b/pkgs/by-name/ti/timetrap/gemset.nix
@@ -0,0 +1,69 @@
+{
+  bigdecimal = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
+      type = "gem";
+    };
+    version = "3.1.9";
+  };
+  chronic = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
+      type = "gem";
+    };
+    version = "0.10.2";
+  };
+  mini_portile2 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
+      type = "gem";
+    };
+    version = "2.8.8";
+  };
+  sequel = {
+    dependencies = [ "bigdecimal" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1s5qhylirrmfbjhdjdfqaiksjlaqmgixl25sxd8znq8dqwqlrydz";
+      type = "gem";
+    };
+    version = "5.90.0";
+  };
+  sqlite3 = {
+    dependencies = [ "mini_portile2" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "073hd24qwx9j26cqbk0jma0kiajjv9fb8swv9rnz8j4mf0ygcxzs";
+      type = "gem";
+    };
+    version = "1.7.3";
+  };
+  timetrap = {
+    dependencies = [
+      "chronic"
+      "sequel"
+      "sqlite3"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0gcs9vyg1i3nsiiwrkqza14qj7h3chlg6w5icbf0ggjzswz3rwd2";
+      type = "gem";
+    };
+    version = "1.15.5";
+  };
+}
diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/by-name/ti/timetrap/package.nix
similarity index 76%
rename from pkgs/applications/office/timetrap/default.nix
rename to pkgs/by-name/ti/timetrap/package.nix
index cfb1c0a62fc9..9e172d7e1866 100644
--- a/pkgs/applications/office/timetrap/default.nix
+++ b/pkgs/by-name/ti/timetrap/package.nix
@@ -34,18 +34,18 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ installShellFiles ];
 
   installPhase = ''
-    mkdir $out;
-    cd $out;
+    mkdir $out
+    cd $out
 
-    mkdir bin; pushd bin;
-    ln -vs ${ttBundlerApp}/bin/t;
-    ln -vs ${ttBundlerApp}/bin/timetrap;
-    popd;
+    mkdir bin; pushd bin
+    ln -vs ${ttBundlerApp}/bin/t
+    ln -vs ${ttBundlerApp}/bin/timetrap
+    popd
 
     for c in t timetrap; do
-      installShellCompletion --cmd $c --bash ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/bash/*;
-      installShellCompletion --cmd $c --zsh ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/zsh/*;
-    done;
+      installShellCompletion --cmd $c --bash ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/bash/*
+      installShellCompletion --cmd $c --zsh ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/zsh/*
+    done
   '';
 
   meta = with lib; {
@@ -59,4 +59,8 @@ stdenv.mkDerivation {
     ];
     platforms = platforms.unix;
   };
+
+  passthru = {
+    updateScript = ttBundlerApp.passthru.updateScript;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d45d9e5a04dd..965d9d23d8bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4574,8 +4574,6 @@ with pkgs;
 
   tiled = libsForQt5.callPackage ../applications/editors/tiled { };
 
-  timetrap = callPackage ../applications/office/timetrap { };
-
   tinc = callPackage ../tools/networking/tinc { };
 
   tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { };