From 759fcd48d03dbe1132862a79f75db486aa77ee99 Mon Sep 17 00:00:00 2001 From: Jannik Beyerstedt Date: Thu, 16 Jun 2022 11:07:42 +0200 Subject: [PATCH] [FIX] Usersettings: Explicitly install to user_dir --- tasks/devel.yml | 6 +++--- tasks/usersettings.yml | 30 ++++++++++++++++++------------ tasks/usersetup-Archlinux.yml | 4 ++-- tasks/usersetup-Centos.yml | 4 ++-- tasks/usersetup-Darwin.yml | 4 ++-- tasks/usersetup-Debian.yml | 4 ++-- tasks/usersetup-FreeBSD.yml | 4 ++-- 7 files changed, 31 insertions(+), 25 deletions(-) diff --git a/tasks/devel.yml b/tasks/devel.yml index 3c5bcef..7f86d86 100644 --- a/tasks/devel.yml +++ b/tasks/devel.yml @@ -73,17 +73,17 @@ state: directory - name: devel - Golang - Create zshrc-host ansible.builtin.file: - path: "{{ ansible_user_dir}}/.zshrc-host" + path: "{{ ansible_user_dir }}/.zshrc-host" state: touch - name: devel - Golang - Add GOPATH ansible.builtin.lineinfile: - path: "{{ ansible_user_dir}}/.zshrc-host" + path: "{{ ansible_user_dir }}/.zshrc-host" line: "export GOPATH={{ user_lang_golang_gopath }}" state: present backup: yes - name: devel - Golang - Add go bin to PATH ansible.builtin.lineinfile: - path: "{{ ansible_user_dir}}/.zshrc-host" + path: "{{ ansible_user_dir }}/.zshrc-host" line: "export PATH=$PATH:{{ user_lang_golang_gopath }}/bin" state: present backup: yes diff --git a/tasks/usersettings.yml b/tasks/usersettings.yml index bbbfd4b..1947484 100644 --- a/tasks/usersettings.yml +++ b/tasks/usersettings.yml @@ -14,12 +14,12 @@ - name: usersettings - Install/ Update oh-my-zsh for current user ansible.builtin.git: repo: https://github.com/robbyrussell/oh-my-zsh.git - dest: .oh-my-zsh + dest: "{{ ansible_user_dir }}/.oh-my-zsh" - name: usersettings - Install/ Update fzf sources ansible.builtin.git: repo: https://github.com/junegunn/fzf.git - dest: .fzf + dest: "{{ ansible_user_dir }}/.fzf" register: fzf_git - name: (Re-)Install fzf when: @@ -67,12 +67,15 @@ with_items: - { src: "{{ role_path }}/files/_gitignore_global", - dest: ".gitignore_global", + dest: "{{ ansible_user_dir }}/.gitignore_global", + } + - { + src: "{{ role_path }}/files/_vimrc", + dest: "{{ ansible_user_dir }}/.vimrc", } - - { src: "{{ role_path }}/files/_vimrc", dest: ".vimrc" } - { src: "{{ role_path }}/files/_oh-my-zsh/jtbx.zsh-theme", - dest: ".oh-my-zsh/custom/themes/jtbx.zsh-theme", + dest: "{{ ansible_user_dir }}/.oh-my-zsh/custom/themes/jtbx.zsh-theme", } - name: usersettings - Set zshrc ansible.builtin.template: @@ -90,13 +93,13 @@ - name: usersettings - Create .vim directory ansible.builtin.file: - path: .vim/autoload + path: "{{ ansible_user_dir }}/.vim/autoload" state: directory - name: usersettings - Install vim plugin manager ansible.builtin.get_url: url: https://tpo.pe/pathogen.vim - dest: .vim/autoload/pathogen.vim + dest: "{{ ansible_user_dir }}/.vim/autoload/pathogen.vim" - name: usersettings - Install vim plugins ansible.builtin.git: @@ -105,18 +108,21 @@ with_items: - { repo: "https://github.com/itchyny/lightline.vim", - dest: ".vim/bundle/lightline", + dest: "{{ ansible_user_dir }}/.vim/bundle/lightline", + } + - { + repo: "https://github.com/w0rp/ale", + dest: "{{ ansible_user_dir }}/.vim/bundle/ale", } - - { repo: "https://github.com/w0rp/ale", dest: ".vim/bundle/ale" } - { repo: "https://github.com/airblade/vim-gitgutter", - dest: ".vim/bundle/vim-gitgutter", + dest: "{{ ansible_user_dir }}/.vim/bundle/vim-gitgutter", } - { repo: "https://github.com/sheerun/vim-polyglot", - dest: ".vim/bundle/vim-polyglot", + dest: "{{ ansible_user_dir }}/.vim/bundle/vim-polyglot", } - { repo: "https://github.com/tpope/vim-commentary", - dest: ".vim/bundle/vim-commentary", + dest: "{{ ansible_user_dir }}/.vim/bundle/vim-commentary", } diff --git a/tasks/usersetup-Archlinux.yml b/tasks/usersetup-Archlinux.yml index 0a5854e..8b5b543 100644 --- a/tasks/usersetup-Archlinux.yml +++ b/tasks/usersetup-Archlinux.yml @@ -4,7 +4,7 @@ - name: usersetup - Check, if usersetup already ran ansible.builtin.stat: - path: .ansbl-common-usersetup + path: "{{ ansible_user_dir }}/.ansbl-common-usersetup" register: common_usersetup - name: usersetup - Change login shell to zsh for current user @@ -41,5 +41,5 @@ when: - common_usersetup.stat.exists == false ansible.builtin.file: - path: .ansbl-common-usersetup + path: "{{ ansible_user_dir }}/.ansbl-common-usersetup" state: touch diff --git a/tasks/usersetup-Centos.yml b/tasks/usersetup-Centos.yml index 91241a8..9cf1e32 100644 --- a/tasks/usersetup-Centos.yml +++ b/tasks/usersetup-Centos.yml @@ -4,7 +4,7 @@ - name: usersetup - Check, if usersetup already ran ansible.builtin.stat: - path: .ansbl-common-usersetup + path: "{{ ansible_user_dir }}/.ansbl-common-usersetup" register: common_usersetup - name: usersetup - Change login shell to zsh for current user @@ -41,5 +41,5 @@ when: - common_usersetup.stat.exists == false ansible.builtin.file: - path: .ansbl-common-usersetup + path: "{{ ansible_user_dir }}/.ansbl-common-usersetup" state: touch diff --git a/tasks/usersetup-Darwin.yml b/tasks/usersetup-Darwin.yml index b52a615..3fac8f1 100644 --- a/tasks/usersetup-Darwin.yml +++ b/tasks/usersetup-Darwin.yml @@ -4,7 +4,7 @@ - name: usersetup - Check, if usersetup already ran ansible.builtin.stat: - path: .ansbl-common-usersetup + path: "{{ ansible_user_dir }}/.ansbl-common-usersetup" register: common_usersetup - name: usersetup - Change login shell to zsh for current user @@ -19,5 +19,5 @@ when: - common_usersetup.stat.exists == false ansible.builtin.file: - path: .ansbl-common-usersetup + path: "{{ ansible_user_dir }}/.ansbl-common-usersetup" state: touch diff --git a/tasks/usersetup-Debian.yml b/tasks/usersetup-Debian.yml index 3ac0b8e..3c04fd2 100644 --- a/tasks/usersetup-Debian.yml +++ b/tasks/usersetup-Debian.yml @@ -4,7 +4,7 @@ - name: usersetup - Check, if usersetup already ran ansible.builtin.stat: - path: .ansbl-common-usersetup + path: "{{ ansible_user_dir }}/.ansbl-common-usersetup" register: common_usersetup - name: usersetup - Change login shell to zsh for current user @@ -40,5 +40,5 @@ when: - common_usersetup.stat.exists == false ansible.builtin.file: - path: .ansbl-common-usersetup + path: "{{ ansible_user_dir }}/.ansbl-common-usersetup" state: touch diff --git a/tasks/usersetup-FreeBSD.yml b/tasks/usersetup-FreeBSD.yml index bd6a27b..1575545 100644 --- a/tasks/usersetup-FreeBSD.yml +++ b/tasks/usersetup-FreeBSD.yml @@ -4,7 +4,7 @@ - name: usersetup - Check, if usersetup already ran ansible.builtin.stat: - path: .ansbl-common-usersetup + path: "{{ ansible_user_dir }}/.ansbl-common-usersetup" register: common_usersetup - name: usersetup - Change login shell to zsh for current user @@ -40,5 +40,5 @@ when: - common_usersetup.stat.exists == false ansible.builtin.file: - path: .ansbl-common-usersetup + path: "{{ ansible_user_dir }}/.ansbl-common-usersetup" state: touch