From e678fb0dc2a0cb082f5c2cd1ed59433e4680526c Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Fri, 17 Jul 2020 06:36:08 +0200 Subject: [PATCH] Fix: remove with_items --- tasks/dotfiles.yml | 118 +++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 68 deletions(-) diff --git a/tasks/dotfiles.yml b/tasks/dotfiles.yml index 9e60077..755de65 100644 --- a/tasks/dotfiles.yml +++ b/tasks/dotfiles.yml @@ -2,10 +2,9 @@ - name: dotfiles -- Copy tmux.conf template: src: files/dotfiles/tmux.conf - dest: /home/{{ item.username }}/.tmux.conf - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ me }}" + dest: /home/{{ me.username }}/.tmux.conf + owner: "{{ me.username }}" + group: "{{ me.group }}" # Zsh config - name: dotfiles -- Download antibody @@ -28,55 +27,49 @@ - name: dotfiles -- Copy local zshrc template: src: files/dotfiles/zshrc - dest: /home/{{ item.username }}/.zshrc - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ me }}" + dest: /home/{{ me.username }}/.zshrc + owner: "{{ me.username }}" + group: "{{ me.group }}" when: prompt == 'zsh' - name: dotfiles -- Copy local zshrc.local template: src: files/dotfiles/zshrc.local - dest: /home/{{ item.username }}/.zshrc.local - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ me }}" + dest: /home/{{ me.username }}/.zshrc.local + owner: "{{ me.username }}" + group: "{{ me.group }}" when: prompt == 'zsh' - name: dotfiles -- Copy local zsh_plugins.txt template: src: files/dotfiles/zsh_plugins.txt - dest: /home/{{ item.username }}/.zsh_plugins.txt - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ me }}" + dest: /home/{{ me.username }}/.zsh_plugins.txt + owner: "{{ me.username }}" + group: "{{ me.group }}" when: prompt == 'zsh' # Fish config - name: dotfiles -- Create fish config directory file: - dest: /home/{{ item.username }}/.config/fish/ + dest: /home/{{ me.username }}/.config/fish/ state: directory - with_items: "{{ me }}" when: prompt == 'fish' - name: dotfiles -- Copy config.fish template: src: files/dotfiles/config.fish - dest: /home/{{ item.username }}/.config/fish/ - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ me }}" + dest: /home/{{ me.username }}/.config/fish/ + owner: "{{ me.username }}" + group: "{{ me.group }}" when: prompt == 'fish' register: fishconfig - name: dotfiles -- Copy fisher plugin list template: src: files/dotfiles/fishfile - dest: /home/{{ item.username }}/.config/fish/ - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ me }}" + dest: /home/{{ me.username }}/.config/fish/ + owner: "{{ me.username }}" + group: "{{ me.group }}" when: prompt == 'fish' register: fishplugin @@ -85,95 +78,84 @@ - name: dotfiles -- Copy .vim/ copy: src: files/dotfiles/vim/ - dest: /home/{{ item.username }}/.vim/ - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ me }}" + dest: /home/{{ me.username }}/.vim/ + owner: "{{ me.username }}" + group: "{{ me.group }}" - name: dotfiles -- Creates .vim/autoload/ file: - path: /home/{{ item.username }}/.vim/autoload/ + path: /home/{{ me.username }}/.vim/autoload/ state: directory - with_items: "{{ me }}" - name: dotfiles -- Download plug.vim get_url: url: https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim - dest: /home/{{ item.username }}/.vim/autoload/plug.vim - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ me }}" + dest: /home/{{ me.username }}/.vim/autoload/plug.vim + owner: "{{ me.username }}" + group: "{{ me.group }}" - name: dotfiles -- Copy vimrc template: src: files/dotfiles/vimrc - dest: /home/{{ item.username }}/.vimrc - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ me }}" + dest: /home/{{ me.username }}/.vimrc + owner: "{{ me.username }}" + group: "{{ me.group }}" # Neovim config - name: dotfiles -- Copy nvim config copy: src: files/dotfiles/nvim - dest: /home/{{ item.username }}/.config - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ me }}" + dest: /home/{{ me.username }}/.config + owner: "{{ me.username }}" + group: "{{ me.group }}" when: editor == 'nvim' - name: dotfiles -- Download plug.vim for nvim get_url: url: https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim - dest: /home/{{ item.username }}/.config/nvim/autoload/plug.vim - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ me }}" + dest: /home/{{ me.username }}/.config/nvim/autoload/plug.vim + owner: "{{ me.username }}" + group: "{{ me.group }}" when: editor == 'nvim' # Alacritty terminal - name: dotfiles -- Copy alacritty config copy: src: files/dotfiles/alacritty - dest: /home/{{ item.username }}/.config - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ me }}" + dest: /home/{{ me.username }}/.config + owner: "{{ me.username }}" + group: "{{ me.group }}" # Ssh config - name: dotfiles -- Creates .ssh file: - path: /home/{{ item.username }}/.ssh/ + path: /home/{{ me.username }}/.ssh/ state: directory - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ me }}" + owner: "{{ me.username }}" + group: "{{ me.group }}" when: not server - name: dotfiles -- Copy ssh user config template: src: files/dotfiles/ssh/config_deploy - dest: /home/{{ item.username }}/.ssh/config - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ deploy_users }}" + dest: /home/{{ admin.username }}/.ssh/config + owner: "{{ admin.username }}" + group: "{{ admin.group }}" when: not server - name: dotfiles -- Copy ssh user config template: src: files/dotfiles/ssh/config_me - dest: /home/{{ item.username }}/.ssh/config - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ me }}" + dest: /home/{{ me.username }}/.ssh/config + owner: "{{ me.username }}" + group: "{{ me.group }}" when: not server # Git config - name: dotfiles -- Copy gitconfig template: src: files/dotfiles/gitconfig - dest: /home/{{ item.username }}/.gitconfig - owner: "{{ item.username }}" - group: "{{ item.group }}" - with_items: "{{ me }}" + dest: /home/{{ me.username }}/.gitconfig + owner: "{{ me.username }}" + group: "{{ me.group }}" when: not server