diff --git a/home/applications/firefox/default.nix b/home/applications/firefox/default.nix
index d21d8a7..db2f0fc 100644
--- a/home/applications/firefox/default.nix
+++ b/home/applications/firefox/default.nix
@@ -4,6 +4,7 @@
     profiles."default" = {
       extraConfig = ''
         ${builtins.readFile (pkgs.fetchurl {
+          # FIXME: IFD
           url = "https://raw.githubusercontent.com/arkenfox/user.js/126.1/user.js";
           hash = "sha256-XRtG0iLKh8uqbeX7Rc2H6VJwZYJoNZPBlAfZEfrSCP4=";
         })}
diff --git a/home/applications/starship/default.nix b/home/applications/starship/default.nix
index dc8a190..fc961a8 100644
--- a/home/applications/starship/default.nix
+++ b/home/applications/starship/default.nix
@@ -5,6 +5,7 @@
 }: {
   programs.starship = {
     enable = true;
+    # FIXME: IFD
     settings = lib.importTOML "${pkgs.starship}/share/starship/presets/nerd-font-symbols.toml";
   };
 }
diff --git a/home/applications/thunderbird/default.nix b/home/applications/thunderbird/default.nix
index 5e8b098..5b7628d 100644
--- a/home/applications/thunderbird/default.nix
+++ b/home/applications/thunderbird/default.nix
@@ -5,6 +5,7 @@
       isDefault = true;
       extraConfig = ''
         ${builtins.readFile (pkgs.fetchurl {
+          # FIXME: IFD
           url = "https://raw.githubusercontent.com/HorlogeSkynet/thunderbird-user.js/d6b18302e46349d9924c8a76951bae6efca51501/user.js";
           hash = "sha256-66B1yLQkQnydAUXD7KGt32OhWSYcdWX+BUozrgW9uAg=";
         })}
diff --git a/hosts/aristotle/default.nix b/hosts/aristotle/default.nix
index 8507c1a..688c154 100644
--- a/hosts/aristotle/default.nix
+++ b/hosts/aristotle/default.nix
@@ -54,5 +54,6 @@
   programs.adb.enable = true;
 
   # fucking hell
+  # FIXME: IFD
   programs.anime-game-launcher.enable = true;
 }
diff --git a/pkgs/scripts/makeScript.nix b/pkgs/scripts/makeScript.nix
index 37e0c1a..a28984b 100644
--- a/pkgs/scripts/makeScript.nix
+++ b/pkgs/scripts/makeScript.nix
@@ -1,16 +1,21 @@
-# trimmed down version of writeShellApplication
-# https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/trivial-builders/default.nix#L245
 {
   lib,
   runtimeShell,
   writeScriptBin,
+  runCommandNoCCLocal,
+  makeBinaryWrapper,
 }: {
   name,
   file,
   runtimeInputs ? [],
 }:
-writeScriptBin name ''
-  #!${runtimeShell}
-  ${lib.optionalString (runtimeInputs != []) ''export PATH="${lib.makeBinPath runtimeInputs}:$PATH"''}
-  ${builtins.readFile file}
+# FIXME: incorrect argv0
+runCommandNoCCLocal name {
+  src = file;
+  nativeBuildInputs = [makeBinaryWrapper];
+} ''
+  install -Dm755 $src $out/bin/.$name
+  makeBinaryWrapper ${runtimeShell} $out/bin/$name \
+    --add-flags $out/bin/.$name \
+    --prefix PATH : ${lib.makeBinPath runtimeInputs}
 ''