diff options
| author | lassulus <lassulus@lassul.us> | 2019-04-14 14:15:31 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2019-04-14 14:15:31 +0200 |
| commit | 99b6cf632b0f1a895b5fae6aec3329930657c52d (patch) | |
| tree | 45a8ea3b9b4965991ea15b58c7ef9b2faafd7a87 | |
| parent | 13388e1d9cfc9f732098d3e0637f13995bc0f297 (diff) | |
| parent | 00ea95a20c02467812c4a9d945cfd7088e5cca5e (diff) | |
Merge remote-tracking branch 'gum/master'
| -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 |