Update documentation, small fixes to variable namespacing

9 files changed, 55 insertions, 70 deletions

diff --git a/CONFIGURATION.md b/CONFIGURATION.md
index d7483bc..cffe8c7 100644
--- a/CONFIGURATION.md
+++ b/CONFIGURATION.md
@@ -14,9 +14,8 @@ This method is as intended, by using the provided flags.
 | -------- | ------- |
 | username | This is used to choose what home directory will the configuration files be installed to |
 | packages | The list of packages that should be installed. Note these are package groups | 
-| system | The system group. It can be used to configure stuff like wireguard, systemd etc. |
-| opt | Currently unimplemented, but will be used for optional installations | 
-| config | The "dotfiles" group. It installs the configuration files for various tool |
+| system | The system group. It can be used to configure stuff like systemd services etc. |
+| config | The config group. It installs the configuration files for various tools like neovim, tmux etc. |
 
 ##### Usage
 
@@ -25,12 +24,9 @@ This method is as intended, by using the provided flags.
 The following package groups are available:
 
 ```
-- gaming #Gaming tools like wine, corectrl etc.
-- development #Development tools like neovim, clang, etc.
-- tools # Various configuration utilites like btop, nmtui etc. 
-- libraries # Some libraries I use
-- xorg # Xorg specific packages like polybar
-- wayland # Wayland specific packages like waybar
+- gaming # Wine, corectrl, emulators...
+- development # Compilers, libraries...
+- tools # htop, ffmpeg, firefox...
 
 ```
 Each of these groups has `dnf` and `flatpak` packages under it, which will be installed.
@@ -38,19 +34,13 @@ Each of these groups has `dnf` and `flatpak` packages under it, which will be in
 ###### `system`
 
 The following variables are present for system:
-`wireguard`: This in itself doesn't do anything but has variable(s) under it.
-`wg_path`: This is the location of the configuration file you want to include in the notebook. 
-`install_wireguard`: Should wireguard be setup or not.
-`install_systemd`: Should systemd services be setup or not.
+`systemd`: List of systemd services to setup
 
 
 ###### `config`
 
 The following variables are present for config:
 
-`install_shell`: Should shell be setup or not. This includes zsh, zsh plugins and (neo)vim.
-`install_wayland`: Should wayland configs be setup or not. This includes configs for stuff like waybar, hyprland etc.
-`install_xorg`: Should xorg configs be setup or not. This includes configs for stuff like polybar, bspwm etc.
-`install_misc`: Should misc configs be setup or not. This is for misc packages like fonts. This has not yet been implemented.
+`mail`: Configuration for neomutt and related tools
 
 
diff --git a/README.md b/README.md
index 896ce8d..f943ff6 100644
--- a/README.md
+++ b/README.md
@@ -3,16 +3,8 @@
 This repository is used to setup my Fedora Workstation. It consists of various Ansible playbooks that automate a
 large chunk of setting up tools, configuartion files and system packages. 
 
-While I use GNOME on my workstation, this playbook allows installation of either BSPWM (XOrg) or Hyprland (Wayland). 
-Those flags can be setup in `config.yaml`.
-
-All configuration should be done through `config.yaml`. The repo does let you install a lot of the packages by
-`groups`
+This repository will setup the tools, packages, and services that I use on my GNOME Workstation. They are controlled by flags that can be setup in `config.yaml`.
 
+All configuration should be done through `config.yaml`.
 
 To understand how to configure the installation, refer to [`CONFIGURATION.md`](./CONFIGURATION.md)
-
-
-This is how the setup looks on Fedora with Hyprland as the TWM. 
-
-![alt fedora](res/fedora-wayland.png "Hyprland on Fedora")
diff --git a/src/config/templates/neomutt/mbsyncrc.j2 b/src/config/templates/neomutt/mbsyncrc.j2
index 7ab403f..901e57b 100644
--- a/src/config/templates/neomutt/mbsyncrc.j2
+++ b/src/config/templates/neomutt/mbsyncrc.j2
@@ -1,6 +1,6 @@
 IMAPAccount mailbox
 Host imap.mailbox.org
