local, add more names, do not hug block items with the block wrapper.

local.yml

@@ -14,8 +14,10 @@
     - name: Main | Lock
       block:
 
-        - ansible.builtin.include_tasks: tasks/general/tests/lock_check.yml
-        - ansible.builtin.include_tasks: tasks/general/tests/lock_create.yml
+        - name: Main | Lock | Check
+          ansible.builtin.include_tasks: tasks/general/tests/lock_check.yml
+        - name: Main | Lock | Create
+          ansible.builtin.include_tasks: tasks/general/tests/lock_create.yml
 
 
     ####### Gather #######
@@ -23,22 +25,30 @@
     - name: Main | Gather
       block:
 
-        - ansible.builtin.include_tasks: facts/general/gather.yml
-        - ansible.builtin.include_tasks: tasks/general/acct_mgmt/provision_config.yml
+        - name: Main | Gather | Facts
+          ansible.builtin.include_tasks: facts/general/gather.yml
+        - name: Main | Gather | Account Management
+          ansible.builtin.include_tasks: tasks/general/acct_mgmt/provision_config.yml
 
-        - ansible.builtin.include_tasks: facts/general/system.yml
-        - ansible.builtin.include_tasks: facts/general/package.yml
-        - ansible.builtin.include_tasks: facts/general/service.yml
-        - ansible.builtin.include_tasks: facts/general/user.yml
+        - name: Main | Gather | System
+          ansible.builtin.include_tasks: facts/general/system.yml
+        - name: Main | Gather | Package
+          ansible.builtin.include_tasks: facts/general/package.yml
+        - name: Main | Gather | Service
+          ansible.builtin.include_tasks: facts/general/service.yml
+        - name: Main | Gather | User
+          ansible.builtin.include_tasks: facts/general/user.yml
 
-        - ansible.builtin.include_tasks: tasks/general/tests/internet_check.yml
+        - name: Main | Gather | Internet Check
+          ansible.builtin.include_tasks: tasks/general/tests/internet_check.yml
 
 
     ####### Start #######
     - name: Main | Start
       block:
 
-        - ansible.builtin.include_tasks: tasks/general/acct_mgmt/notify.yml
+        - name: Main | Start | Notify
+          ansible.builtin.include_tasks: tasks/general/acct_mgmt/notify.yml
           vars:
             notify_message: "Provisioning Started"
 
@@ -49,11 +59,13 @@
     - name: Main | NixOS Setup
       block:
 
-        - ansible.builtin.include_tasks: tasks/general/software/nixos.yml
+        - name: Main | NixOS Setup | NixOS
+          ansible.builtin.include_tasks: tasks/general/software/nixos.yml
 
         # TBD if we are going to use this many, then just have IF statements
         #  and use blocks within the General area for NixOS vs not-NixOS.
-        - ansible.builtin.include_tasks: tasks/general/software/swap.yml
+        - name: Main | NixOS Setup | Swap
+          ansible.builtin.include_tasks: tasks/general/software/swap.yml
 
         - ansible.builtin.include_tasks: tasks/general/acct_mgmt/groups.yml
         - ansible.builtin.include_tasks: tasks/general/acct_mgmt/users.yml
@@ -166,10 +178,12 @@
 
         - name: Main | Workstation | Fancy Desktop Environments
           block:
+
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/gnome.yml
               when: ansible_service_mgr == "systemd"
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/cinnamon.yml
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/lxqt.yml
+
           when: ansible_system == "Linux"
             and internet
             # TBD: Implement this: and extra_desktops
@@ -178,6 +192,7 @@
 
         - name: Main | Workstation Setup | Linux
           block:
+
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/packages.yml
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/tlp.yml
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/lutris.yml
@@ -187,6 +202,7 @@
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/hugo.yml
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/brave.yml
               when: ansible_pkg_mgr in ("apt", "dnf", "zypper") and not mobile
+
           when: ansible_system == "Linux"
             and internet
 
@@ -201,12 +217,14 @@
         ## Configuration Tasks ##
         - name: Main | Workstation Setup | Configuration
           block:
