From 1d6e9fa06f6c11df5f38b6a5fa6cc931461fb946 Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Mon, 20 Nov 2023 10:24:47 +0100 Subject: [PATCH] Split out network and pipewire --- playbooks/apt.yaml | 15 --------------- playbooks/network.yaml | 19 +++++++++++++++++++ playbooks/pipewire.yaml | 12 ++++++++++++ setup.yaml | 5 ++++- 4 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 playbooks/network.yaml create mode 100644 playbooks/pipewire.yaml diff --git a/playbooks/apt.yaml b/playbooks/apt.yaml index 32026ab..59f1f52 100644 --- a/playbooks/apt.yaml +++ b/playbooks/apt.yaml @@ -70,18 +70,3 @@ pkg: [nano] state: absent update_cache: true - - name: Enable pipewire-audio - ansible.builtin.command: - cmd: systemctl --user enable --now pipewire-pulse - creates: /home/{{ uid }}/.config/systemd/user/default.target.wants/pipewire-pulse.service - - name: Allow nm-applet to set wifi - become: true - ansible.builtin.template: - src: ../templates/org.freedesktop.NetworkManager.policy.j2 - dest: /usr/share/polkit-1/actions/org.freedesktop.NetworkManager.policy - - name: Manage ifupdown in NM - become: true - ansible.builtin.lineinfile: - path: /etc/NetworkManager/NetworkManager.conf - regex: managed=false - line: managed=true diff --git a/playbooks/network.yaml b/playbooks/network.yaml new file mode 100644 index 0000000..7a468b2 --- /dev/null +++ b/playbooks/network.yaml @@ -0,0 +1,19 @@ +--- +- name: Set up network stuff + hosts: localhost + connection: local + become: false + vars: + uid: "{{ lookup('env','USER') }}" + tasks: + - name: Allow nm-applet to set wifi + become: true + ansible.builtin.template: + src: ../templates/org.freedesktop.NetworkManager.policy.j2 + dest: /usr/share/polkit-1/actions/org.freedesktop.NetworkManager.policy + - name: Manage ifupdown in NM + become: true + ansible.builtin.lineinfile: + path: /etc/NetworkManager/NetworkManager.conf + regex: managed=false + line: managed=true diff --git a/playbooks/pipewire.yaml b/playbooks/pipewire.yaml new file mode 100644 index 0000000..6ee877f --- /dev/null +++ b/playbooks/pipewire.yaml @@ -0,0 +1,12 @@ +--- +- name: Setup pipewire + hosts: localhost + connection: local + become: false + vars: + uid: "{{ lookup('env','USER') }}" + tasks: + - name: Enable pipewire-audio + ansible.builtin.command: + cmd: systemctl --user enable --now pipewire-pulse + creates: /home/{{ uid }}/.config/systemd/user/default.target.wants/pipewire-pulse.service diff --git a/setup.yaml b/setup.yaml index 6de198b..daec6bc 100644 --- a/setup.yaml +++ b/setup.yaml @@ -3,9 +3,12 @@ - import_playbook: playbooks/env.yaml - import_playbook: playbooks/firefox.yaml - import_playbook: playbooks/fonts.yaml +- import_playbook: playbooks/mattermost.yaml +- import_playbook: playbooks/network.yaml - import_playbook: playbooks/pass.yaml -- import_playbook: playbooks/ssh.yaml +- import_playbook: playbooks/pipewire.yaml - import_playbook: playbooks/slack.yaml +- import_playbook: playbooks/ssh.yaml - import_playbook: playbooks/sunet.yaml - import_playbook: playbooks/sway.yaml #- import_playbook: playbooks/zoom.yaml