From 6eeac615aa55835b62470558f417456146a2553f Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Tue, 11 Oct 2022 21:45:56 -0400 Subject: [PATCH] Move ansible_deploy under .config. --- ansible/roles/per_user/tasks/main.yaml | 2 +- ansible/roles/zsh/files/zshrc | 6 +++--- ansible/roles/zsh/tasks/peruser.yaml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ansible/roles/per_user/tasks/main.yaml b/ansible/roles/per_user/tasks/main.yaml index bb875d6..2ef5d5f 100644 --- a/ansible/roles/per_user/tasks/main.yaml +++ b/ansible/roles/per_user/tasks/main.yaml @@ -24,7 +24,7 @@ owner: "{{ account_name.stdout }}" group: "{{ group_name.stdout }}" loop: - - .ansible_deploy + - .config/ansible_deploy - import_tasks: tasks/peruser_freebsd.yaml when: 'os_flavor == "freebsd"' diff --git a/ansible/roles/zsh/files/zshrc b/ansible/roles/zsh/files/zshrc index 74b5b22..c5d8f55 100644 --- a/ansible/roles/zsh/files/zshrc +++ b/ansible/roles/zsh/files/zshrc @@ -33,10 +33,10 @@ done PR_NO_COLOR="%{$terminfo[sgr0]%}" PS1="[$PR_BLUE%n$PR_WHITE@$PR_GREEN%U%m%u$PR_NO_COLOR:$PR_RED%2c$PR_NO_COLOR]%(!.#.$) " -source $HOME/.ansible_deploy/zsh-histdb/sqlite-history.zsh +source $HOME/.config/ansible_deploy/zsh-histdb/sqlite-history.zsh autoload -Uz add-zsh-hook -source $HOME/.ansible_deploy/zsh-histdb/histdb-interactive.zsh +source $HOME/.config/ansible_deploy/zsh-histdb/histdb-interactive.zsh bindkey '^r' _histdb-isearch # TODO: Consider moving to /etc/profile.d @@ -44,4 +44,4 @@ while read file; do if [ -e "$file" ]; then source "$file" fi -done <<<"$(find $HOME/.ansible_deploy/zshrc -maxdepth 1 -type f -name '*.zsh' -print)" +done <<<"$(find $HOME/.config/ansible_deploy/zshrc -maxdepth 1 -type f -name '*.zsh' -print)" diff --git a/ansible/roles/zsh/tasks/peruser.yaml b/ansible/roles/zsh/tasks/peruser.yaml index c6b7b21..36532df 100644 --- a/ansible/roles/zsh/tasks/peruser.yaml +++ b/ansible/roles/zsh/tasks/peruser.yaml @@ -4,13 +4,13 @@ - name: clone zsh-histdb repo git: repo: "https://github.com/larkery/zsh-histdb.git" - dest: "{{ account_homedir.stdout }}/.ansible_deploy/zsh-histdb" + dest: "{{ account_homedir.stdout }}/.config/ansible_deploy/zsh-histdb" version: "6c7159be9de8586ac2f19d179d562cf5d10a2bab" diff: false - name: Create zshrc additional imports directory file: - name: "{{ account_homedir.stdout }}/.ansible_deploy/zshrc" + name: "{{ account_homedir.stdout }}/.config/ansible_deploy/zshrc" state: directory mode: 0700 owner: "{{ account_name.stdout }}" @@ -19,7 +19,7 @@ - name: Configure zshrc additional imports copy: src: "files/zshrc_{{ item }}" - dest: "{{ account_homedir.stdout }}/.ansible_deploy/zshrc/{{ item }}.zsh" + dest: "{{ account_homedir.stdout }}/.config/ansible_deploy/zshrc/{{ item }}.zsh" mode: 0600 owner: "{{ account_name.stdout }}" group: "{{ group_name.stdout }}"