Merge branch 'main' of github.com:DO1JLR/ansible_thinkpad_setup

.github/FUNDING.yml

@@ -1,5 +1,5 @@
+---
 # These are supported funding model platforms
 
 github: [DO1JLR]
 liberapay: L3D
-custom: https://paypal.me/c3woc

.github/workflows/ansible-linting-check.yml

@@ -0,0 +1,18 @@
+---
+name: Ansible Lint check
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Lint Ansible Playbook
+        uses: ansible/ansible-lint-action@master
+        with:
+          targets: "site.yml"

.github/workflows/yamllint.yaml

@@ -0,0 +1,22 @@
+---
+name: 'Yamllint GitHub Actions'
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  yamllint:
+    name: 'Yamllint'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@master
+      - name: 'Yamllint'
+        uses: karancode/yamllint-github-action@master
+        with:
+          yamllint_file_or_dir: '.'
+          yamllint_config_filepath: './.yamllint'
+          yamllint_strict: false
+          yamllint_comment: true
+#       env:
+#         GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }

.gitmodules

@@ -33,7 +33,7 @@
 	url = https://github.com/roles-ansible/role_akku_warning.git
 [submodule "roles/install-firefox"]
 	path = roles/install-firefox
-	url = https://github.com/chaos-bodensee/role-firefox-installation.git
+	url = https://github.com/roles-ansible/ansible_role_install_firefox.git
 [submodule "roles/xrandr"]
 	path = roles/xrandr
 	url = https://github.com/chaos-bodensee/role-xrandr.git

.yamllint

@@ -0,0 +1,11 @@
+---
+extends: default
+
+rules:
+  # 150 chars should be enough, but don't fail if a line is longer
+  line-length:
+    max: 180
+    level: warning
+
+ignore: |
+  roles/

README.md

@@ -90,4 +90,4 @@ Or create a new git repo and be inspired by the roles L3D uses.
 ------------
 If you find this usefull please take a few secounds and say thankyou to L3D.
 
