From 0f0f9a3aebcbc12da5ad167fc58ffcaedcf9b29a Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Sun, 31 Jan 2021 18:02:37 -0600
Subject: [PATCH] Good ol' organization. Tasks folder started getting too busy,
 and still kind of is.

---
 local.yml                                    | 18 +++++++++---------
 tasks/{freebsd_gui.yml => freebsd/gui.yml}   |  0
 tasks/{ => general}/cron.yml                 |  0
 tasks/{ => general}/groups.yml               |  0
 tasks/{ => general}/harden.yml               |  0
 tasks/{ => general}/hardness_check_lynis.yml |  0
 tasks/{ => general}/packages.yml             |  7 +++++++
 tasks/{ => general}/sudo.yml                 |  0
 tasks/{ => general}/users.yml                |  5 ++---
 tasks/{ => linux}/flatpaks.yml               |  0
 10 files changed, 18 insertions(+), 12 deletions(-)
 rename tasks/{freebsd_gui.yml => freebsd/gui.yml} (100%)
 rename tasks/{ => general}/cron.yml (100%)
 rename tasks/{ => general}/groups.yml (100%)
 rename tasks/{ => general}/harden.yml (100%)
 rename tasks/{ => general}/hardness_check_lynis.yml (100%)
 rename tasks/{ => general}/packages.yml (55%)
 rename tasks/{ => general}/sudo.yml (100%)
 rename tasks/{ => general}/users.yml (87%)
 rename tasks/{ => linux}/flatpaks.yml (100%)

diff --git a/local.yml b/local.yml
index ab86bac..4752574 100644
--- a/local.yml
+++ b/local.yml
@@ -14,12 +14,12 @@
     - include: facts/user.yml
 
   tasks:
-    - include: tasks/packages.yml
-    - include: tasks/groups.yml
-    - include: tasks/users.yml
-    - include: tasks/cron.yml
-    - include: tasks/sudo.yml
-    - include: tasks/harden.yml
+    - include: tasks/general/packages.yml
+    - include: tasks/general/groups.yml
+    - include: tasks/general/users.yml
+    - include: tasks/general/cron.yml
+    - include: tasks/general/sudo.yml
+    - include: tasks/general/harden.yml
       ignore_errors: yes
 
 
@@ -30,13 +30,13 @@
   become: true
 
   tasks:
-    - include: tasks/flatpaks.yml
+    - include: tasks/linux/flatpaks.yml
       when: ansible_system == "Linux" and
             flatpak_distro == yes
     - shell: echo "Not implemented yet. :("
       when: ansible_system == "Linux" and
             flatpak_distro == no
-    - include: tasks/freebsd_gui.yml
+    - include: tasks/freebsd/gui.yml
       when: ansible_system == "FreeBSD"
 
 
@@ -47,4 +47,4 @@
   become: true
 
   tasks:
-    - include: tasks/hardness_check_lynis.yml
\ No newline at end of file
+    - include: tasks/general/hardness_check_lynis.yml
\ No newline at end of file
diff --git a/tasks/freebsd_gui.yml b/tasks/freebsd/gui.yml
similarity index 100%
rename from tasks/freebsd_gui.yml
rename to tasks/freebsd/gui.yml
diff --git a/tasks/cron.yml b/tasks/general/cron.yml
similarity index 100%
rename from tasks/cron.yml
rename to tasks/general/cron.yml
diff --git a/tasks/groups.yml b/tasks/general/groups.yml
similarity index 100%
rename from tasks/groups.yml
rename to tasks/general/groups.yml
diff --git a/tasks/harden.yml b/tasks/general/harden.yml
similarity index 100%
rename from tasks/harden.yml
rename to tasks/general/harden.yml
diff --git a/tasks/hardness_check_lynis.yml b/tasks/general/hardness_check_lynis.yml
similarity index 100%
rename from tasks/hardness_check_lynis.yml
rename to tasks/general/hardness_check_lynis.yml
diff --git a/tasks/packages.yml b/tasks/general/packages.yml
similarity index 55%
rename from tasks/packages.yml
rename to tasks/general/packages.yml
index b4e8112..74084a7 100644
--- a/tasks/packages.yml
+++ b/tasks/general/packages.yml
@@ -7,4 +7,11 @@
     - htop
     - neofetch
     - "{{ sshfs }}"
+    - locate
+    state: present
+
+- name: Remove Repo Software
+  package: 
+    name:
+    - cowsay # Sorry ;)
     state: present
diff --git a/tasks/sudo.yml b/tasks/general/sudo.yml
similarity index 100%
rename from tasks/sudo.yml
rename to tasks/general/sudo.yml
diff --git a/tasks/users.yml b/tasks/general/users.yml
similarity index 87%
rename from tasks/users.yml
rename to tasks/general/users.yml
index 56c5600..1b989ee 100644
--- a/tasks/users.yml
+++ b/tasks/general/users.yml
@@ -7,7 +7,7 @@
     name: ansible
     comment: Ansible
     system: yes
-    
+
 
 # Superuser
 - name: Create User Hyperling
@@ -19,5 +19,4 @@
     append: yes
     shell: /bin/bash
     create_home: yes
-    skeleton: yes
-    generate_ssh_key: yes
\ No newline at end of file
+    generate_ssh_key: yes
diff --git a/tasks/flatpaks.yml b/tasks/linux/flatpaks.yml
similarity index 100%
rename from tasks/flatpaks.yml
rename to tasks/linux/flatpaks.yml