diff --git a/playbooks/software/zsh/deploy_zsh.yml b/playbooks/software/zsh/deploy_zsh.yml index 8b50918..9e16458 100644 --- a/playbooks/software/zsh/deploy_zsh.yml +++ b/playbooks/software/zsh/deploy_zsh.yml @@ -8,6 +8,19 @@ - "root" - "hogweed1" + # Вставь сюда сгенерированный токен из Gitea + gitea_token: "0e2d23940d1862ae1558476f39565cd5bb2bcd88" + + # Базовый адрес твоей организации/юзера в Gitea (БЕЗ http://) + gitea_base: "git.guaranteedstruggle.host/hackerspace" + + # Формируем ссылки с токеном. В таком формате Git пролетает авторизацию без вопросов + repo_omz: "https://{{ gitea_token }}@{{ gitea_base }}/ohmyzsh_mirror.git" + repo_p10k: "https://{{ gitea_token }}@{{ gitea_base }}/powerlevel10k_mirror.git" + repo_syntax: "https://{{ gitea_token }}@{{ gitea_base }}/zsh-syntax-highlighting_mirror.git" + repo_suggest: "https://{{ gitea_token }}@{{ gitea_base }}/zsh-autosuggestions_mirror.git" + + tasks: - name: Установка системных пакетов (zsh и git) apt: diff --git a/playbooks/software/zsh/user_tasks.yml b/playbooks/software/zsh/user_tasks.yml index bfdbdc7..a07a176 100644 --- a/playbooks/software/zsh/user_tasks.yml +++ b/playbooks/software/zsh/user_tasks.yml @@ -17,6 +17,10 @@ shell: /bin/zsh tags: [deploy] + +# 0e2d23940d1862ae1558476f39565cd5bb2bcd88 +# ansible-stuff token gitea + # ========================================== # БЛОК 1: ПЕРВИЧНАЯ РАСКАТКА (БЫСТРЫЙ CLONE) # ========================================== @@ -25,7 +29,8 @@ - name: "[{{ current_user }}] Клонируем Oh My Zsh" git: #repo: 'https://github.com/ohmyzsh/ohmyzsh.git' - repo: 'https://git.guaranteedstruggle.host/hackerspace/ohmyzsh_mirror.git' + #repo: 'https://git.guaranteedstruggle.host/hackerspace/ohmyzsh_mirror.git' + repo: "{{ repo_omz }}" dest: "{{ user_home }}/.oh-my-zsh" depth: 1 update: no @@ -35,7 +40,8 @@ - name: "[{{ current_user }}] Клонируем плагин zsh-syntax-highlighting" git: #repo: 'https://github.com/zsh-users/zsh-syntax-highlighting.git' - repo: 'https://git.guaranteedstruggle.host/hackerspace/zsh-syntax-highlighting_mirror.git' + #repo: 'https://git.guaranteedstruggle.host/hackerspace/zsh-syntax-highlighting_mirror.git' + repo: "{{ repo_syntax }}" dest: "{{ user_home }}/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting" depth: 1 update: no @@ -45,7 +51,8 @@ - name: "[{{ current_user }}] Клонируем плагин zsh-autosuggestions" git: #repo: 'https://github.com/zsh-users/zsh-autosuggestions.git' - repo: 'https://git.guaranteedstruggle.host/hackerspace/zsh-autosuggestions_mirror.git' + #repo: 'https://git.guaranteedstruggle.host/hackerspace/zsh-autosuggestions_mirror.git' + repo: "{{ repo_suggest }}" dest: "{{ user_home }}/.oh-my-zsh/custom/plugins/zsh-autosuggestions" depth: 1 update: no @@ -55,7 +62,8 @@ - name: "[{{ current_user }}] Клонируем тему Powerlevel10k" git: #repo: 'https://github.com/romkatv/powerlevel10k.git' - repo: 'https://git.guaranteedstruggle.host/hackerspace/powerlevel10k_mirror.git' + #repo: 'https://git.guaranteedstruggle.host/hackerspace/powerlevel10k_mirror.git' + repo: "{{ repo_p10k }}" dest: "{{ user_home }}/.oh-my-zsh/custom/themes/powerlevel10k" depth: 1 update: no @@ -71,7 +79,8 @@ - name: "[{{ current_user }}] Обновляем Oh My Zsh до latest" git: #repo: 'https://github.com/ohmyzsh/ohmyzsh.git' - repo: 'https://git.guaranteedstruggle.host/hackerspace/ohmyzsh_mirror.git' + #repo: 'https://git.guaranteedstruggle.host/hackerspace/ohmyzsh_mirror.git' + repo: "{{ repo_omz }}" dest: "{{ user_home }}/.oh-my-zsh" update: yes #become_user: "{{ current_user }}" @@ -80,7 +89,8 @@ - name: "[{{ current_user }}] Обновляем плагин zsh-syntax-highlighting до latest" git: #repo: 'https://github.com/zsh-users/zsh-syntax-highlighting.git' - repo: 'https://git.guaranteedstruggle.host/hackerspace/zsh-syntax-highlighting_mirror.git' + #repo: 'https://git.guaranteedstruggle.host/hackerspace/zsh-syntax-highlighting_mirror.git' + repo: "{{ repo_syntax }}" dest: "{{ user_home }}/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting" update: yes #become_user: "{{ current_user }}" @@ -89,7 +99,8 @@ - name: "[{{ current_user }}] Обновляем плагин zsh-autosuggestions до latest" git: #repo: 'https://github.com/zsh-users/zsh-autosuggestions.git' - repo: 'https://git.guaranteedstruggle.host/hackerspace/zsh-autosuggestions_mirror.git' + #repo: 'https://git.guaranteedstruggle.host/hackerspace/zsh-autosuggestions_mirror.git' + repo: "{{ repo_suggest }}" dest: "{{ user_home }}/.oh-my-zsh/custom/plugins/zsh-autosuggestions" update: yes #become_user: "{{ current_user }}" @@ -98,7 +109,8 @@ - name: "[{{ current_user }}] Обновляем тему Powerlevel10k до latest" git: #repo: 'https://github.com/romkatv/powerlevel10k.git' - repo: 'https://git.guaranteedstruggle.host/hackerspace/powerlevel10k_mirror.git' + #repo: 'https://git.guaranteedstruggle.host/hackerspace/powerlevel10k_mirror.git' + repo: "{{ repo_p10k }}" dest: "{{ user_home }}/.oh-my-zsh/custom/themes/powerlevel10k" update: yes become_user: "{{ current_user }}"