+
             - ansible.builtin.include_tasks: tasks/workstation/shared/settings/gnome.yml
             - ansible.builtin.include_tasks: tasks/workstation/shared/settings/cinnamon.yml
             - ansible.builtin.include_tasks: tasks/workstation/shared/settings/xdg_autostart.yml
 
             - ansible.builtin.include_tasks: tasks/workstation/linux/cron/ansible.yml
               when: ansible_system == "Linux"
+
           when: not mobile
 
         - ansible.builtin.include_tasks: tasks/workstation/shared/settings/nfs.yml
@@ -223,12 +241,14 @@
         ## Final Tasks (SLOW) ##
         - name: Main | Workstation Setup | Linux [Slow]
           block:
+
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/flatpaks.yml
               when: flatpak_distro
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/java.yml
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/flutter.yml
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/android.yml
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/llm.yml
+
           when: ansible_system == "Linux"
             and internet
 
@@ -281,15 +301,21 @@
     - name: Main | Server Setup
       block:
 
-        - ansible.builtin.include_tasks: tasks/server/software/services.yml
+        - name: Main | Server Setup | Services
+          ansible.builtin.include_tasks: tasks/server/software/services.yml
 
         - block:
-            - ansible.builtin.include_tasks: tasks/server/software/certbot.yml
-            - ansible.builtin.include_tasks: tasks/server/cron/certbot.yml
-          when: certbot
+
+            - name: Main | Server Setup | Certbot
+              ansible.builtin.include_tasks: tasks/server/software/certbot.yml
+            - name: Main | Server Setup | Certbot Cron
+              ansible.builtin.include_tasks: tasks/server/cron/certbot.yml
+              when: certbot
 
         - block:
-            - ansible.builtin.include_tasks: tasks/server/software/onlyoffice.yml
+
+            - name: Main | Server Setup | OnlyOffice
+              ansible.builtin.include_tasks: tasks/server/software/onlyoffice.yml
               when: onlyoffice
             - ansible.builtin.include_tasks: tasks/server/software/influxdb1.yml
               when: influxdb1
@@ -297,6 +323,7 @@
               when: influxdb2
             - ansible.builtin.include_tasks: tasks/server/software/grafana.yml
               when: grafana
+
           when: ansible_pkg_mgr == "apt"
 
         - ansible.builtin.include_tasks: tasks/server/software/hugo.yml
@@ -322,7 +349,8 @@
     - name: Main | Finish
       block:
 
-        - ansible.builtin.include_tasks: tasks/general/acct_mgmt/notify.yml
+        - name: Main | Finish | Notify
+          ansible.builtin.include_tasks: tasks/general/acct_mgmt/notify.yml
           vars:
             notify_message: "Provisioning Finished"
 

tasks/workstation/linux/software/llm.yml

@@ -434,6 +434,14 @@
               defaultCompletionOptions:
                 contextLength: {{ llm_context }}
                 maxTokens: {{ llm_context }}
+            - name: {{ llm.provider }}-auto
+              provider: ollama
+              model: {{ llm.model }}
+              defaultCompletionOptions:
+                contextLength: {{ llm_context }}
+                maxTokens: {{ llm_context }}
+              roles:
+                - autocomplete
             {% endfor %}
         mode: "0644"
 

tasks/workstation/linux/software/nodejs.yml

@@ -7,41 +7,41 @@
 - name: Workstation | Software | NodeJS
   block:
 
-  - name: Workstation | Software | NodeJS | apt
-    block:
+    - name: Workstation | Software | NodeJS | apt
+      block:
 
-    - name: Workstation | Software | NodeJS | apt | Facts
-      ansible.builtin.set_fact:
-        node_version: node_24.x
+        - name: Workstation | Software | NodeJS | apt | Facts
+          ansible.builtin.set_fact:
+            node_version: node_24.x
 
