[TIDY] yaml auto-format

2019-11-12 21:42:58 +01:00 · 2019-11-12 21:42:58 +01:00 · 79910f93cf
parent 5d919b4443
commit 79910f93cf
17 changed files with 65 additions and 83 deletions
--- a/meta/main.yml
+++ b/meta/main.yml
@ -7,17 +7,19 @@ galaxy_info:
  min_ansible_version: 2.4

  platforms:
-  - name: Debian
-    versions:
-    - all
-  - name: Darwin
-    versions:
-    - all
+    - name: Debian
+      versions:
+        - all
+    - name: Darwin
+      versions:
+        - all

-  galaxy_tags: []
+  galaxy_tags:
+    []
    # List tags for your role here, one per line.
    # Be sure to remove the '[]' above, if you add tags to this list.

-dependencies: []
+dependencies:
+  []
  # List your role dependencies here, one per line.
  # Be sure to remove the '[]' above, if you add tags to this list.
--- a/tasks/essentials-Darwin.yml
+++ b/tasks/essentials-Darwin.yml
@ -7,8 +7,8 @@
    state: present
  vars:
    packages:
-    - git
-    - curl
-    - zsh
-    - vim
-    - tmux
+      - git
+      - curl
+      - zsh
+      - vim
+      - tmux
--- a/tasks/essentials-Debian.yml
+++ b/tasks/essentials-Debian.yml
@ -8,9 +8,9 @@
    state: present
  vars:
    packages:
-    - git
-    - curl
-    - wget
-    - zsh
-    - vim
-    - tmux
+      - git
+      - curl
+      - wget
+      - zsh
+      - vim
+      - tmux
--- a/tasks/main.yml
+++ b/tasks/main.yml
@ -12,7 +12,6 @@
  include_tasks: update.yml
  when: common_settingsonly == false

-
 # if role has not changed, this will not be needed when just installing updates
 - name: Install essential tools
  include_tasks: essentials.yml
@ -23,7 +22,6 @@
  include_tasks: tools.yml
  when: common_settingsonly == false

-
 # this will just run once, because of a lock-file
 - name: Basics - Setup user shell
  include_tasks: usersetup.yml
--- a/tasks/tools-Darwin.yml
+++ b/tasks/tools-Darwin.yml
@ -8,4 +8,4 @@
    update_homebrew: yes
  vars:
    packages:
-    - rsync
+      - rsync
--- a/tasks/tools-Debian.yml
+++ b/tasks/tools-Debian.yml
@ -9,7 +9,7 @@
    state: present
  vars:
    packages:
-    - rsync
-    - dnsutils
-    - htop
-    - unzip
+      - rsync
+      - dnsutils
+      - htop
+      - unzip
--- a/tasks/usersettings.yml
+++ b/tasks/usersettings.yml
@ -10,8 +10,7 @@
  git:
    repo: https://github.com/junegunn/fzf.git
    dest: .fzf
-  register:
-    fzf_git
+  register: fzf_git
 - name: (Re-)Install fzf
  shell: ".fzf/install --key-bindings --no-completion --no-update-rc"
  when:
@ -22,18 +21,18 @@
    src: "{{ item.src }}"
    dest: "{{ item.dest }}"
  with_items:
-    - { src: '{{ role_path }}/files/dotfiles/_gitignore_global', dest: '.gitignore_global' }
-    - { src: '{{ role_path }}/files/dotfiles/_tmux.conf', dest: '.tmux.conf' }
-    - { src: '{{ role_path }}/files/dotfiles/_vimrc', dest: '.vimrc' }
-    - { src: '{{ role_path }}/files/dotfiles/_zshrc', dest: '.zshrc' }
-    - { src: '{{ role_path }}/files/dotfiles/_oh-my-zsh/custom/themes/agnoster.zsh-theme', dest: '.oh-my-zsh/custom/themes/agnoster.zsh-theme' }
-    - { src: '{{ role_path }}/files/dotfiles/_oh-my-zsh/custom/themes/jtbx.zsh-theme', dest: '.oh-my-zsh/custom/themes/jtbx.zsh-theme' }
+    - { src: "{{ role_path }}/files/dotfiles/_gitignore_global", dest: ".gitignore_global" }
+    - { src: "{{ role_path }}/files/dotfiles/_tmux.conf", dest: ".tmux.conf" }
+    - { src: "{{ role_path }}/files/dotfiles/_vimrc", dest: ".vimrc" }
+    - { src: "{{ role_path }}/files/dotfiles/_zshrc", dest: ".zshrc" }
+    - { src: "{{ role_path }}/files/dotfiles/_oh-my-zsh/custom/themes/agnoster.zsh-theme", dest: ".oh-my-zsh/custom/themes/agnoster.zsh-theme" }
+    - { src: "{{ role_path }}/files/dotfiles/_oh-my-zsh/custom/themes/jtbx.zsh-theme", dest: ".oh-my-zsh/custom/themes/jtbx.zsh-theme" }
 - name: usersettings - Set global gitconfig
  copy:
    src: "{{ item.src }}"
    dest: "{{ item.dest }}"
  with_items:
