Update documentation, small fixes to variable namespacing

6 files changed, 17 insertions, 16 deletions

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