-    - name: Workstation | Software | NodeJS | apt | Old | Remove
+        - name: Workstation | Software | NodeJS | apt | Old | Remove
+          ansible.builtin.package:
+            name: npm
+            state: absent
+
+        - name: Workstation | Software | NodeJS | apt | extrepo | Install
+          ansible.builtin.package:
+            name: extrepo
+            state: present
+
+        - name: Workstation | Software | NodeJS | apt | extrepo | Enable
+          ansible.builtin.shell: "extrepo enable {{ node_version }}"
+          register: shell_check
+          changed_when: shell_check.rc == 0
+
+        - name: Workstation | Software | NodeJS | apt | Install
+          ansible.builtin.package:
+            name: nodejs
+            state: present
+
+      when: ansible_pkg_mgr == "apt"
+
+    - name: Workstation | Software | NodeJS | All Others | Install
       ansible.builtin.package:
-        name: npm
-        state: absent
-
-    - name: Workstation | Software | NodeJS | apt | extrepo | Install
-      ansible.builtin.package:
-        name: extrepo
+        name:
+          - nodejs
+          - npm
         state: present
-        update_cache: true
-
-    - name: Workstation | Software | NodeJS | apt | extrepo | Enable
-      ansible.builtin.shell: "extrepo enable {{ node_version }}"
-
-    - name: Workstation | Software | NodeJS | apt | Install
-      ansible.builtin.package:
-        name: nodejs
-        state: latest
-        update_cache: true
-
-    when: ansible_pkg_mgr == "apt"
-
-  - name: Workstation | Software | NodeJS | All Others | Install
-    ansible.builtin.package:
-      name:
-        - nodejs
-        - npm
-      state: present
-    when: ansible_pkg_mgr != "apt"
+      when: ansible_pkg_mgr != "apt"
 
   when: coding

tasks/workstation/linux/software/vpn.yml

@@ -4,35 +4,35 @@
 - name: Workstation | Software | VPN | Mullvad
   block:
 
-  # https://mullvad.net/en/help/install-mullvad-app-linux
+    # https://mullvad.net/en/help/install-mullvad-app-linux
 
-  - name: Workstation | Software | VPN | Mullvad | Add Repo [apt]
-    ansible.builtin.shell: "{{ item }}"
-    loop:
-      - sudo curl -fsSLo /usr/share/keyrings/mullvad-keyring.asc https://repository.mullvad.net/deb/mullvad-keyring.asc
-      - echo "deb [signed-by=/usr/share/keyrings/mullvad-keyring.asc arch=$( dpkg --print-architecture )] https://repository.mullvad.net/deb/stable $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/mullvad.list
-      - apt update
-    when: ansible_pkg_mgr == "apt"
+    - name: Workstation | Software | VPN | Mullvad | Add Repo [apt]
+      ansible.builtin.shell: "{{ item }}"
+      loop:
+        - sudo curl -fsSLo /usr/share/keyrings/mullvad-keyring.asc https://repository.mullvad.net/deb/mullvad-keyring.asc
+        - echo "deb [signed-by=/usr/share/keyrings/mullvad-keyring.asc arch=$( dpkg --print-architecture )] https://repository.mullvad.net/deb/stable $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/mullvad.list
+        - apt update
+      when: ansible_pkg_mgr == "apt"
 
-  - name: Workstation | Software | VPN | Mullvad | Add Repo [dnf]
-    ansible.builtin.shell: "{{ item }}"
-    loop:
-      - sudo dnf config-manager --add-repo https://repository.mullvad.net/rpm/stable/mullvad.repo
-    when: ansible_pkg_mgr == "dnf"
+    - name: Workstation | Software | VPN | Mullvad | Add Repo [dnf]
+      ansible.builtin.shell: "{{ item }}"
+      loop:
+        - sudo dnf config-manager --add-repo https://repository.mullvad.net/rpm/stable/mullvad.repo
+      when: ansible_pkg_mgr == "dnf"
 
-  - name: Workstation | Software | VPN | Install
-    ansible.builtin.package:
-      name:
-        - mullvad-vpn
-      state: present
+    - name: Workstation | Software | VPN | Install
+      ansible.builtin.package:
+        name:
+          - mullvad-vpn
+        state: present
 