-    - { src: '{{ role_path }}/files/dotfiles/_gitconfig', dest: '.gitconfig' }
+    - { src: "{{ role_path }}/files/dotfiles/_gitconfig", dest: ".gitconfig" }
  when: usersetup_gitconfig == true

 - name: usersettings - Create .vim directory
@ -51,8 +50,8 @@
    repo: "{{ item.repo }}"
    dest: "{{ item.dest }}"
  with_items:
-    - { repo: 'https://github.com/itchyny/lightline.vim', dest: '.vim/bundle/lightline' }
-    - { repo: 'https://github.com/w0rp/ale', dest: '.vim/bundle/ale' }
-    - { repo: 'https://github.com/airblade/vim-gitgutter', dest: '.vim/bundle/vim-gitgutter' }
-    - { repo: 'https://github.com/sheerun/vim-polyglot', dest: '.vim/bundle/vim-polyglot' }
-    - { repo: 'https://github.com/tpope/vim-commentary', dest: '.vim/bundle/vim-commentary' }
+    - { repo: "https://github.com/itchyny/lightline.vim", dest: ".vim/bundle/lightline" }
+    - { repo: "https://github.com/w0rp/ale", dest: ".vim/bundle/ale" }
+    - { repo: "https://github.com/airblade/vim-gitgutter", dest: ".vim/bundle/vim-gitgutter" }
+    - { repo: "https://github.com/sheerun/vim-polyglot", dest: ".vim/bundle/vim-polyglot" }
+    - { repo: "https://github.com/tpope/vim-commentary", dest: ".vim/bundle/vim-commentary" }
--- a/tasks/usersetup-Darwin.yml
+++ b/tasks/usersetup-Darwin.yml
@ -5,8 +5,7 @@
 - name: usersetup - Check, if usersetup already ran
  stat:
    path: .ansbl-common-usersetup
-  register:
-    common_usersetup
+  register: common_usersetup

 - name: usersetup - Change login shell to zsh for current user
  become: yes
--- a/tasks/usersetup-Debian.yml
+++ b/tasks/usersetup-Debian.yml
@ -5,8 +5,7 @@
 - name: usersetup - Check, if usersetup already ran
  stat:
    path: .ansbl-common-usersetup
-  register:
-    common_usersetup
+  register: common_usersetup

 - name: usersetup - Change login shell to zsh for current user
  become: yes
--- a/tasks/usertools-Archlinux.yml
+++ b/tasks/usertools-Archlinux.yml
@ -7,8 +7,8 @@
    state: present
  vars:
    packages:
-    - nmap
-    - rsync
-    - icdiff
-    - iftop
-    - ansible
+      - nmap
+      - rsync
+      - icdiff
+      - iftop
+      - ansible
--- a/tasks/usertools-Darwin.yml
+++ b/tasks/usertools-Darwin.yml
@ -7,8 +7,8 @@
    state: present
  vars:
    packages:
-    - nmap
-    - rsync
-    - icdiff
-    - iftop
-    - ansible
+      - nmap
+      - rsync
+      - icdiff
+      - iftop
+      - ansible
--- a/tasks/usertools-Debian.yml
+++ b/tasks/usertools-Debian.yml
@ -8,8 +8,8 @@
    state: present
  vars:
    packages:
