From 3cc8924d10f6e140339242350c3e5edd8d1cd38b Mon Sep 17 00:00:00 2001
From: Dan Fedele <dan.fedele@gmail.com>
Date: Fri, 17 Apr 2020 10:41:53 -0400
Subject: A little more code cleanup and order re-arranging

---
 kali.yml      | 23 ++++++++++++-----------
 setup-kali.sh |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/kali.yml b/kali.yml
index e2bbd19..6598488 100644
--- a/kali.yml
+++ b/kali.yml
@@ -1,7 +1,12 @@
 ---
   - hosts: localhost
     tasks:
-    - name: Installing base packages from apt
+    - name: Ensuring all packages are up to date
+      apt:
+        update_cache: yes
+        upgrade: dist
+
+    - name: Installing one-off packages from package manager
       package:
         name:
         - terminator
@@ -19,11 +24,6 @@
         - steghide
         - git
         state: latest
-    
-    - name: Ensuring all packages are up to date
-      apt:
-        update_cache: yes
-        upgrade: dist
 
     - name: Clone JumboJohn
       git:
@@ -72,10 +72,11 @@
         user_install: no
     
     - name: Disable mouse interactivity in vim
-      lineinfile:
-        path: /var/etc/vimrc
+      blockinfile:
+        path: /etc/vim/vimrc
         insertafter: EOF
         state: present
-        line:
-          - "set mouse="
-          - "set ttymouse="
\ No newline at end of file
+        block: |
+          " Added with ansible
+          set mouse=
+          set ttymouse=
\ No newline at end of file
diff --git a/setup-kali.sh b/setup-kali.sh
index 2512a8a..cccda10 100644
--- a/setup-kali.sh
+++ b/setup-kali.sh
@@ -10,7 +10,7 @@ echo "*        Installing pip           *"
 echo "***********************************"
 
 curl -s https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py
-python3 /tmp/get-pip.py --user
+python3 /tmp/get-pip.py --user --no-warn-script-location
 
 export PATH=$PATH:/root/.local/bin
 
-- 
cgit v1.2.3