diff --git a/configuration.nix b/configuration.nix index d252c20..0696c63 100644 --- a/configuration.nix +++ b/configuration.nix @@ -36,10 +36,9 @@ cmatrix # More useful than you might think cscope ethtool expect - fatrace file + fatrace file fzf gdb git gnumake htop - illustris.vpnpass iotop iperf jq killall @@ -59,8 +58,10 @@ wget youtube-dl (pass.withExtensions (exts: [ exts.pass-otp ])) - ((pkgs.callPackage ./packages/passcol) { }) - ]; + ] ++ (with illustris; [ + fzpass + vpnpass + ]); }; # for ZFS diff --git a/flake.lock b/flake.lock index c1110de..e9ece58 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1677273080, - "narHash": "sha256-0xvYx6GlbvZhIm/IL7iJD7tKCU77dYbdulq3Af8nHpQ=", + "lastModified": 1677276102, + "narHash": "sha256-9t08ZN5mNdiosyYDGl4y6S20GxQYe21G1gsQmF2yxus=", "owner": "illustris", "repo": "flake", - "rev": "f7035476ecfae1af3a1ea38b2171256ac15cfa76", + "rev": "109c78c4e075184514f44469255c1e9c2195d2cf", "type": "github" }, "original": { diff --git a/packages/passcol/default.nix b/packages/passcol/default.nix deleted file mode 100644 index 5f40e4d..0000000 --- a/packages/passcol/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, python3Packages, pass, xdotool, fetchFromGitHub }: - -stdenv.mkDerivation rec { - version = "1.0.0"; - pname = "passcol"; - src = fetchFromGitHub { - owner = "illustris"; - repo = "passcol"; - rev = "6bca0a85a6394e1fabab6790e9191f64d4bad281"; - sha256 = "1hj5ks382i5cafl6kz7576v59iqc73k90wr6567qcbl6xzgx9iq2"; - }; - - buildInputs = [ - pass python3Packages.percol xdotool - ]; - - installPhase = '' - mkdir -p $out/bin - cp passcol.sh $out/bin/passcol - ''; -}