From 2c0cb373ece7167aa57b0befd348eb66a351f2dc Mon Sep 17 00:00:00 2001
From: firmianay <firmianay@gmail.com>
Date: Wed, 23 Aug 2017 00:24:59 +0800
Subject: [PATCH] update vm

---
 doc/2.1_vm.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/doc/2.1_vm.md b/doc/2.1_vm.md
index f6902a3..8d2ae58 100644
--- a/doc/2.1_vm.md
+++ b/doc/2.1_vm.md
@@ -1,10 +1,28 @@
 # 虚拟机环境
 
+- [物理机 Manjaro 17.02](#物理机-manjaro-1702)
 - [创建一个安全的环境](#创建一个安全的环境)
 - [Windows 虚拟机](#windows-虚拟机)
 - [Linux 虚拟机](#linux-虚拟机)
 
 
+## 物理机 Manjaro 17.02
+Manjaro 17.02 x86-64(https://manjaro.org/) with BlackArch tools.
+```text
+$ uname -a
+Linux firmy-pc 4.9.43-1-MANJARO #1 SMP PREEMPT Sun Aug 13 20:28:47 UTC 2017 x86_64 GNU/Linux
+```
+```text
+yaourt -Rscn:
+
+skanlite cantata kdenlive konversation libreoffice-still thunderbird-kde k3b cups
+
+yaourt -S:
+
+virtualbox tree git ipython ipython2 gdb google-chrome tcpdump vim wireshark-qt edb ssdeep wps-office strace metasploit pwntools peda oh-my-zsh-git
+```
+
+
 ## 创建一个安全的环境
 - VirtualBox(https://www.virtualbox.org/)
 - VMware Workstation/Player(https://www.vmware.com/)
@@ -17,6 +35,11 @@
   - Windows 7
 - 64-bit
   - Windows 7
+    ```text
+    7-Zip/WinRAR
+    IDA_Pro_v6.8
+    吾爱破解工具包2.0
+    ```
   - Windows 10
 
 下载地址：http://www.itellyou.cn/
@@ -25,6 +48,29 @@
 - 32-bit/64-bit Ubuntu LTS - https://www.ubuntu.com/download
   - 14.04
   - 16.04
+    ```text
+    $ uname -a
+    Linux firmyy-VirtualBox 4.10.0-28-generic #32~16.04.2-Ubuntu SMP Thu Jul 20 10:19:13 UTC 2017 i686 i686 i686 GNU/Linux
+    ```
+    ```text
+    apt-get purge:
+
+    libreoffice-common unity-webapps-common thunderbird totem rhythmbox simple-scan gnome-mahjongg aisleriot gnome-mines cheese transmission-common gnome-orca webbrowser-app gnome-sudoku onboard deja-dup usb-creator-common
+
+    apt-get install:
+
+    git vim tree ipython ipython3 python-pip python3-pip foremost ssdeep zsh
+
+    pip2 install:
+
+    termcolor
+    zio
+
+    other install:
+
+    oh my zsh
+    peda
+    ```
 - Kali Linux - https://www.kali.org/
 - BlackArch - https://blackarch.org/
 - REMnux - https://remnux.org