scripts.makeScript: file -> src

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=";
         })}

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";
   };
 }

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=";
         })}

hosts/aristotle/default.nix

@@ -54,5 +54,6 @@
   programs.adb.enable = true;
 
   # fucking hell
+  # FIXME: IFD
   programs.anime-game-launcher.enable = true;
 }

hosts/lightsail-tokyo/default.nix

@@ -85,11 +85,19 @@
       src = ./Caddyfile;
 
       "element" = pkgs.element-web.override {
-        conf.default_server_config."m.homeserver" = let
+        element-web-unwrapped = pkgs.element-web-unwrapped.overrideAttrs (oldAttrs: {
-          inherit (config.services.matrix-synapse) settings;
+          version = "1.11.69-rc.1";
-        in {
+          src = oldAttrs.src.overrideAttrs {
+            outputHash = "sha256-vL21wTI9qeIhrFdbI0WsehVy0ZLBj9rayuQnTPC7k8g=";
+          };
+          offlineCache = oldAttrs.offlineCache.overrideAttrs {
+            outputHash = "sha256-nZWclW2tEq7vPRPG5zzhYfExVnmPxYDm8DxME5w5ORI=";
+          };
+        });
+
+        conf.default_server_config."m.homeserver" = {
           base_url = "https://matrix.ny4.dev";
-          inherit (settings) server_name;
+          server_name = "ny4.dev";
         };
       };
 

pkgs/scripts/lofi.nix

@@ -7,7 +7,7 @@
 makeScript {
   name = "lofi";
   runtimeInputs = [coreutils mpv];
-  file = fetchurl {
+  src = fetchurl {
     url = "https://raw.githubusercontent.com/lime-desu/bin/69422c37582c5914863997c75c268791a0de136e/lofi";
     hash = "sha256-hT+S/rqOHUYnnFcSDFfQht4l1DGasz1L3wDHKUWLraA=";
   };

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,
+  src,
   runtimeInputs ? [],
 }:
-writeScriptBin name ''
+# FIXME: incorrect argv0
-  #!${runtimeShell}
+runCommandNoCCLocal name {
-  ${lib.optionalString (runtimeInputs != []) ''export PATH="${lib.makeBinPath runtimeInputs}:$PATH"''}
+  inherit src;
-  ${builtins.readFile file}
+  nativeBuildInputs = [makeBinaryWrapper];
+} ''
+  install -Dm755 $src $out/bin/.$name
+  makeBinaryWrapper ${runtimeShell} $out/bin/$name \
+    --add-flags $out/bin/.$name \
+    --prefix PATH : ${lib.makeBinPath runtimeInputs}
 ''

pkgs/scripts/screenshot.nix

@@ -12,7 +12,7 @@
 makeScript {
   name = "screenshot";
   runtimeInputs = [coreutils jq grim slurp swappy wl-clipboard libnotify];
-  file = fetchurl {
+  src = fetchurl {
     url = "https://raw.githubusercontent.com/nwg-piotr/nwg-shell/c29e8eb4658a2613fb221ead0b101c75f457bcaf/scripts/screenshot";
     hash = "sha256-Z/fWloz8pLHsvPTPOeBxnbMsGDRTY3G3l/uePQ3ZxjU=";
     postFetch = ''