diff --git a/.gitmodules b/.gitmodules index ea56f9f..74801f2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -61,3 +61,6 @@ [submodule "roles/avahi_daemon"] path = roles/avahi_daemon url = git@git.ccczh.ch:ansible-roles/role-avahi_daemon.git +[submodule "roles/amdgpu_firmware"] + path = roles/amdgpu_firmware + url = https://github.com/DO1JLR/ansible_role_amdgpu_firmware.git diff --git a/ansible/hosts.ini b/ansible/hosts.ini index c2d50b0..03e17e4 100644 --- a/ansible/hosts.ini +++ b/ansible/hosts.ini @@ -1,4 +1,4 @@ [thinkpad] t460p ansible_host='localhost' ansible_connection='local' -desk_minni ansible_host='192.168.0.42' ansible_connection='local' -l460 ansible_host='192.168.0.43' ansible_connection='local' +desk_minni ansible_connection='local' +l14.local ansible_connection='local' diff --git a/host_vars/l460.yml b/host_vars/l14.local.yml similarity index 100% rename from host_vars/l460.yml rename to host_vars/l14.local.yml diff --git a/roles/amdgpu_firmware b/roles/amdgpu_firmware new file mode 160000 index 0000000..d706281 --- /dev/null +++ b/roles/amdgpu_firmware @@ -0,0 +1 @@ +Subproject commit d706281c0e185a553e77672bc7dfa831d0777bc7 diff --git a/setup_l14.yml b/setup_l14.yml new file mode 100644 index 0000000..737456a --- /dev/null +++ b/setup_l14.yml @@ -0,0 +1,36 @@ +--- +- name: check if ansible is not to old + hosts: localhost + roles: + - {role: ansible_version, tags: always, gather_facts: false} + +- name: base packages setup + hosts: l14.local + roles: + - {role: workstation_packages, tags: [base, packages, workstation]} + - {role: amdgpu_firmware, tags: [amdgpu, firmware]} + +- name: user and ssh(d) setup + hosts: l14.local + roles: + - {role: manage_users, tags: [users, base]} + - {role: authorized_keys, tags: [auth, base]} + - {role: sshd, tags: [sshd, base]} + - {role: dotfiles, tags: [dotfiles, base]} + +- name: fancy schnickschnack + hosts: l14.local + roles: + - {role: akku-warning, tags: akku} + - {role: pulseaudio, tags: [pulse, audio, pulseaudio]} + - {role: networkmanager, tags: networkmanager, when: ansible_os_family == 'Archlinux'} + - {role: nextcloud, tags: nextcloud, when: ansible_os_family == 'Archlinux'} + - {role: bat, tags: bat, when: ansible_os_family == 'Debian'} + - {role: install-firefox, tags: firefox} + - {role: copy_files} + - {role: i3wm, tags: i3wm} + - {role: ntp, tags: ntp} + - {role: xrandr, tags: xrandr} + - {role: arch-fonts, tags: fonts} + - {role: winehq, tags: wine} + - {role: no-sleep, tags: sleep} diff --git a/setup_l460.yml b/setup_l460.yml deleted file mode 100644 index 4f57c0c..0000000 --- a/setup_l460.yml +++ /dev/null @@ -1,101 +0,0 @@ ---- -- name: check if ansible is not to old - hosts: localhost - tags: - - default - - always - roles: - - ansible_version - gather_facts: no - -- name: Install useful packages - hosts: l460 - tags: - - packages - - updates - - setup - roles: - - workstation_packages - -- name: enable and secure sshd - hosts: l460 - tags: - - secure - - ssh - - setup - roles: - - manage_users - - authorized_keys - - sshd - -- name: Install useful dotfiles - hosts: l460 - tags: - - setup - roles: - - dotfiles - -- name: set akku warning - hosts: l460 - tags: - - setup - - akku - roles: - - akku-warning - -- name: install modules for sound and bluetooth - hosts: l460 - roles: - - {role: pulseaudio, tags: [pulse, audio, pulseaudio]} - - {role: networkmanager, tags: networkmanager, when: ansible_os_family == 'Archlinux'} - - {role: nextcloud, tags: nextcloud, when: ansible_os_family == 'Archlinux'} - - {role: bat, tags: bat, when: ansible_os_family == 'Debian'} - -- name: install some arch fonts - hosts: l460 - tags: - - arch - - firefox - - browser - - install-firefox - roles: - - install-firefox - -- name: Install useful packages - hosts: l460 - tags: - - packages - - i3wm - roles: - - copy_files - - i3wm - - ntp - - xrandr - -- name: install some arch fonts - hosts: l460 - tags: - - arch - - font - - fonts - - schrift - roles: - - arch-fonts - -- name: install winehq - hosts: l460 - become: true - tags: - - wine - - winehq - roles: - - winehq - -- name: disable sleeping - hosts: l460 - tags: - - sleep - - suspend - - no-sleep - roles: - - no-sleep