-    - nmap
-    - rsync
-    - icdiff
-    - iftop
-    - ansible
+      - nmap
+      - rsync
+      - icdiff
+      - iftop
+      - ansible
--- a/tasks/vscode-Archlinux.yml
+++ b/tasks/vscode-Archlinux.yml
@ -10,14 +10,13 @@
        state: present
      vars:
        packages:
-        - visual-studio-code
+          - visual-studio-code
    - name: vscode - Basics - Copy global settings
      copy:
        src: "{{ role_path }}/files/vscode-settings.json"
        dest: ~/.config/Code/User/settings.json
  when: user_vscode == true

-
 # VS Code - C/C++ Development Tools
 - name: vscode - C/C++
  block:
@ -27,14 +26,12 @@
        state: present
      vars:
        packages:
-        - clang-format
+          - clang-format
  when: user_lang_cpp == true

-
 # VS Code - Python Development Tools
 # all done in vscode.yml

-
 # VS Code - Golang Development Tools
 - name: vscode - Golang
  block:
@ -44,5 +41,5 @@
        state: present
      vars:
        packages:
-        - go
+          - go
  when: user_lang_golang == true
--- a/tasks/vscode-Darwin.yml
+++ b/tasks/vscode-Darwin.yml
@ -10,14 +10,13 @@
        state: present
      vars:
        packages:
-        - visual-studio-code
+          - visual-studio-code
    - name: vscode - Basics - Copy global settings
      copy:
        src: "{{ role_path }}/files/vscode-settings.json"
        dest: ~/Library/Application Support/Code/User/settings.json
  when: user_vscode == true

-
 # VS Code - C/C++ Development Tools
 - name: vscode - C/C++
  block:
@ -27,14 +26,12 @@
        state: present
      vars:
        packages:
-        - clang-format
+          - clang-format
  when: user_lang_cpp == true

-
 # VS Code - Python Development Tools
 # all done in vscode.yml

-
 # VS Code - Golang Development Tools
 - name: vscode - Golang
  block:
@ -44,5 +41,5 @@
        state: present
      vars:
        packages:
-        - go
+          - go
  when: user_lang_golang == true
--- a/tasks/vscode-Debian.yml
+++ b/tasks/vscode-Debian.yml
@ -11,14 +11,13 @@
        state: present
      vars:
        packages:
-        - visual-studio-code
+          - visual-studio-code
    - name: vscode - Basics - Copy global settings
      copy:
        src: "{{ role_path }}/files/vscode-settings.json"
        dest: ~/.config/Code/User/settings.json
  when: user_vscode == true

-
 # VS Code - C/C++ Development Tools
 - name: vscode - C/C++
  block:
@ -29,14 +28,12 @@
        state: present
      vars:
        packages:
-        - clang-format
+          - clang-format
  when: user_lang_cpp == true

-
 # VS Code - Python Development Tools
 # all done in vscode.yml

-
 # VS Code - Golang Development Tools
 - name: vscode - Golang
  block:
@ -47,5 +44,5 @@
        state: present
      vars:
        packages:
-        - golang
+          - golang
  when: user_lang_golang == true
--- a/tasks/vscode.yml
+++ b/tasks/vscode.yml
@ -12,7 +12,6 @@
 # - user_lang_golang: Boolean for Golang
 # - user_lang_golang_gopath: Go workspace directory

-
 - name: vscode - Install and configure VS Code
  include_tasks: "{{ item }}"
  with_first_found:
@ -34,7 +33,6 @@
        # code --install-extension ban.spellright
  when: user_vscode == true

-
 # VS Code - C/C++ Development Tools
 - name: vscode - C/C++
  block:
@ -44,7 +42,6 @@
        code --install-extension ms-vscode.cpptools
  when: user_vscode == true and user_lang_cpp == true

-
 # VS Code - Python Development Tools
 - name: vscode - Python - Install python dev packages
  pip:
@ -61,7 +58,6 @@
        code --install-extension ms-python.python
  when: user_vscode == true and user_lang_python == true

-
 # VC Code - Golang Development Tools
 # https://golang.org/doc/install
 - name: vscode - Golang - Setup Environment
--- a/vars/main.yml
+++ b/vars/main.yml
@ -1,2 +0,0 @@
---
-# vars file for common