merge

.gitmodules

@@ -52,3 +52,6 @@
 [submodule "roles/ansible_version"]
 	path = roles/ansible_version
 	url = https://github.com/chaos-bodensee/role-ansible_version.git
+[submodule "roles/base"]
+	path = roles/base
+	url = https://github.com/roles-ansible/ansible_role_base.git

group_vars/all.yml

@@ -1,4 +1,66 @@
 ---
+#
+# roles/dotfiles
+#
+# enable keychain as ssh agent
+dotfiles__additional_user_bashrc_lines:
+ - eval $(keychain --eval --quiet id_ed25519)
+
+# roles/authorized_keys
+#
+# define dir for ssh keys
+ssh_public_key_store: 'admin_ssh_keys'
+
+i3_keybindings_extra:
+  - keybinding:
+    name: Volume (mute/unmute)
+    key: $mod+F12
+    exec: --no-startup-id pulsemixer --toggle-mute
+  - keybinding:
+    name: Volue (default)
+    key: $mod+Shift+F12
+    exec: --no-startup-id pulsemixer --set-volume 42
+  - keybinding:
+    name: volume-up
+    key: XF86AudioRaiseVolume
+    exec: --no-startup-id pulsemixer --change-volume +3
+  - keybinding:
+    name: volume-down
+    key: XF86AudioLowerVolume
+    exec: --no-startup-id pulsemixer --change-volume -5
+  - keybinding:
+    name: darker
+    key: XF86AudioMute
+    exec: --no-startup-id pulsemixer --toggle-mute
+  - keybinding:
+    name: darker
+    key: XF86MonBrightnessDown
+    exec: --no-startup-id sudo light -U 9
+  - keybinding:
+    name: lighter
+    key: XF86MonBrightnessUp
+    exec: --no-startup-id sudo light -A 6
+
+
+i3_applications:
+  - application:
+    class: "firefox"
+    name: "firefox"
+    workspace: 2
+    on_startup: true
+  - application:
+    class: "Thunderbird"
+    name: "thunderbird"
+    workspace: 9
+    on_startup: true
+
+i3_run_on_startup:
+  - nextcloud
+  - sudo nm-applet
+
+
+
+
 # globaly enably simple versionscheck - if available
 submodules_versioncheck: true
 

group_vars/thinkpad.yml

@@ -1,21 +1,7 @@
 ---
-#
-# roles/dotfiles
-#
-# enable keychain as ssh agent
-dotfiles__additional_user_bashrc_lines:
- - eval $(keychain --eval --quiet id_ed25519)
-
-
-
-
-
-
-
 # legacy, maybe used
 
 # some ssh role parameters
-ssh_public_key_store: 'admin_ssh_keys'
 home_sweet_home: false
 install_keychain: true
 # i3wm config:
@@ -34,53 +20,6 @@ i3_packages_extra:
   - evince
   - speedtest-cli
 
-i3_keybindings_extra:
-  - keybinding:
-    name: Volume (mute/unmute)
-    key: $mod+F12
-    exec: --no-startup-id pulsemixer --toggle-mute
-  - keybinding:
-    name: Volue (default)
-    key: $mod+Shift+F12
-    exec: --no-startup-id pulsemixer --set-volume 42
-  - keybinding:
-    name: volume-up
-    key: XF86AudioRaiseVolume
-    exec: --no-startup-id pulsemixer --change-volume +3
-  - keybinding:
-    name: volume-down
-    key: XF86AudioLowerVolume
-    exec: --no-startup-id pulsemixer --change-volume -5
-  - keybinding:
-    name: darker
-    key: XF86AudioMute
-    exec: --no-startup-id pulsemixer --toggle-mute
-  - keybinding:
-    name: darker
-    key: XF86MonBrightnessDown
-    exec: --no-startup-id sudo light -U 9
-  - keybinding:
-    name: lighter
-    key: XF86MonBrightnessUp
-    exec: --no-startup-id sudo light -A 6
-
-
-i3_applications:
-  - application:
-    class: "firefox"
-    name: "firefox"
-    workspace: 2
-    on_startup: true
-  - application:
-    class: "Thunderbird"
-    name: "thunderbird"
-    workspace: 9
-    on_startup: true
-
-i3_run_on_startup:
-  - nextcloud
-  - sudo nm-applet
-
 
 i3_font_size: 11
 i3_focus_follows_mouse: true
@@ -101,8 +40,10 @@ print_os_vars: true
 install_pass_as_password_manager: true
 extra_bashrc: "alias dd='dd bs=4M status=progress oflag=dsync'"
 temporarily_disable_screensaver: false
+<<<<<<< HEAD
 
 sshd__key_types:
   - 'ed25519'
   - 'rsa'
   - 'ecdsa'
+modify_lightdm: false

roles/base

@@ -0,0 +1 @@
+Subproject commit ca00bca0f102e754e68b4b77249f4c6a0ebd0638

site.yml

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