Now using ansible roles. also removed linpeass

31 files changed, 640 insertions, 389 deletions

diff --git a/kali.md b/kali.md
deleted file mode 100644
index f893a3f..0000000
--- a/kali.md
+++ /dev/null
@@ -1,38 +0,0 @@
-## To install Kali and make it useful, install the following from apt:
-
-- terminator
-- jxplorer
-- seclists
-- gobuster
-- python3-pip
-- crackmapexec
-- neo4j (for bloodhound)
-- openjdk-14-jdk (for things that are still made in Java for some reason like Ghidra)
-- rlwrap
-- eog
-- xclip
-- exif
-- steghide
-
-## From github:
-- JumboJohn: https://github.com/magnumripper/JohnTheRipper
-- Nishang: https://github.com/samratashok/nishang
-- Chisel: https://github.com/jpillora/chisel
-- LinEnum: https://github.com/rebootuser/LinEnum
-- PEASS: https://github.com/carlospolop/privilege-escalation-awesome-scripts-suite
-- PowerSploit: https://github.com/PowerShellMafia/PowerSploit
-  - (then switch to Dev branch) git checkout dev
-- Impacket: https://github.com/SecureAuthCorp/impacket
-  - Impacket scripts come with Kali, but git repo is more recent. Use the setup.py to build and install before using. Then use python3 to execute!
-- Bloodhound: https://github.com/BloodHoundAD/BloodHound
-  - start up neo4j: neo4j console
-  - Visit the resulting localhost port
-  - Create a password for the neo4j user
-
-## Misc
-- FoxyProxy for firefox
-- Ghidra: https://ghidra-sre.org/
-- Evil-WinRM, install from gem: gem install evil-winrm
-- Remove stupid mouse bindings in vim. Edit /etc/vim/vimrc and add:
-  - set mouse=
-  - set ttymouse=
diff --git a/kali.yml b/kali.yml
deleted file mode 100644
index 7a65a77..0000000
--- a/kali.yml
+++ /dev/null
@@ -1,334 +0,0 @@
----
-  - hosts: localhost
-    become: yes
-    vars:
-      docker_repo_key: "https://download.docker.com/linux/debian/gpg"
-      docker_repo: "deb [arch=amd64] https://download.docker.com/linux/debian bullseye stable"
-      sublime_repo_key: "https://download.sublimetext.com/sublimehq-pub.gpg"
-      sublime_repo: "deb https://download.sublimetext.com/ apt/stable/"
-      ysoserial_jar: "https://github.com/frohoff/ysoserial/releases/latest/download/ysoserial-all.jar"
-      kitty_installer: "https://sw.kovidgoyal.net/kitty/installer.sh"
-    tasks:
-    - name: Confirming playbook was run properly
-      ansible.builtin.fail:
-        msg: "Do not call this playbook directly! Execute sudo bash setup.sh"
-      when: tmux is not defined or zsh_func is not defined
-
-    - name: Add Docker repo key
-      ansible.builtin.shell: curl -fsSL {{ docker_repo_key }} | gpg --dearmor --batch --yes -o /etc/apt/trusted.gpg.d/docker-ce-keyring.gpg
-    
-    - name: Add Docker repo
-      ansible.builtin.apt_repository:
-        repo: "{{ docker_repo }}"
-        state: present
-
-    - name: Add Sublime Text repo key
-      ansible.builtin.shell: curl -fsSL {{ sublime_repo_key }} | gpg --dearmor --batch --yes -o /etc/apt/trusted.gpg.d/sublime-text-keyring.gpg
-
-    - name: Add Sublime Text repo
-      ansible.builtin.apt_repository:
-        repo: "{{ sublime_repo }}"
-        state: present
-    
-    - name: Ensuring all packages are up to date
-      ansible.builtin.apt:
-        update_cache: yes
-        upgrade: dist
-
-    - name: Installing one-off packages from package manager
-      ansible.builtin.package:
-        name:
-        - bloodhound
-        - build-essential
-        - bytecode-viewer
-        - clang
-        - cmake
-        - crackmapexec
-        - curl
-        - default-jdk
-        - default-jre
-        - docker
-        - docker-compose
-        - eog
-        - feroxbuster
-        - flex
-        - forensics-extra
-        - gawk
-        - gdb
-        - gdbserver
-        - ghidra
-        - git
-        - gobuster
-        - golang-go
-        - jq
-        - jxplorer
-        - libffi-dev
-        - liblzma-dev
-        - libssl-dev
-        - libxml2-dev
-        - ltrace
-        - ncat
-        - neo4j
-        - ntpdate
-        - mingw-w64
-        - patch
-        - powershell
-        - python3
-        - python3-dev
-        - python3-pip
-        - p7zip-full
-        - remmina
-        - rlwrap
-        - samba
-        - seclists
-        - steghide
-        - strace
-        - sublime-text
-        - terminator
-        - tmux
-        - xclip
-        - xfce4-terminal
-        - zaproxy
-        - zlib1g-dev
-        state: latest
-    
-    - name: Install pwntools
-      ansible.builtin.pip:
-        name: git+https://github.com/Gallopsled/pwntools.git@dev
-
-    - name: Clone Invoke-Obfuscation (•_•) ( •_•)>⌐■-■ (⌐■_■)
-      ansible.builtin.git:
-        repo: 'https://github.com/danielbohannon/Invoke-Obfuscation'
-        dest: /opt/Invoke-Obfuscation
-
-    - name: Clone JumboJohn
-      ansible.builtin.git:
-        repo: 'https://github.com/magnumripper/JohnTheRipper'
-        dest: /opt/JohnTheRipper
-    
-    - name: Compiling JumboJohn, hold onto yer butts...
-      ansible.builtin.command: chdir=/opt/JohnTheRipper/src {{ item }}
-      with_items:
-      - ./configure
-      - make
-      - make install
-    
-    - name: Install trufflehog
-      ansible.builtin.pip:
-        name: trufflehog
-
-    - name: Install LDAPDomainDump
-      ansible.builtin.pip:
-        name: ldapdomaindump
-
-    - name: Clone Nishang
-      ansible.builtin.git:
-        repo: 'https://github.com/samratashok/nishang'
-        dest: /opt/nishang
-    
-    - name: Clone Chisel
-      ansible.builtin.git:
-        repo: 'https://github.com/jpillora/chisel'
-        dest: /opt/chisel
-    
-    - name: Clone LinEnum
-      ansible.builtin.git:
-        repo: 'https://github.com/rebootuser/LinEnum'
-        dest: /opt/LinEnum
-    
-    - name: Clone PEASS
-      ansible.builtin.git:
-        repo: 'https://github.com/carlospolop/privilege-escalation-awesome-scripts-suite'
-        dest: /opt/privilege-escalation-awesome-scripts-suite
-    
-    - name: Clone PowerSploit
-      ansible.builtin.git:
-        repo: 'https://github.com/PowerShellMafia/PowerSploit'
-        dest: /opt/PowerSploit
-    
-    - name: Clone Impacket
-      ansible.builtin.git:
-        repo: 'https://github.com/SecureAuthCorp/impacket'
-        dest: /opt/impacket
-
-    - name: Installing Impacket
-      ansible.builtin.shell: "python3 /opt/impacket/setup.py build && python3 /opt/impacket/setup.py install"
-      args:
-        chdir: /opt/impacket
-    
-    - name: Clone Bloodhound.py
-      ansible.builtin.git:
-        repo: 'https://github.com/fox-it/BloodHound.py.git'
-        dest: /opt/BloodHound.py
-
-    - name: Clone PyFuscation
-      ansible.builtin.git:
-        repo: 'https://github.com/CBHue/PyFuscation.git'
-        dest: /opt/PyFuscation
-
-    - name: Clone Gef
-      ansible.builtin.git:
-        repo: 'https://github.com/hugsy/gef.git'
-        dest: /opt/gef
-    
-    - name: Clone Static Binaries
-      ansible.builtin.git:
-        repo: 'https://github.com/andrew-d/static-binaries'
-        dest: /opt/static-binaries
-    
-    - name: Clone Ysoserial
-      ansible.builtin.git:
-        repo: 'https://github.com/frohoff/ysoserial'
-        dest: /opt/ysoserial
-
-    - name: Clone Kerbrute
-      ansible.builtin.git:
-        repo: 'https://github.com/ropnop/kerbrute.git'
-        dest: /opt/kerbrute
-
-    - name: Building Kerbrute...
-      ansible.builtin.command: chdir=/opt/kerbrute make linux
-    
-    - name: Downloading Ysoserial JAR file
-      ansible.builtin.get_url:
-        url: "{{ ysoserial_jar }}"
-        dest: /opt/ysoserial/ysoserial-all.jar
-        mode: '0644'
-    
-    - name: Get Evil-WinRM via gem installer
-      community.general.gem:
-        name: evil-winrm
-        norc: yes
-        state: latest
-        user_install: no
-
-    - name: Getting all interactive users
-      ansible.builtin.shell: "awk -F: '{ if (($3 >= 1000 && $3 != 65534) || $3 == 0) print $1}' /etc/passwd"
-      register: users
-
-    - name: Install Kitty Terminal Emulator 🐱
-      ansible.builtin.shell:
-        cmd: "/usr/bin/curl -sL {{ kitty_installer }} | sh /dev/stdin dest=/opt launch=n"
-
-    - name: Create Desktop Icon for Kitty 🐱
-      ansible.builtin.copy:
-        dest: "/usr/share/applications/kitty.desktop"
-        content: |
-          [Desktop Entry]
-          Version=0.26.2
-          Type=Application
-          Name=Kitty Terminal Emulator
-          Exec=/opt/kitty.app/bin/kitty
-          Icon=/opt/kitty.app/share/icons/hicolor/256x256/apps/kitty.png
-          Categories=Utility
-
-    - name: Prepare kitty.conf files for all interactive users 🐱
-      loop: "{{ users.stdout_lines }}"
-      ansible.builtin.file:
-        dest: "~{{ item }}/.config/kitty/"
-        state: directory
-        recurse: yes
-        owner: "{{ item }}"
-        group: "{{ item }}"
-        mode: 0755
-
-    - name: Prepare personalized configs for Kitty 🐱
-      loop: "{{ users.stdout_lines }}"
-      ansible.builtin.blockinfile:
-        path: "~{{ item }}/.config/kitty/kitty.conf"
-        insertafter: EOF
-        create: yes
-        state: present
-        block: |
-          # New windows open in current directory
-          map ctrl+shift+enter launch --cwd=current
-
-          # New tabs open in current directory
-          map ctrl+t new_tab --cwd=current
-
-          # The coveted "zoom" function
-          map ctrl+shift+z toggle_layout stack
-
-          # Disable mouse-click a link to open in a browser
-          mouse_map left click ungrabbed no_op
-    
-    - name: Disable mouse interactivity in vim (╯°□°)╯︵ ┻━┻
-      ansible.builtin.blockinfile:
-        path: /etc/vim/vimrc
-        marker: "\" {mark} ANSIBLE MANAGED BLOCK"
-        insertafter: EOF
-        state: present
-        block: |
-          set mouse=
-          set ttymouse=
-    
-
-    - name: Add sudo-NOPASSWD to users
-      loop: "{{ users.stdout_lines }}"
-      ansible.builtin.lineinfile:
-        path: /etc/sudoers
-        state: present
-        insertafter: EOF
-        line: "{{ item }} ALL=(ALL) NOPASSWD: ALL"
-        validate: /usr/sbin/visudo -cf %s
-
-    - name: Initialize Gef for all users
-      ansible.builtin.script: /opt/gef/scripts/gef.sh
-      become_user: "{{ item }}"
-      loop: "{{ users.stdout_lines }}"
-    
-    - name: Copying over zsh functions file for all users
-      ansible.builtin.copy:
-        src: "{{ zsh_func }}"
-        dest: "~{{ item }}/.zsh_functions"
-        owner: "{{ item }}"
-        group: "{{ item }}"
-        mode: '0640'
-      loop: "{{ users.stdout_lines }}"
-
-    - name: Enabling zsh functions
-      loop: "{{ users.stdout_lines }}"
-      ansible.builtin.blockinfile:
-        path: "~{{ item }}/.zshrc"
-        state: present
-        insertafter: EOF
-        owner: "{{ item }}"
-        block: |
-          if [ -f ~/.zsh_functions ]; then
-            source ~/.zsh_functions
-          fi
-  
-    - name: Copying over tmux config to all users
-      ansible.builtin.copy:
-        src: "{{ tmux }}"
-        dest: "~{{ item }}/.tmux.conf"
-        owner: "{{ item }}"
-        group: "{{ item }}"
-        mode: '0640'
-      loop: "{{ users.stdout_lines }}"
-
-    - name: Create /srv/smb/ directory for payload population
-      ansible.builtin.file:
-        path: /srv/smb
-        state: directory
-        mode: '0755'
-        
-    - name: Creating IWR share in samba config
-      ansible.builtin.blockinfile:
-        path: /etc/samba/smb.conf
-        insertafter: EOF
-        state: present
-        block: |
-          [iwr]
-            comment = Invoke-WebReq'd em? Damn near killed em!
-            path = /srv/smb
-            guest ok = yes
-            browseable = yes
-            create mask = 0600
-            directory mask = 0755
-
-    - name: Ensure that samba doesn't start on boot
-      ansible.builtin.systemd:
-        name: smbd
-        enabled: no
-        state: stopped
diff --git a/main.yml b/main.yml
new file mode 100644
index 0000000..15e199d
--- /dev/null
+++ b/main.yml
@@ -0,0 +1,10 @@
+---
+  - name: Golden Kali
+    hosts: localhost
+    become: true
+    gather_facts: false
+
+    roles:
+      - package-mgmt
+      - individual-apps
+      - custom-config
diff --git a/master-bash_functions b/master-bash_functions
deleted file mode 100644
index 0b5026c..0000000
--- a/master-bash_functions
+++ /dev/null
@@ -1,9 +0,0 @@
-# This is a file I will store all bash functions I use
-
-scan() {
-    echo "Scanning with masscan..."
-    echo "If this takes way too long, ping $1 in a separate terminal"
-    echo "because masscan has a weird bug that holds connections open or something"
-    P=$(sudo masscan -p 1-65535 -e tun0 --rate=1000 $1 | grep Discovered | awk '{print $4}' | cut -d/ -f1 | tr "\n" "," | sed 's/\,$/\n/') ; sudo nmap -sC -sV -p $P -oN scanresults-$1.txt $1
-    echo "Stored results in scanresults-$1.txt"
-}
diff --git a/roles/custom-config/README.md b/roles/custom-config/README.md
new file mode 100644
index 0000000..225dd44
--- /dev/null
+++ b/roles/custom-config/README.md
@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/roles/custom-config/defaults/main.yml b/roles/custom-config/defaults/main.yml
new file mode 100644
index 0000000..ccefed4
--- /dev/null
+++ b/roles/custom-config/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+# defaults file for custom-config
diff --git a/tmux_conf b/roles/custom-config/files/tmux_conf
index 55cf067..55cf067 100644
--- a/tmux_conf
+++ b/roles/custom-config/files/tmux_conf
diff --git a/zsh_functions.zsh b/roles/custom-config/files/zsh_functions.zsh
index e6df6e0..e6df6e0 100644
--- a/zsh_functions.zsh
+++ b/roles/custom-config/files/zsh_functions.zsh
diff --git a/roles/custom-config/handlers/main.yml b/roles/custom-config/handlers/main.yml
new file mode 100644
index 0000000..2fee87f
--- /dev/null
+++ b/roles/custom-config/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for custom-config
diff --git a/roles/custom-config/meta/main.yml b/roles/custom-config/meta/main.yml
new file mode 100644
index 0000000..c572acc
--- /dev/null
+++ b/roles/custom-config/meta/main.yml
@@ -0,0 +1,52 @@
+galaxy_info:
+  author: your name
+  description: your role description
+  company: your company (optional)
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Choose a valid license ID from https://spdx.org - some suggested licenses:
+  # - BSD-3-Clause (default)
+  # - MIT
+  # - GPL-2.0-or-later
+  # - GPL-3.0-only
+  # - Apache-2.0
+  # - CC-BY-4.0
+  license: license (GPL-2.0-or-later, MIT, etc)
+
+  min_ansible_version: 2.1
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  #
+  # Provide a list of supported platforms, and for each platform a list of versions.
+  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
+  # To view available platforms and versions (or releases), visit:
+  # https://galaxy.ansible.com/api/v1/platforms/
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
diff --git a/roles/custom-config/tasks/main.yml b/roles/custom-config/tasks/main.yml
new file mode 100644
index 0000000..1a7de05
--- /dev/null
+++ b/roles/custom-config/tasks/main.yml
@@ -0,0 +1,132 @@
+---
+# tasks file for custom-config
+- name: Getting all interactive users
+  #ansible.builtin.shell "awk -F: '{ if (($3 >= 1000 && $3 != 65534) || $3 == 0) print $1)' /etc/passwd"
+  ansible.builtin.shell: "grep -E '(ba|da|k|c|z|tc|b|a|sc|sh)$' /etc/passwd"
+  register: users
+
+- name: Install Kitty Terminal Emulator 🐱
+  ansible.builtin.shell:
+    cmd: "/usr/bin/curl -sL {{ kitty_installer }} | sh /dev/stdin dest=/opt launch=n"
+
+- name: Create Desktop Icon for Kitty 🐱
+  ansible.builtin.copy:
+    dest: "/usr/share/applications/kitty.desktop"
+    content: |
+      [Desktop Entry]
+      Version=0.26.2
+      Type=Application
+      Name=Kitty Terminal Emulator
+      Exec=/opt/kitty.app/bin/kitty
+      Icon=/opt/kitty.app/share/icons/hicolor/256x256/apps/kitty.png
+      Categories=Utility
+
+- name: Prepare kitty.conf files for all interactive users 🐱
+  loop: "{{ users.stdout_lines }}"
+  ansible.builtin.file:
+    dest: "~{{ item }}/.config/kitty/"
+    state: directory
+    recurse: yes
+    owner: "{{ item }}"
+    group: "{{ item }}"
+    mode: 0755
+
+- name: Prepare personalized configs for Kitty 🐱
+  loop: "{{ users.stdout_lines }}"
+  ansible.builtin.blockinfile:
+    path: "~{{ item }}/.config/kitty/kitty.conf"
+    insertafter: EOF
+    create: yes
+    state: present
+    block: |
+      # New windows open in current directory
+      map ctrl+shift+enter launch --cwd=current
+
+      # New tabs open in current directory
+      map ctrl+t new_tab --cwd=current
+
+      # The coveted "zoom" function
+      map ctrl+shift+z toggle_layout stack
+      
+      # disable mouse-click a link to open in a browser
+      mouse_map left click ungrabbed no_op
+
+- name: Disable mouse interactivity in vim (╯°□°)╯︵ ┻━┻
+  ansible.builtin.blockinfile:
+    path: /etc/vim/vimrc
+    marker: "\" {mark} ANSIBLE MANAGED BLOCK"
+    insertafter: EOF
+    state: present
+    block: |
+      set mouse=
+      set ttymouse=
+
+- name: Add sudo-NOPASSWD to users
+  loop: "{{ users.stdout_lines }}"
+  ansible.builtin.lineinfile:
+    path: /etc/sudoers
+    state: present
+    insertafter: EOF
+    line: "{{ item }} ALL=(ALL) NOPASSWD: ALL"
+    validate: /usr/sbin/visudo -cf %s
+
+- name: Initialize Gef for all users
+  ansible.builtin.script: /opt/gef/scripts/gef.sh
+  become_user: "{{ item }}"
+  loop: "{{ users.stdout_lines }}"
+
+- name: Copying over zsh functions file for all users
+  ansible.builtin.copy:
+    src: zsh_functions.zsh
+    dest: "{{ item }}/.zsh_functions"
+    owner: "{{ item }}"
+    group: "{{ item }}"
+    mode: '0640'
+  loop: "{{ users.stdout_lines }}"
+
+- name: Enabling zsh functions
+  loop: "{{ users.stdout_lines }}"
+  ansible.builtin.blockinfile:
+    path: "~{{ item }}/.zshrc"
+    state: present
+    insertafter: EOF
+    owner: "{{ item }}"
+    block: |
+      if [ -f ~/.zsh_functions]; then
+        source ~/.zsh_functions
+      fi
+
+- name: Copying over tmux config to all users
+  ansible.builtin.copy:
+    src: tmux_conf
+    dest: "~{{ item }}/.tmux.conf"
+    owner: "{{ item }}"
+    group: "{{ item }}"
+    mode: '0640'
+  loop: "{{ users.stdout_lines }}"
+
+- name: Create /srv/smb/ directory for payload population
+  ansible.builtin.file:
+    path: /srv/smb
+    state: directory
+    mode: '0755'
+
+- name: Creating IWR share in samba config
+  ansible.builtin.blockinfile:
+    path: /etc/samba/smb.conf
+    insertafter: EOF
+    state: present
+    block: |
+      [iwr]
+        comment = Invoke-WebReq'd em? Damn near killed em!
+        path = /srv/smb
+        guest ok = yes
+        browseable = yes
+        create mask = 0600
+        directory mask = 0755
+
+- name: Ensure that samba doesn't start on boot
+  ansible.builtin.systemd:
+    name: smbd
+    enabled: no
+    state: stopped
diff --git a/roles/custom-config/tests/inventory b/roles/custom-config/tests/inventory
new file mode 100644
index 0000000..878877b
--- /dev/null
+++ b/roles/custom-config/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/roles/custom-config/tests/test.yml b/roles/custom-config/tests/test.yml
new file mode 100644
index 0000000..181d731
--- /dev/null
+++ b/roles/custom-config/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - custom-config
diff --git a/roles/custom-config/vars/main.yml b/roles/custom-config/vars/main.yml
new file mode 100644
index 0000000..60c28e5
--- /dev/null
+++ b/roles/custom-config/vars/main.yml
@@ -0,0 +1,3 @@
+---
+# vars file for custom-config
+kitty_installer: "https://sw.kovidgoyal.net/kitty/installer.sh"
diff --git a/roles/individual-apps/README.md b/roles/individual-apps/README.md
new file mode 100644
index 0000000..225dd44
--- /dev/null
+++ b/roles/individual-apps/README.md
@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/roles/individual-apps/defaults/main.yml b/roles/individual-apps/defaults/main.yml
new file mode 100644
index 0000000..ebfe4e0
--- /dev/null
+++ b/roles/individual-apps/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+# defaults file for individual-apps
diff --git a/roles/individual-apps/handlers/main.yml b/roles/individual-apps/handlers/main.yml
new file mode 100644
index 0000000..3c771dd
--- /dev/null
+++ b/roles/individual-apps/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for individual-apps
diff --git a/roles/individual-apps/meta/main.yml b/roles/individual-apps/meta/main.yml
new file mode 100644
index 0000000..c572acc
--- /dev/null
+++ b/roles/individual-apps/meta/main.yml
@@ -0,0 +1,52 @@
+galaxy_info:
+  author: your name
+  description: your role description
+  company: your company (optional)
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Choose a valid license ID from https://spdx.org - some suggested licenses:
+  # - BSD-3-Clause (default)
+  # - MIT
+  # - GPL-2.0-or-later
+  # - GPL-3.0-only
+  # - Apache-2.0
+  # - CC-BY-4.0
+  license: license (GPL-2.0-or-later, MIT, etc)
+
+  min_ansible_version: 2.1
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  #
+  # Provide a list of supported platforms, and for each platform a list of versions.
+  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
+  # To view available platforms and versions (or releases), visit:
+  # https://galaxy.ansible.com/api/v1/platforms/
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
diff --git a/roles/individual-apps/tasks/main.yml b/roles/individual-apps/tasks/main.yml
new file mode 100644
index 0000000..7b1b3d6
--- /dev/null
+++ b/roles/individual-apps/tasks/main.yml
@@ -0,0 +1,106 @@
+---
+# tasks file for individual-apps
+- name: Install pwntools
+  ansible.builtin.pip:
+    name: git+https://github.com/Gallopsled/pwntools.git@dev
+
+- name: Clone Invoke-Obfuscation (•_•) ( •_•)>⌐■-■ (⌐■_■)
+  ansible.builtin.git:
+    repo: 'https://github.com/danielbohannon/Invoke-Obfuscation'
+    dest: /opt/Invoke-Obfuscation
+
+- name: Clone JumboJohn
+  ansible.builtin.git:
+    repo: 'https://github.com/magnumripper/JohnTheRipper'
+    dest: /opt/JohnTheRipper
+
+- name: Compiling JumboJohn, hold onto yer butts...
+  ansible.builtin.command: chdir=/opt/JohnTheRipper/src {{ item }}
+  with_items:
+    - ./configure
+    - make
+    - make install
+
+- name: Install trufflehog
+  ansible.builtin.pip:
+    name: trufflehog
+
+- name: Install LDAPDomainDump
+  ansible.builtin.pip:
+    name: ldapdomaindump
+
+- name: Clone Nishang
+  ansible.builtin.git:
+    repo: 'https://github.com/samratashok/nishang'
+    dest: /opt/nishang
+
+- name: Clone Chisel
+  ansible.builtin.git:
+    repo: 'https://github.com/jpillora/chisel'
+    dest: /opt/chisel
+
+- name: Clone LinEnum
+  ansible.builtin.git:
+    repo: 'https://github.com/rebootuser/LinEnum'
+    dest: /opt/LinEnum
+
+- name: Clone PowerSploit
+  ansible.builtin.git:
+    repo: 'https://github.com/PowerShellMafia/PowerSploit'
+    dest: /opt/PowerSploit
+
+- name: Clone Impacket
+  ansible.builtin.git:
+    repo: 'https://github.com/SecureAuthCorp/impacket'
+    dest: /opt/impacket
+
+- name: Installing Impacket
+  ansible.builtin.shell: "python3 /opt/impacket/setup.py build && python3 /opt/impacket/setup.py install"
+  args:
+    chdir: /opt/impacket
+
+- name: Clone Bloodhound.py
+  ansible.builtin.git:
+    repo: 'https://github.com/fox-it/BloodHound.py.git'
+    dest: /opt/BloodHound.py
+
+- name: Clone PyFuscation
+  ansible.builtin.git:
+    repo: 'https://github.com/CBHue/PyFuscation.git'
+    dest: /opt/PyFuscation
+
+- name: Clone Gef
+  ansible.builtin.git:
+    repo: 'https://github.com/hugsy/gef.git'
+    dest: /opt/gef
+
+- name: Clone Static Binaries
+  ansible.builtin.git:
+    repo: 'https://github.com/andrew-d/static-binaries'
+    dest: /opt/static-binaries
+
+- name: Clone Ysoserial
+  ansible.builtin.git:
+    repo: 'https://github.com/frohoff/ysoserial'
+    dest: /opt/ysoserial
+
+- name: Clone Kerbrute
+  ansible.builtin.git:
+    repo: 'https://github.com/ropnop/kerbrute.git'
+    dest: /opt/kerbrute
+
+- name: Building Kerbrute...
+  ansible.builtin.command: chdir=/opt/kerbrute make linux
+
+- name: Downloading Ysoserial JAR file
+  ansible.builtin.get_url:
+    url: "{{ ysoserial_jar }}"
+    dest: /opt/ysoserial/ysoserial-all.jar
+    mode: '0644'
+
+- name: Get Evil-WinRM via gem installer
+  community.general.gem:
+    name: evil-winrm
+    norc: yes
+    state: latest
+    user_install: no
diff --git a/roles/individual-apps/tests/inventory b/roles/individual-apps/tests/inventory
new file mode 100644
index 0000000..878877b
--- /dev/null
+++ b/roles/individual-apps/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/roles/individual-apps/tests/test.yml b/roles/individual-apps/tests/test.yml
new file mode 100644
index 0000000..9626dd6
--- /dev/null
+++ b/roles/individual-apps/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - individual-apps
diff --git a/roles/individual-apps/vars/main.yml b/roles/individual-apps/vars/main.yml
new file mode 100644
index 0000000..c21af81
--- /dev/null
+++ b/roles/individual-apps/vars/main.yml
@@ -0,0 +1,3 @@
+---
+# vars file for individual-apps
+ysoserial_jar: "https://github.com/frohoff/ysoserial/releases/latest/download/ysoserial-all.jar"
diff --git a/roles/package-mgmt/README.md b/roles/package-mgmt/README.md
new file mode 100644
index 0000000..225dd44
--- /dev/null
+++ b/roles/package-mgmt/README.md
@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/roles/package-mgmt/defaults/main.yml b/roles/package-mgmt/defaults/main.yml
new file mode 100644
index 0000000..57adef2
--- /dev/null
+++ b/roles/package-mgmt/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+# defaults file for package-mgmt
diff --git a/roles/package-mgmt/handlers/main.yml b/roles/package-mgmt/handlers/main.yml
new file mode 100644
index 0000000..ef24490
--- /dev/null
+++ b/roles/package-mgmt/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for package-mgmt
diff --git a/roles/package-mgmt/meta/main.yml b/roles/package-mgmt/meta/main.yml
new file mode 100644
index 0000000..c572acc
--- /dev/null
+++ b/roles/package-mgmt/meta/main.yml
@@ -0,0 +1,52 @@
+galaxy_info:
+  author: your name
+  description: your role description
+  company: your company (optional)
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Choose a valid license ID from https://spdx.org - some suggested licenses:
+  # - BSD-3-Clause (default)
+  # - MIT
+  # - GPL-2.0-or-later
+  # - GPL-3.0-only
+  # - Apache-2.0
+  # - CC-BY-4.0
+  license: license (GPL-2.0-or-later, MIT, etc)
+
+  min_ansible_version: 2.1
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  #
+  # Provide a list of supported platforms, and for each platform a list of versions.
+  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
+  # To view available platforms and versions (or releases), visit:
+  # https://galaxy.ansible.com/api/v1/platforms/
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
diff --git a/roles/package-mgmt/tasks/main.yml b/roles/package-mgmt/tasks/main.yml
new file mode 100644
index 0000000..2b6360e
--- /dev/null
+++ b/roles/package-mgmt/tasks/main.yml
@@ -0,0 +1,76 @@
+---
+# tasks file for package-mgmt
+- name: Add Docker repo key
+  ansible.builtin.shell: curl -fsSL {{ docker_repo_key }} | gpg --dearmor --batch --yes -o /etc/apt/trusted.gpg.d/docker-ce-keyring.gpg
+
+- name: Add Docker repo
+  ansible.builtin.apt_repository:
+    repo: "{{ docker_repo }}"
+    state: present
+
+- name: Add Sublime Text repo
+  ansible.builtin.apt_repository:
+    repo: "{{ sublime_repo }}"
+    state: present
+
+- name: Ensuring all packages are up to date
+  ansible.builtin.apt:
+    update_cache: yes
+    upgrade: dist
+
+- name: Installing one-off packages from package manager
+  ansible.builtin.package:
+    name:
+      - bloodhound
+      - build-essential
+      - bytecode-viewer
+      - clang
+      - cmake
+      - crackmapexec
+      - curl
+      - default-jdk
+      - default-jre
+      - docker
+      - docker-compose
+      - eog
+      - feroxbuster
+      - flex
+      - forensics-extra
+      - gawk
+      - gdb
+      - gdbserver
+      - ghidra
+      - git
+      - gobuster
+      - golang-go
+      - jq
+      - jxplorer
+      - libffi-dev
+      - liblzma-dev
+      - libssl-dev
+      - libxml2-dev
+      - ltrace
+      - ncat
+      - neo4j
+      - ntpdate
+      - mingw-w64
+      - patch
+      - powershell
+      - python3
+      - python3-dev
+      - python3-pip
+      - p7zip-full
+      - remmina
+      - rlwrap
+      - samba
+      - seclists
+      - steghide
+      - strace
+      - sublime-text
+      - terminator
+      - tmux
+      - xclip
+      - xfce4-terminal
+      - zaproxy
+      - zlib1g-dev
+      state: latest
diff --git a/roles/package-mgmt/tests/inventory b/roles/package-mgmt/tests/inventory
new file mode 100644
index 0000000..878877b
--- /dev/null
+++ b/roles/package-mgmt/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/roles/package-mgmt/tests/test.yml b/roles/package-mgmt/tests/test.yml
new file mode 100644
index 0000000..929b029
--- /dev/null
+++ b/roles/package-mgmt/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - package-mgmt
diff --git a/roles/package-mgmt/vars/main.yml b/roles/package-mgmt/vars/main.yml
new file mode 100644
index 0000000..8bb393e
--- /dev/null
+++ b/roles/package-mgmt/vars/main.yml
@@ -0,0 +1,6 @@
+---
+# vars file for package-mgmt
+docker_repo_key: "https://download.docker.com/linux/debian/gpg"
+docker_repo: "deb [arch=amd64] https://download.docker.com/linux/debian bullseye stable"
+sublime_repo_key: "https://download.sublimetext.com/sublimehq-pub.gpg"
+sublime_repo: "deb https://download.sublimetext.com/ apt/stable/"
diff --git a/setup.sh b/setup.sh
index 2148bd8..10957ea 100644
--- a/setup.sh
+++ b/setup.sh
@@ -17,13 +17,6 @@ if [[ $EUID -ne 0 ]]; then
 fi
 
 PATH_TO_SCRIPT=$(dirname $(readlink -f $0))
-ZSH_FUNC_FILE="zsh_functions.zsh"
-TMUX_FILE="tmux_conf"
-
-if [[ ! -e ${PATH_TO_SCRIPT}/${ZSH_FUNC_FILE} ]] && [[ ! -e ${PATH_TO_SCRIPT}/${TMUX_FILE} ]]; then
-	echo "Cannot find supporting files! Please clone repository and try again!"
-	exit 3
-fi
 
 echo "***********************************"
 echo "*        Installing pip           *"
@@ -44,7 +37,7 @@ echo "***********************************"
 echo "*      Running Kali playbook      *"
 echo "***********************************"
 
-ansible-playbook ${PATH_TO_SCRIPT}/kali.yml --extra-vars "tmux=${PATH_TO_SCRIPT}/${TMUX_FILE} zsh_func=${PATH_TO_SCRIPT}/${ZSH_FUNC_FILE}"
+ansible-playbook ${PATH_TO_SCRIPT}/main.yml
 
 echo "***********************************"
 echo "*             Done!               *"