diff --git a/ansible/playbook.yaml b/ansible/playbook.yaml index 4aec288..993d215 100644 --- a/ansible/playbook.yaml +++ b/ansible/playbook.yaml @@ -50,6 +50,8 @@ - docker - vscode - javascript + - launch_keyboard + - lvfs - hosts: nat_dhcp:homeserver_nat_dhcp:mrmanager_nat_dhcp vars: diff --git a/ansible/roles/launch_keyboard/tasks/common.yaml b/ansible/roles/launch_keyboard/tasks/common.yaml new file mode 100644 index 0000000..fef1101 --- /dev/null +++ b/ansible/roles/launch_keyboard/tasks/common.yaml @@ -0,0 +1,15 @@ +- import_tasks: tasks/freebsd.yaml + when: 'os_flavor == "freebsd"' + +- import_tasks: tasks/linux.yaml + when: 'os_flavor == "linux"' + +- include_tasks: + file: tasks/peruser.yaml + apply: + become: yes + become_user: "{{ initialize_user }}" + when: users is defined + loop: "{{ users | dict2items | community.general.json_query('[?value.initialize==`true`].key') }}" + loop_control: + loop_var: initialize_user diff --git a/ansible/roles/launch_keyboard/tasks/freebsd.yaml b/ansible/roles/launch_keyboard/tasks/freebsd.yaml new file mode 100644 index 0000000..b417174 --- /dev/null +++ b/ansible/roles/launch_keyboard/tasks/freebsd.yaml @@ -0,0 +1,5 @@ +# - name: Install packages +# package: +# name: +# - foo +# state: present diff --git a/ansible/roles/launch_keyboard/tasks/linux.yaml b/ansible/roles/launch_keyboard/tasks/linux.yaml new file mode 100644 index 0000000..76922b0 --- /dev/null +++ b/ansible/roles/launch_keyboard/tasks/linux.yaml @@ -0,0 +1,24 @@ +- name: Build aur packages + register: buildaur + become_user: "{{ build_user.name }}" + command: "aurutils-sync --no-view {{ item }}" + args: + creates: "/var/cache/pacman/custom/{{ item }}-*.pkg.tar.*" + loop: + - system76-keyboard-configurator + +- name: Update cache + when: buildaur.changed + pacman: + name: [] + state: present + update_cache: true + +- name: Install packages + package: + name: + - dfu-programmer # For flashing keyboard https://support.system76.com/articles/launch_2-firmware-update/ + - avrdude # For flashing keyboard https://support.system76.com/articles/launch_2-firmware-update/ + - lxqt-policykit # Need a polkit agent to launch the keyboard configurator + - system76-keyboard-configurator + state: present diff --git a/ansible/roles/launch_keyboard/tasks/main.yaml b/ansible/roles/launch_keyboard/tasks/main.yaml new file mode 100644 index 0000000..888f733 --- /dev/null +++ b/ansible/roles/launch_keyboard/tasks/main.yaml @@ -0,0 +1,2 @@ +- import_tasks: tasks/common.yaml + when: install_graphics diff --git a/ansible/roles/launch_keyboard/tasks/peruser.yaml b/ansible/roles/launch_keyboard/tasks/peruser.yaml new file mode 100644 index 0000000..111e886 --- /dev/null +++ b/ansible/roles/launch_keyboard/tasks/peruser.yaml @@ -0,0 +1,29 @@ +- include_role: + name: per_user + +# - name: Create directories +# file: +# name: "{{ account_homedir.stdout }}/{{ item }}" +# state: directory +# mode: 0700 +# owner: "{{ account_name.stdout }}" +# group: "{{ group_name.stdout }}" +# loop: +# - ".config/foo" + +# - name: Copy files +# copy: +# src: "files/{{ item.src }}" +# dest: "{{ account_homedir.stdout }}/{{ item.dest }}" +# mode: 0600 +# owner: "{{ account_name.stdout }}" +# group: "{{ group_name.stdout }}" +# loop: +# - src: foo.conf +# dest: .config/foo/foo.conf + +- import_tasks: tasks/peruser_freebsd.yaml + when: 'os_flavor == "freebsd"' + +- import_tasks: tasks/peruser_linux.yaml + when: 'os_flavor == "linux"' diff --git a/ansible/roles/launch_keyboard/tasks/peruser_freebsd.yaml b/ansible/roles/launch_keyboard/tasks/peruser_freebsd.yaml new file mode 100644 index 0000000..e69de29 diff --git a/ansible/roles/launch_keyboard/tasks/peruser_linux.yaml b/ansible/roles/launch_keyboard/tasks/peruser_linux.yaml new file mode 100644 index 0000000..e69de29 diff --git a/ansible/roles/lvfs/tasks/common.yaml b/ansible/roles/lvfs/tasks/common.yaml new file mode 100644 index 0000000..c4f2d20 --- /dev/null +++ b/ansible/roles/lvfs/tasks/common.yaml @@ -0,0 +1,5 @@ +- import_tasks: tasks/freebsd.yaml + when: 'os_flavor == "freebsd"' + +- import_tasks: tasks/linux.yaml + when: 'os_flavor == "linux"' diff --git a/ansible/roles/lvfs/tasks/freebsd.yaml b/ansible/roles/lvfs/tasks/freebsd.yaml new file mode 100644 index 0000000..b417174 --- /dev/null +++ b/ansible/roles/lvfs/tasks/freebsd.yaml @@ -0,0 +1,5 @@ +# - name: Install packages +# package: +# name: +# - foo +# state: present diff --git a/ansible/roles/lvfs/tasks/linux.yaml b/ansible/roles/lvfs/tasks/linux.yaml new file mode 100644 index 0000000..2dde340 --- /dev/null +++ b/ansible/roles/lvfs/tasks/linux.yaml @@ -0,0 +1,14 @@ +- name: Install packages + package: + name: + - fwupd + - gnome-firmware + state: present + +- name: Enable services + systemd: + enabled: yes + name: "{{ item }}" + daemon_reload: yes + loop: + - fwupd.service diff --git a/ansible/roles/lvfs/tasks/main.yaml b/ansible/roles/lvfs/tasks/main.yaml new file mode 100644 index 0000000..6805b9d --- /dev/null +++ b/ansible/roles/lvfs/tasks/main.yaml @@ -0,0 +1,2 @@ +- import_tasks: tasks/common.yaml + # when: foo is defined diff --git a/ansible/roles/power_management/files/dont_sleep_usb_rulesd.conf b/ansible/roles/power_management/files/dont_sleep_usb_rulesd.conf index 16127a3..5c9d568 100644 --- a/ansible/roles/power_management/files/dont_sleep_usb_rulesd.conf +++ b/ansible/roles/power_management/files/dont_sleep_usb_rulesd.conf @@ -1,2 +1,9 @@ ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="1038", ATTR{idProduct}=="1832", TEST=="power/autosuspend" ATTR{power/autosuspend}="-1" ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="308f", ATTR{idProduct}=="0011", TEST=="power/autosuspend" ATTR{power/autosuspend}="-1" + +# Launch keyboard +ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="3384", ATTR{idProduct}=="0006", TEST=="power/autosuspend" ATTR{power/autosuspend}="-1" + +# DFU Programmer on launch keyboard +ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="2ff9", TEST=="power/autosuspend" ATTR{power/autosuspend}="-1" +ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="2ff9", TAG+="uaccess"