-User {{ mail.primary }}
+User {{ config.mail.primary }}
 PassCmd "secret-tool lookup password mailbox"
 Port 993
 TLSType IMAPS
diff --git a/src/config/templates/neomutt/msmtprc.j2 b/src/config/templates/neomutt/msmtprc.j2
index d7f2270..e746566 100644
--- a/src/config/templates/neomutt/msmtprc.j2
+++ b/src/config/templates/neomutt/msmtprc.j2
@@ -1,7 +1,7 @@
 account mailbox
 host smtp.mailbox.org
-from {{ mail.primary }}
-user {{ mail.primary }}
+from {{ config.mail.primary }}
+user {{ config.mail.primary }}
 port 465
 auth on
 tls on
diff --git a/src/config/templates/neomutt/neomuttrc.j2 b/src/config/templates/neomutt/neomuttrc.j2
index e6b1fa1..a6dd88c 100644
--- a/src/config/templates/neomutt/neomuttrc.j2
+++ b/src/config/templates/neomutt/neomuttrc.j2
@@ -1,13 +1,13 @@
-set real_name = "{{ mail.name }}"
+set real_name = "{{ config.mail.name }}"
 
 # Basic settings
 set folder = "~/.local/share/mail/mailbox"
 set attach_save_dir = "~/Downloads/"
 set mbox_type = "Maildir"
-set hostname =  "{{ mail.domain }}"
-set from =  "{{ mail.primary }}"
-{% for item in mail.aliases %}
-alias {{ item.alias }} "{{ mail.name }}" "{{ item.email }}"
+set hostname =  "{{ config.mail.domain }}"
+set from =  "{{ config.mail.primary }}"
+{% for item in config.mail.aliases %}
+alias {{ item.alias }} "{{ config.mail.name }}" "{{ item.email }}"
 {% endfor %}
 
 # Folder settings
@@ -60,12 +60,12 @@ set forward_format = "Fwd: %s"
 set forward_quote
 set reverse_name
 set include
-alternates {% for item in mail.aliases -%}
+alternates {% for item in config.mail.aliases -%}
 "{{ item.email }}"
 {%- endfor %}
 
 # GPG settings
-set pgp_sign_as="{{ mail.gpg }}"
+set pgp_sign_as="{{ config.mail.gpg }}"
 set crypt_auto_sign
 
 
diff --git a/src/packages/defaults/main.yaml b/src/packages/defaults/main.yaml
index b8c3f64..fb7017f 100644
--- a/src/packages/defaults/main.yaml
+++ b/src/packages/defaults/main.yaml
@@ -104,7 +104,7 @@ packages:
       - playerctl
       - vlc
       - yt-dlp
-      - yt-dlp-zsh-completion
+      - yt-dlp-bash-completion
       # Mail
       - abook
       - isync
diff --git a/src/system/tasks/main.yaml b/src/system/tasks/main.yaml
index d1b7d69..eddc3fe 100644
--- a/src/system/tasks/main.yaml
+++ b/src/system/tasks/main.yaml
@@ -4,7 +4,7 @@
       ansible.builtin.copy:
         src: "systemd/user/{{ item }}.service" 
         dest: "/home/{{ username }}/.config/systemd/user/"
-      loop: "{{ systemd }}"
+      loop: "{{ system.systemd }}"
 
     - name: Enable service
       become: yes
@@ -13,9 +13,9 @@
         scope: user
         state: started
         name: "{{ item }}.service"
-      loop: "{{ systemd }}"
+      loop: "{{ system.systemd }}"
   ignore_errors: true
-  when: systemd
+  when: system.systemd
 
 
 - name: Setup DNF conf
diff --git a/src/system/vars/main.yaml b/src/system/vars/main.yaml
index 1f2da1e..5a5f4fb 100644
--- a/src/system/vars/main.yaml
+++ b/src/system/vars/main.yaml
@@ -1,2 +1,3 @@
-systemd:
-  - syncthing
+system:
+  systemd:
+    - syncthing
diff --git a/vault.yaml b/vault.yaml
index afb1324..9d1adda 100644
--- a/vault.yaml
+++ b/vault.yaml
@@ -1,28 +1,30 @@
 $ANSIBLE_VAULT;1.1;AES256
