fixing merges

ansible.cfg

@@ -73,7 +73,7 @@ collections_path=/home/aeth/.ansible/collections:/usr/share/ansible/collections
 #ask_pass=False
 
 # (boolean) This controls whether an Ansible playbook should prompt for a vault password.
-ask_vault_pass=True
+# ask_vault_pass=True
 
 # (pathspec) Colon separated paths in which Ansible will search for Cache Plugins.
 ;cache_plugins=/home/aeth/.ansible/plugins/cache:/usr/share/ansible/plugins/cache
@@ -649,7 +649,7 @@ ask_vault_pass=True
 ;export=False
 
 # (list) List of extensions to ignore when using a directory as an inventory source
-;ignore_extensions=.pyc, .pyo, .swp, .bak, ~, .rpm, .md, .txt, .rst, .orig, .ini, .cfg, .retry
+;ignore_extensions=.pyc, .pyo, .swp, .bak, ~, .rpm, .md, .txt, .rst, .orig, .ini .cfg, .retry
 
 # (list) List of patterns to ignore when using a directory as an inventory source
 ;ignore_patterns=

files/workstations/go.txt

@@ -1,6 +1,7 @@
 github.com/projectdiscovery/nuclei/v3/cmd/nuclei@latest
-git.aetherial.dev/aeth/kyoketsu/cmd/kyoketsu
-git.aetherial.dev/aeth/kyoketsu/cmd/kyoketsu-web
 github.com/projectdiscovery/katana/cmd/katana@latest
 github.com/OJ/gobuster/v3@latest
 github.com/ffuf/ffuf/v2@latest
+git.aetherial.dev/aeth/kyoketsu/cmd/kyoketsu@develop
+git.aetherial.dev/aeth/kyoketsu/cmd/kyoketsu-web@develop
+>>>>>>> d040f780e55b8b900b65778e713f3943282c87eb

files/workstations/packages.txt

@@ -1,4 +1,5 @@
 sway
+swaybg
 dhcp
 alacritty
 go
@@ -14,8 +15,6 @@ kaddressbook
 korganizer
 thunderbird
 vlc
-yay
-vscodium
 alsa-utils
 pipewire
 pipewire-audio
@@ -24,6 +23,13 @@ wireplumber
 alsa-firmware
 htop
 nmap
+<<<<<<< HEAD
 zaproxy
 jwt-cli
 wireshark-qt
+=======
+bind
+git
+bind
+git
+>>>>>>> d040f780e55b8b900b65778e713f3943282c87eb

playbook_configure_desktop.yml

@@ -5,15 +5,18 @@
     - name: "00: Gather facts"
       ansible.builtin.gather_facts:
 
+  tasks:
+    - name: "10: INSTALL PACKAGES"
+      ansible.builtin.include_tasks: "tasks/tasks_install_packages.yml"
+
     - name: "00: PRE-TASK clone dotfiles"
       ansible.builtin.include_tasks: "tasks/tasks_clone_dotfiles.yml"
-
-  tasks:
+    
     - name: "00: Install vim plug manager"
       ansible.builtin.include_tasks: "tasks/tasks_install_vimplug.yml"
-    
-    - name: "10: INSTALL PACKAGES"
-      ansible.builtin.include_tasks: "tasks/tasks_install_packages.yml"
+
+    - name: "40: Install go binaries"
+      ansible.builtin.include_tasks: "tasks/tasks_go_packages.yml"
 
     - name: "20: SYSTEM CONFIGURATION NONSENSE"
-      ansible.builtin.include_tasks: "tasks/tasks_system_configuration_nonsense.yml"
+      ansible.builtin.include_tasks: "tasks/tasks_machine_configuration.yml"

tasks/tasks_clone_dotfiles.yml

@@ -0,0 +1,54 @@
+---
+- name: "00: Clone the dotfiles"
+  ansible.builtin.git:
+    repo: "{{ dotfile_repo }}"
+    dest: "/home/{{ system_user }}/.config/dotfiles"
+
+- name: "05: Set fact for dotfile home"
+  ansible.builtin.set_fact:
+    dotfiles: "/home/{{ system_user }}/.config/dotfiles"
+
+- name: "10: Move them to their appropriate locations"
+  ansible.builtin.copy:
+    src: "{{ dotfiles }}/zshrc"
+    dest: "/home/{{ system_user }}/.zshrc"
+    remote_src: "yes"
+    backup: True
+
+- name: "20: Move alacritty config"
+  ansible.builtin.copy:
+    src: "{{ dotfiles }}/alacritty.yml"
+    remote_src: "yes"
+    dest: "/home/{{ system_user }}/.config/alacritty/"
+    backup: True
+
+- name: "30: Move sway config"
+  ansible.builtin.copy:
+    src: "{{ dotfiles }}/sway/config"
+    remote_src: "yes"
+    dest: "/home/{{ system_user }}/.config/sway/"
+    backup: True
+
+- name: "40: move vimrc"
+  ansible.builtin.copy:
+    src: "{{ dotfiles }}/vimrc"
+    remote_src: "yes"
+    dest: "/home/{{ system_user }}/.vimrc"
+    backup: True
+
+- name: "50: move wallpaper"
+  ansible.builtin.copy:
+    remote_src: "yes"
+    src: "{{ dotfiles }}/_dark_disco.jpeg"
+    dest: "/home/{{ system_user }}/Pictures/wallpapers/"
+
+- name: "60: Move environment file into etc"
+  become: True
+  ansible.builtin.copy:
+    remote_src: "yes"
+    src: "{{ dotfiles }}/environment"
+    dest: "/etc/environment"
+    backup: True
+
+
+

tasks/tasks_machine_configuration/workstation/configuration.yml

@@ -1,3 +0,0 @@
----
-- name: "00: Move dotfiles to appropriate locations"
-  

tasks/tasks_machine_configuration/workstations/configuration.yml

@@ -0,0 +1,5 @@
+---
+- name: "00: Set default shell to ZSH"
+  become: True
+  ansible.builtin.command: "chsh -s /usr/bin/zsh aeth"
+