diff options
| author | tv <tv@krebsco.de> | 2019-04-17 22:04:03 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2019-04-17 22:04:03 +0200 |
| commit | ffd36f5554256f74beb6ade469666b00f72b22a9 (patch) | |
| tree | 51e77c75388d9f9e032bdb09427bcaace2b846c7 /makefu/2configs/tools | |
| parent | e051fecf9c19d446d6588bd21070fd1a799b97a3 (diff) | |
| parent | 1314eb9284697b46d8208c138cf2349816e15c5f (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/tools')
| -rw-r--r-- | makefu/2configs/tools/android-pentest.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/tools/core-gui.nix | 3 | ||||
| -rw-r--r-- | makefu/2configs/tools/media.nix | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/makefu/2configs/tools/android-pentest.nix b/makefu/2configs/tools/android-pentest.nix index 05560db90..036f6e6fe 100644 --- a/makefu/2configs/tools/android-pentest.nix +++ b/makefu/2configs/tools/android-pentest.nix @@ -3,7 +3,7 @@ { nixpkgs.config.android_sdk.accept_license = true; users.users.makefu.packages = with pkgs; [ - mitmproxy + # mitmproxy nmap msf drozer diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix index 41bfef270..ee4f05980 100644 --- a/makefu/2configs/tools/core-gui.nix +++ b/makefu/2configs/tools/core-gui.nix @@ -10,7 +10,8 @@ keepassx pcmanfm evince - mirage + # replacement for mirage: + sxiv tightvnc gnome3.dconf xdotool diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix index 88a7c6882..3f2cf3096 100644 --- a/makefu/2configs/tools/media.nix +++ b/makefu/2configs/tools/media.nix @@ -7,7 +7,7 @@ vlc mumble mplayer - quodlibet # exfalso + # quodlibet # exfalso plowshare streamripper |