-He is at the most [chaos ecents](https://events.ccc.de), simple give him a Tschunk or Club Mate there!
+He is at the most [chaos events](https://events.ccc.de), simple give him a Tschunk or Club Mate there!

group_vars/all.yml

@@ -4,7 +4,18 @@
 #
 # enable keychain as ssh agent
 dotfiles__additional_user_bashrc_lines:
- - eval $(keychain --eval --quiet id_ed25519)
+ - 'eval $(keychain --eval --quiet id_ed25519)'
+ - '_gopass_bash_autocomplete() {'
+ - '   local cur opts base'
+ - '   COMPREPLY=()'
+ - '   cur="${COMP_WORDS[COMP_CWORD]}"'
+ - '   opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} --generate-bash-completion )'
+ - "   local IFS=$'\n'"
+ - '   COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )'
+ - '   return 0'
+ - '}'
+ - 'complete -F _gopass_bash_autocomplete gopass'
+
 
 # roles/authorized_keys
 #
@@ -12,55 +23,50 @@ dotfiles__additional_user_bashrc_lines:
 ssh_public_key_store: 'admin_ssh_keys'
 
 i3_keybindings_extra:
-  - keybinding:
+ - keybinding:
-    name: Volume (mute/unmute)
+   name: Volume (mute/unmute)
-    key: $mod+F12
+   key: $mod+F12
-    exec: --no-startup-id pulsemixer --toggle-mute
+   exec: --no-startup-id pulsemixer --toggle-mute
-  - keybinding:
+ - keybinding:
-    name: Volue (default)
+   name: Volue (default)
-    key: $mod+Shift+F12
+   key: $mod+Shift+F12
-    exec: --no-startup-id pulsemixer --set-volume 42
+   exec: --no-startup-id pulsemixer --set-volume 42
-  - keybinding:
+ - keybinding:
-    name: volume-up
+   name: volume-up
-    key: XF86AudioRaiseVolume
+   key: XF86AudioRaiseVolume
-    exec: --no-startup-id pulsemixer --change-volume +3
+   exec: --no-startup-id pulsemixer --change-volume +3
-  - keybinding:
+ - keybinding:
-    name: volume-down
+   name: volume-down
-    key: XF86AudioLowerVolume
+   key: XF86AudioLowerVolume
-    exec: --no-startup-id pulsemixer --change-volume -5
+   exec: --no-startup-id pulsemixer --change-volume -5
-  - keybinding:
+ - keybinding:
-    name: darker
+   name: darker
-    key: XF86AudioMute
+   key: XF86AudioMute
-    exec: --no-startup-id pulsemixer --toggle-mute
+   exec: --no-startup-id pulsemixer --toggle-mute
-  - keybinding:
+ - keybinding:
-    name: darker
+   name: darker
-    key: XF86MonBrightnessDown
+   key: XF86MonBrightnessDown
-    exec: --no-startup-id sudo light -U 9
+   exec: --no-startup-id sudo light -U 9
-  - keybinding:
+ - keybinding:
-    name: lighter
+   name: lighter
-    key: XF86MonBrightnessUp
+   key: XF86MonBrightnessUp
-    exec: --no-startup-id sudo light -A 6
+   exec: --no-startup-id sudo light -A 6
-
 
 i3_applications:
-  - application:
+ - application:
-    class: "firefox"
+   class: "firefox"
-    name: "firefox"
+   name: "firefox"
-    workspace: 2
+   workspace: 2
-    on_startup: true
+   on_startup: true
-  - application:
+ - application:
-    class: "Thunderbird"
+   class: "Thunderbird"
-    name: "thunderbird"
+   name: "thunderbird"
-    workspace: 9
+   workspace: 9
-    on_startup: true
+   on_startup: true
 
 i3_run_on_startup:
-  - nextcloud
+ # - nextcloud
-  - sudo nm-applet
+ - sudo nm-applet
-
-
-
 
 # globaly enably simple versionscheck - if available
 submodules_versioncheck: true
-

host_vars/desk_minni.yml

@@ -31,16 +31,15 @@ i3_monitors:
     mode: "2560x1440"
     pos: "0x0"
     rotate: "normal"
-    workspaces: [1,2,3,4,5]
+    workspaces: [1, 2, 3, 4, 5]
   - monitor:
     id: 2
     output: "HDMI2"
     mode: "1920x1200"
     pos: "2560x0"
     rotate: "normal"
-    workspaces: [6,7,8,9,0]
+    workspaces: [6, 7, 8, 9, 0]
 
 wine_user: "lilian"
 akku_user: "lilian"
 wine_user_home: "/home/lilian"
-

host_vars/t460p.yml

@@ -21,4 +21,3 @@ copy_to_user: "{{ akku_user }}"
 
 wine_user: "{{ akku_user }}"
 wine_user_home: "/home/{{ akku_user }}"
-copy_to_user: "{{ akku_user }}"

roles/ansible_version

@@ -1 +1 @@
-Subproject commit 1938bf214dba9b7d19a54686abc79b16f729fd43
+Subproject commit 0699f5e1e1eb2c48300fb946be9ab333df3d08cf

roles/install-firefox

@@ -1 +1 @@
-Subproject commit ee9709d0fcd563e54dd928655f5d0f0c285d5b31
+Subproject commit 31fbb5b16c58e057b966c9f2371c50ab3e9160c8

roles/sshd

@@ -1 +1 @@
-Subproject commit 8d5e1f32ba5930e9a12d01688a9af8c5e55395c0
+Subproject commit 3ea0eadf22a136b517829cd3de5807ad43f61cf6

site.yml

@@ -1,36 +1,32 @@
 ---
 - name: check if ansible is not to old
   hosts: localhost
-  tags:
-   - default
-   - always
   roles:
-    - ansible_version
+    - {role: ansible_version, tags: always, gather_facts: false}
-  gather_facts: no
 
 - name: run base setup roles
   hosts: localhost
   roles:
-    - { role: base, tags: [default,packages,base]}
+    - {role: base, tags: [default, packages, base]}
-    - { role: workstation_packages, tags: [default, workstation_packages, packages, setup]}
+    - {role: workstation_packages, tags: [default, workstation_packages, packages, setup]}
-    - { role: ntp, tags: ntp }
+    - {role: ntp, tags: ntp}
-    - { role: arch-fonts, tags: [font,fonts,arch-fonts]}
+    - {role: arch-fonts, tags: [font, fonts, arch-fonts]}
 
 - name: user specific setup
   hosts: localhost
   roles:
-    - { role: dotfiles, tags: [default,dotfiles,fancy]}
+    - {role: dotfiles, tags: [default, dotfiles, fancy]}
-    - { role: manage_users, tags: [ssh,manage,manage_users]}
+    - {role: manage_users, tags: [ssh, manage, manage_users]}
-    - { role: authorized_keys, tags: [ssh,auth,authorized_keys]}
+    - {role: authorized_keys, tags: [ssh, auth, authorized_keys]}
-    - { role: sshd, tags: [ssh, sshd]}
+    - {role: sshd, tags: [ssh, sshd]}
-    - { role: akku-warning, tags: [akku,akku_warning,akku-warning]}
+    - {role: akku-warning, tags: [akku, akku_warning, akku-warning]}
-    - { role: pulseaudio, tags: pulseaudio }
+    - {role: pulseaudio, tags: pulseaudio}
-    - { role: networkmanager, tags: [nm, networkmanager]}
+    - {role: networkmanager, tags: [nm, networkmanager]}
-    - { role: copy_files }
+    - {role: copy_files}
-    - { role: i3wm, tags: i3wm }
+    - {role: i3wm, tags: i3wm}
-    - { role: xrandr, tags: xrandr }
+    - {role: xrandr, tags: xrandr}
-    - { role: install-firefox, tags: firefox }
+    - {role: install-firefox, tags: firefox}
-    - { role: nextcloud, tags: nextcloud }
+    - {role: nextcloud, tags: nextcloud}
-    - { role: openvpn, tags: openvpn }
+    - {role: openvpn, tags: openvpn}
-    - { role: winehq, tags: [wine, winehq]}
+    - {role: winehq, tags: [wine, winehq]}
-    - { role: no-sleep, tags: no_sleep }
+    - {role: no-sleep, tags: no_sleep}