-30373937363761353339313662616561616632316439616332633338343934356239336565633662
-3131663661386636616430393065656235353163323836640a373839343631356261633234336366
-35623233333630613761366263666238373461656534363336613939353564323366393066626563
-3962633165653265320a336631356534656663323531646531656631653365376331623333666235
-36363261353137323666326234313964666366616131653030353031303431663765653734313730
-33666332626161376233663532666435646532653563333330373061383939373562313533633062
-39616236353333376631373738343732383331306131613937313666306566626563383762366632
-35633463616364323063613338323037333262306138333631326463366263636462356131613537
-35356562663963383762373033303961393731643661656464326433633534383662303333353230
-35343263393064643737366430623131376463313030336438346439363531613833646336303337
-32343730353563383734363039386261393235306638313565333435656337626465363637383761
-39613734303132626531383664376664663734616636646137356164333636303861626465363631
-36633761356230623434386132333637626163666130623962396434633262613964396466613037
-37653961303039393933643562383436636161383966663865663932626232343266326437666137
-63356234326530323936383733343934663530666437613632373535343536633566363161343665
-64303062633030656162393065353130353661303332333562346261393933303637346339376432
-66653430613039636535323838313332613866643930643035353839313566306431313232346462
-62643337396139306632623435303465306636313030646433306234303839636235323563393930
-31353732326362626336633634616532356337663530303836326133653264396130643463656633
-35663439346561323133323763393434363035623764306630646135306364643530656531373264
-35333831386230363632323435383861623530616562656632376264623362306465643265633233
-64626661613034373239663833616531336664663837303961303839633431616663326630663834
-33373061346137356636663832393564346635636166363132626137316239653939343032306330
-65353562636463353735376333373463343732613334373765313666643436343464366261396430
-37666234656538343364376136323434316465633136323135616464393831313661653836666335
-63613066326662626538633135343138346263373338653035393834396362316334666634623330
-663765353339656330636264303563303433
+39373966343566363030356135353663653461376364626562363237643861653065613935363937
+6437313233356537613334313030376235326535666233610a633266643334346531313731633865
+39623662636564343630653130393733303036653565613731616531656539363932383436343536
+3662646231633136390a393963353265623736666663633038333430336537666163666330363264
+64353531323635666438386232353636626536653330373136383033343962356339373635376134
+64623964663233643163373538616131306235616265353230613339313861616664613265373031
+63353935323037393266376133626636636361333232383631656431393430613463343564303937
+39626466363038613138393162336537663563356335356362323835376633313362313733303235
+65323236303732393264373535353230326462613161623732303663626434376436626561643339
+33663662336430356164663464646266653664366534663132306461346263656433353934343661
+39333362303832326463643362643266626666666666383562323261363131323965653332643735
+32356465353562626365636537613630313836353439376234633130356466303463303662346563
+31383536393931653239303232366530393935373865306665346135613563313737346237643639
+32313561393434643632363536663031663830353337313264383837356362336466373864316336
+32623738633236396265376164613732633461353464626236376532353662613337363135313262
+36643265363361343738393830626530303434653937663763653635646366316466373834643337
+31396265336634383537633963396334303133666463346537396266626263366635363562386665
+62373766613731333964393466373839316133663836646634313531623933363639653036363463
+34336232343237373333656531363433363233336632393232306132366465666562643330323363
+66643161373663303334326161636466326461613936333933306537656561646234383233623938
+36623565626634393338373066386265626461326130353437643738306137373437336566613766
+62393335383532376361613131326435363931613939373763346130666536363838383765353866
+34343736646239353331336564393263666464333661316232356537306338393262626231616163
+30303534393538323832643664613037356130343139613137643035616634343132356361356566
+64356161313564366265303938633865386432663765623830626430623730383435346132393732
+30663961643034353937356532623337363333373930386534336563353837636566373766623834
+66346462363536613766346463646564616539346166306330633366363562633139363965336638
+65316530383561373133396531666435323035333139636634383735316239366632626236643165
+6331