-  - name: Workstation | Software | VPN | Install (Artix, runit)
-    ansible.builtin.package:
-      name:
-        - mullvad-vpn-runit
-      state: present
-    when: ansible_pkg_mgr == "pacman"
-      and ansible_service_mgr == "runit"
+    - name: Workstation | Software | VPN | Install (Artix, runit)
+      ansible.builtin.package:
+        name:
+          - mullvad-vpn-runit
+        state: present
+      when: ansible_pkg_mgr == "pacman"
+        and ansible_service_mgr == "runit"
 
   when: ansible_distribution in ("Debian", "Ubuntu")
      or ansible_pkg_mgr in ("pacman", "dnf")
@@ -42,31 +42,31 @@
 - name: Workstation | Software | VPN | Mullvad | Devuan (runit)
   block:
 
-  - name: Workstation | Software | VPN | Mullvad | Devuan | Facts 01
-    ansible.builtin.set_fact:
-      devuan_mullvad_dir: "{{ global_src }}/mullvad-installer"
-      mullvad_deb_url: https://mullvad.net/en/download/app/deb/latest
-      mullvad_repack_url: https://github.com/sys-fs/mullvad-repack
+    - name: Workstation | Software | VPN | Mullvad | Devuan | Facts 01
+      ansible.builtin.set_fact:
+        devuan_mullvad_dir: "{{ global_src }}/mullvad-installer"
+        mullvad_deb_url: https://mullvad.net/en/download/app/deb/latest
+        mullvad_repack_url: https://github.com/sys-fs/mullvad-repack
 
-  - name: Workstation | Software | VPN | Mullvad | Devuan | Facts 02
-    ansible.builtin.set_fact:
-      mullvad_repack_dir: "{{ devuan_mullvad_dir }}/mullvad_repack"
+    - name: Workstation | Software | VPN | Mullvad | Devuan | Facts 02
+      ansible.builtin.set_fact:
+        mullvad_repack_dir: "{{ devuan_mullvad_dir }}/mullvad_repack"
 
-  - name: Workstation | Software | VPN | Mullvad | Devuan | Check
-    ansible.builtin.stat:
-      path: '/opt/Mullvad VPN'
-    register: mullvad_installed
+    - name: Workstation | Software | VPN | Mullvad | Devuan | Check
+      ansible.builtin.stat:
+        path: '/opt/Mullvad VPN'
+      register: mullvad_installed
 
-  - name: Workstation | Software | VPN | Mullvad | Devuan | Install
-    ansible.builtin.shell: "{{ item }}"
-    loop:
-      - "mkdir -pv {{ devuan_mullvad_dir }}"
-      - "curl -L -o {{ devuan_mullvad_dir }}/Mullvad.deb {{ mullvad_deb_url }}"
-      - "rm -rfv {{ mullvad_repack_dir }}"
-      - "git clone {{ mullvad_repack_url }} {{ mullvad_repack_dir }}"
-      - "cd {{ mullvad_repack_dir }} && ./repack.sh ../Mullvad.deb"
-      - "apt-get install -y --reinstall {{ devuan_mullvad_dir }}/Mullvad_repack.deb"
-    when: not mullvad_installed.stat.exists
+    - name: Workstation | Software | VPN | Mullvad | Devuan | Install
+      ansible.builtin.shell: "{{ item }}"
+      loop:
+        - "mkdir -pv {{ devuan_mullvad_dir }}"
+        - "curl -L -o {{ devuan_mullvad_dir }}/Mullvad.deb {{ mullvad_deb_url }}"
+        - "rm -rfv {{ mullvad_repack_dir }}"
+        - "git clone {{ mullvad_repack_url }} {{ mullvad_repack_dir }}"
+        - "cd {{ mullvad_repack_dir }} && ./repack.sh ../Mullvad.deb"
+        - "apt-get install -y --reinstall {{ devuan_mullvad_dir }}/Mullvad_repack.deb"
+      when: not mullvad_installed.stat.exists
 
   when: ansible_pkg_mgr == "apt"
     and ansible_service_mgr != "systemd"
@@ -119,4 +119,5 @@
     - mullvad auto-connect set on
     - mullvad lockdown-mode set on
     - mullvad beta-program set off
+  become: true
   become_user: "{{ user }}"