cleanup

custom-pkgs/commander-nvim/default.nix

@@ -1,5 +0,0 @@
-{ util, inputs, ... }:
-util.vimPlugin {
-  name = "commander.nvim";
-  source = inputs.commander-nvim;
-}

custom-pkgs/default.nix

@@ -1,4 +1,9 @@
-{ lib, inputs, ... }:
+{
+  lib,
+  inputs,
+  pkgs-unstable,
+  ...
+}:
 let
   inherit (builtins) attrNames filter readDir;
   dirs =
@@ -13,7 +18,7 @@ lib.composeManyExtensions (
     dir:
     import ./${dir} {
       util = util dir;
-      inherit inputs;
+      inherit inputs pkgs-unstable;
     }
   ) dirs
 )

custom-pkgs/fb-client/default.nix

@@ -1 +0,0 @@
-{ util, ... }: util.package { }

custom-pkgs/fb-client/package.nix

@@ -1,34 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  python3,
-  ...
-}:
-stdenv.mkDerivation rec {
-  pname = "fb-client";
-  version = "2.3.0";
-
-  src = fetchurl {
-    url = "https://paste.xinu.at/data/client/fb-${version}.tar.gz";
-    sha256 = "sha256-EWTsoG7qy0IQ1GLEuvHEAEJyphl9hz1hFm53k1OdGYM=";
-  };
-
-  buildInputs = [
-    (python3.withPackages (
-      pyPkgs: with pyPkgs; [
-        pycurl
-        pyxdg
-      ]
-    ))
-  ];
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  meta = with lib; {
-    mainProgram = "fb";
-    description = "Client for paste.xinu.at";
-    homepage = "https://paste.xinu.at";
-    license = licenses.gpl3Only;
-  };
-}

custom-pkgs/gen-nvim/default.nix

@@ -1,5 +0,0 @@
-{ inputs, util, ... }:
-util.vimPlugin {
-  name = "gen.nvim";
-  source = inputs.gen-nvim;
-}

custom-pkgs/otp/default.nix

@@ -1 +1 @@
-{ util, inputs, ... }: util.package { inherit inputs; }
+{ util, pkgs-unstable, ... }: util.package { inherit pkgs-unstable; }

custom-pkgs/otp/package.nix

@@ -1,6 +1,6 @@
-{ pkgs, inputs }:
+{ pkgs, pkgs-unstable }:
 let
-  yubikey-manager = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.yubikey-manager;
+  yubikey-manager = pkgs-unstable.yubikey-manager;
   ykman = "${yubikey-manager}/bin/ykman";
   sk = "${pkgs.skim}/bin/sk";
   wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";

custom-pkgs/util.nix

@@ -1,17 +1,4 @@
 dir: {
-  vimPlugin =
-    { name, source }:
-    final: prev: {
-      vimPlugins = prev.vimPlugins // {
-        "${dir}" = prev.vimUtils.buildVimPlugin {
-          pname = name;
-          version = source.lastModifiedDate;
-          src = source;
-          doCheck = false;
-        };
-      };
-    };
-
   package = attrs: final: prev: {
     "${dir}" = final.callPackage ./${dir}/package.nix (attrs // { pkgs = prev; });
   };

custom-pkgs/vimpeccable/default.nix

@@ -1,5 +0,0 @@
-{ inputs, util, ... }:
-util.vimPlugin {
-  name = "vimpeccable";
-  source = inputs.vimpeccable;
-}

custom-pkgs/windline-nvim/default.nix

@@ -1,5 +0,0 @@
-{ inputs, util, ... }:
-util.vimPlugin {
-  name = "windline.nvim";
-  source = inputs.windline-nvim;
-}