diff --git a/playbooks/software/zsh/user_tasks.yml b/playbooks/software/zsh/user_tasks.yml index d7b6da2..a73fef4 100644 --- a/playbooks/software/zsh/user_tasks.yml +++ b/playbooks/software/zsh/user_tasks.yml @@ -22,39 +22,39 @@ # ========================================== - name: "Первичный деплой репозиториев" block: - - name: "[{{ current_user }}] Клонируем Oh My Zsh" - git: - repo: 'https://github.com/ohmyzsh/ohmyzsh.git' - dest: "{{ user_home }}/.oh-my-zsh" - depth: 1 - update: no - #become_user: "{{ current_user }}" - #tags: [deploy] + - name: "[{{ current_user }}] Клонируем Oh My Zsh" + git: + repo: 'https://github.com/ohmyzsh/ohmyzsh.git' + dest: "{{ user_home }}/.oh-my-zsh" + depth: 1 + update: no + #become_user: "{{ current_user }}" + #tags: [deploy] - - name: "[{{ current_user }}] Клонируем плагин zsh-syntax-highlighting" - git: - repo: 'https://github.com/zsh-users/zsh-syntax-highlighting.git' - dest: "{{ user_home }}/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting" - depth: 1 - update: no - #become_user: "{{ current_user }}" - #tags: [deploy] + - name: "[{{ current_user }}] Клонируем плагин zsh-syntax-highlighting" + git: + repo: 'https://github.com/zsh-users/zsh-syntax-highlighting.git' + dest: "{{ user_home }}/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting" + depth: 1 + update: no + #become_user: "{{ current_user }}" + #tags: [deploy] - - name: "[{{ current_user }}] Клонируем плагин zsh-autosuggestions" - git: - repo: 'https://github.com/zsh-users/zsh-autosuggestions.git' - dest: "{{ user_home }}/.oh-my-zsh/custom/plugins/zsh-autosuggestions" - depth: 1 - update: no - #become_user: "{{ current_user }}" - #tags: [deploy] + - name: "[{{ current_user }}] Клонируем плагин zsh-autosuggestions" + git: + repo: 'https://github.com/zsh-users/zsh-autosuggestions.git' + dest: "{{ user_home }}/.oh-my-zsh/custom/plugins/zsh-autosuggestions" + depth: 1 + update: no + #become_user: "{{ current_user }}" + #tags: [deploy] - - name: "[{{ current_user }}] Клонируем тему Powerlevel10k" - git: - repo: 'https://github.com/romkatv/powerlevel10k.git' - dest: "{{ user_home }}/.oh-my-zsh/custom/themes/powerlevel10k" - depth: 1 - update: no + - name: "[{{ current_user }}] Клонируем тему Powerlevel10k" + git: + repo: 'https://github.com/romkatv/powerlevel10k.git' + dest: "{{ user_home }}/.oh-my-zsh/custom/themes/powerlevel10k" + depth: 1 + update: no become_user: "{{ current_user }}" tags: [deploy] @@ -62,63 +62,66 @@ # БЛОК 2: ОБНОВЛЕНИЕ ДО ПОСЛЕДНИХ ВЕРСИЙ (GIT PULL) # ========================================== -- name: "[{{ current_user }}] Обновляем Oh My Zsh до latest" - git: - repo: 'https://github.com/ohmyzsh/ohmyzsh.git' - dest: "{{ user_home }}/.oh-my-zsh" - update: yes - become_user: "{{ current_user }}" - tags: [update] +- name: "Обновление репозиториев" + block: + - name: "[{{ current_user }}] Обновляем Oh My Zsh до latest" + git: + repo: 'https://github.com/ohmyzsh/ohmyzsh.git' + dest: "{{ user_home }}/.oh-my-zsh" + update: yes + #become_user: "{{ current_user }}" + #tags: [update] -- name: "[{{ current_user }}] Обновляем плагин zsh-syntax-highlighting до latest" - git: - repo: 'https://github.com/zsh-users/zsh-syntax-highlighting.git' - dest: "{{ user_home }}/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting" - update: yes - become_user: "{{ current_user }}" - tags: [update] + - name: "[{{ current_user }}] Обновляем плагин zsh-syntax-highlighting до latest" + git: + repo: 'https://github.com/zsh-users/zsh-syntax-highlighting.git' + dest: "{{ user_home }}/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting" + update: yes + #become_user: "{{ current_user }}" + #tags: [update] -- name: "[{{ current_user }}] Обновляем плагин zsh-autosuggestions до latest" - git: - repo: 'https://github.com/zsh-users/zsh-autosuggestions.git' - dest: "{{ user_home }}/.oh-my-zsh/custom/plugins/zsh-autosuggestions" - update: yes - become_user: "{{ current_user }}" - tags: [update] + - name: "[{{ current_user }}] Обновляем плагин zsh-autosuggestions до latest" + git: + repo: 'https://github.com/zsh-users/zsh-autosuggestions.git' + dest: "{{ user_home }}/.oh-my-zsh/custom/plugins/zsh-autosuggestions" + update: yes + #become_user: "{{ current_user }}" + #tags: [update] -- name: "[{{ current_user }}] Обновляем тему Powerlevel10k до latest" - git: - repo: 'https://github.com/romkatv/powerlevel10k.git' - dest: "{{ user_home }}/.oh-my-zsh/custom/themes/powerlevel10k" - update: yes + - name: "[{{ current_user }}] Обновляем тему Powerlevel10k до latest" + git: + repo: 'https://github.com/romkatv/powerlevel10k.git' + dest: "{{ user_home }}/.oh-my-zsh/custom/themes/powerlevel10k" + update: yes become_user: "{{ current_user }}" tags: [update] # ========================================== # БЛОК 3: НАСТРОЙКА КОНФИГУРАЦИОННЫХ ФАЙЛОВ # ========================================== +- name: "Финализация конфигурации" + block: + - name: "[{{ current_user }}] Копируем эталонный конфиг .p10k.zsh" + copy: + src: ../../../files/.p10k.zsh + dest: "{{ user_home }}/.p10k.zsh" + owner: "{{ current_user }}" + group: "{{ current_user }}" + mode: '0644' + #tags: [deploy, update] # Обновляем конфиг p10k в обоих сценариях, если ты решишь его изменить локально -- name: "[{{ current_user }}] Копируем эталонный конфиг .p10k.zsh" - copy: - src: ../../../files/.p10k.zsh - dest: "{{ user_home }}/.p10k.zsh" - owner: "{{ current_user }}" - group: "{{ current_user }}" - mode: '0644' - tags: [deploy, update] # Обновляем конфиг p10k в обоих сценариях, если ты решишь его изменить локально + - name: "[{{ current_user }}] Генерируем итоговый .zshrc из шаблона" + template: + src: ../../../templates/.zshrc.j2 + dest: "{{ user_home }}/.zshrc" + owner: "{{ current_user }}" + group: "{{ current_user }}" + mode: '0644' + #tags: [deploy, update] -- name: "[{{ current_user }}] Генерируем итоговый .zshrc из шаблона" - template: - src: ../../../templates/.zshrc.j2 - dest: "{{ user_home }}/.zshrc" - owner: "{{ current_user }}" - group: "{{ current_user }}" - mode: '0644' - tags: [deploy, update] - -- name: "[{{ current_user }}] Предзагрузка бинарника gitstatusd (убирает тормоза при первом входе)" - command: "{{ user_home }}/.oh-my-zsh/custom/themes/powerlevel10k/gitstatus/install" - args: - creates: "{{ user_home }}/.cache/gitstatus/gitstatusd-linux-x86_64" # таска пропустится, если бинарник уже на месте + - name: "[{{ current_user }}] Предзагрузка бинарника gitstatusd (убирает тормоза при первом входе)" + command: "{{ user_home }}/.oh-my-zsh/custom/themes/powerlevel10k/gitstatus/install" + args: + creates: "{{ user_home }}/.cache/gitstatus/gitstatusd-linux-x86_64" # таска пропустится, если бинарник уже на месте become_user: "{{ current_user }}" tags: [deploy, update] \ No newline at end of file