From 16898eaa7cb83dc65ec8de5ef1f78b3b65117089 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Thu, 15 Aug 2024 22:27:03 +0800 Subject: [PATCH] dust: drop lofi script https://github.com/yt-dlp/yt-dlp/issues/10108 --- hosts/dust/home/default.nix | 7 +------ pkgs/default.nix | 12 +----------- pkgs/scripts/lofi.nix | 14 -------------- pkgs/scripts/makeScript.nix | 21 --------------------- 4 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 pkgs/scripts/lofi.nix delete mode 100644 pkgs/scripts/makeScript.nix diff --git a/hosts/dust/home/default.nix b/hosts/dust/home/default.nix index 2f90df5..215036b 100644 --- a/hosts/dust/home/default.nix +++ b/hosts/dust/home/default.nix @@ -1,8 +1,4 @@ -{ - pkgs, - inputs, - ... -}: { +{pkgs, ...}: { imports = [ ./theme.nix @@ -38,7 +34,6 @@ loupe mousai seahorse - inputs.self.legacyPackages.${pkgs.stdenv.hostPlatform.system}.scripts.lofi ]; programs.obs-studio.enable = true; diff --git a/pkgs/default.nix b/pkgs/default.nix index a4722d4..11b0da4 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,20 +1,10 @@ # NOTE: 301: All packages are migrated to `github:Guanran928/nur-packages`, # only keeping some packages that only fits for personal use. pkgs: let - inherit (pkgs) lib callPackage; + inherit (pkgs) callPackage; in { # https://github.com/NixOS/nixpkgs/pull/308720 pixivfe = callPackage ./pixivfe.nix {}; background = pkgs.nixos-artwork.wallpapers.nineish-dark-gray.src; - - scripts = lib.makeScope pkgs.newScope (self: let - inherit (self) callPackage; - in { - # util - makeScript = callPackage ./scripts/makeScript.nix {}; - - # scripts - lofi = callPackage ./scripts/lofi.nix {}; - }); } diff --git a/pkgs/scripts/lofi.nix b/pkgs/scripts/lofi.nix deleted file mode 100644 index 8363be9..0000000 --- a/pkgs/scripts/lofi.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - makeScript, - coreutils, - mpv, - fetchurl, -}: -makeScript { - name = "lofi"; - runtimeInputs = [coreutils mpv]; - src = fetchurl { - url = "https://raw.githubusercontent.com/lime-desu/bin/69422c37582c5914863997c75c268791a0de136e/lofi"; - hash = "sha256-hT+S/rqOHUYnnFcSDFfQht4l1DGasz1L3wDHKUWLraA="; - }; -} diff --git a/pkgs/scripts/makeScript.nix b/pkgs/scripts/makeScript.nix deleted file mode 100644 index 853eac2..0000000 --- a/pkgs/scripts/makeScript.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - lib, - runtimeShell, - runCommandLocal, - makeBinaryWrapper, -}: { - name, - src, - runtimeInputs ? [], -}: -# FIXME: incorrect argv0 -runCommandLocal name { - inherit src; - nativeBuildInputs = [makeBinaryWrapper]; - meta.mainProgram = name; -} '' - install -Dm755 $src $out/bin/.$name - makeBinaryWrapper ${runtimeShell} $out/bin/$name \ - --add-flags $out/bin/.$name \ - --prefix PATH : ${lib.makeBinPath runtimeInputs} -''