diff --git a/playbook.yml b/playbook.yml index 4af985e..b3fe9bf 100644 --- a/playbook.yml +++ b/playbook.yml @@ -44,13 +44,11 @@ - { role: media, tags: ["media"] } - { role: mpd, tags: ["mpd"] } - { role: mpv, tags: ["mpv"] } - - { role: pianobar, tags: ["pianobar"] } - { role: laptop, tags: ["laptop"] } - { role: thinkpad, tags: ["thinkpad"], when: "'ThinkPad' in ansible_product_version" } - { role: macbook, tags: ["macbook"], when: "'MacBook' in ansible_product_name" } - { role: backlight, tags: ["backlight"] } - { role: screensaver, tags: ["screensaver"] } - - { role: weechat, tags: ["weechat"] } - { role: gitannex, tags: ["gitannex"], when: "gitannex is defined" } - { role: taskwarrior, tags: ["taskwarrior"] } - { role: ledger, tags: ["ledger"] } diff --git a/roles/bitlbee/files/bitlbee-service-override.conf b/roles/bitlbee/files/bitlbee-service-override.conf deleted file mode 100644 index ac6be68..0000000 --- a/roles/bitlbee/files/bitlbee-service-override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -ExecStart= -ExecStart=/usr/bin/firejail /usr/bin/bitlbee -F -n diff --git a/roles/bitlbee/handlers/main.yml b/roles/bitlbee/handlers/main.yml deleted file mode 100644 index 777bf5b..0000000 --- a/roles/bitlbee/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Restart bitlbee - ansible.builtin.service: - name: bitlbee - state: restarted diff --git a/roles/bitlbee/meta/main.yml b/roles/bitlbee/meta/main.yml deleted file mode 100644 index 041a945..0000000 --- a/roles/bitlbee/meta/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -dependencies: - - { role: nmtrust } - - { role: firejail } - - { role: systemd } - - { role: tor } diff --git a/roles/bitlbee/tasks/main.yml b/roles/bitlbee/tasks/main.yml deleted file mode 100644 index cdb5a83..0000000 --- a/roles/bitlbee/tasks/main.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -- name: Install libOTR - community.general.pacman: - name: libotr - state: present - -- name: Install Bitlbee - kewlfft.aur.aur: - name: bitlbee - become: true - become_user: "{{ aur.user }}" - tags: - - aur - -- name: Push Bitlbee configuration file - ansible.builtin.template: - src: bitlbee.conf.j2 - dest: /etc/bitlbee/bitlbee.conf - mode: "0644" - -- name: Ensure proper ownership of configuration directory - ansible.builtin.file: - path: /var/lib/bitlbee - group: bitlbee - owner: bitlbee - -- name: Create Bitlbee systemd unit file directory - ansible.builtin.file: - path: /etc/systemd/system/bitlbee.service.d - state: directory - mode: "0755" - tags: - - firejail - -- name: Push Bitlbee socket unit file - ansible.builtin.copy: - src: bitlbee-service-override.conf - dest: /etc/systemd/system/bitlbee.service.d/override.conf - mode: "0644" - notify: - - Reload systemd config - - Restart bitlbee - tags: - - firejail - -- name: Include nmtrust unit tasks - ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml - vars: - unit: bitlbee.service - run_on: "{{ bitlbee.run_on }}" diff --git a/roles/bitlbee/templates/bitlbee.conf.j2 b/roles/bitlbee/templates/bitlbee.conf.j2 deleted file mode 100644 index 39df0a4..0000000 --- a/roles/bitlbee/templates/bitlbee.conf.j2 +++ /dev/null @@ -1,9 +0,0 @@ -[settings] -RunMode = ForkDaemon -User = bitlbee -{% if tor and bitlbee.torify %} -Proxy = socks5://localhost:9050 -{% endif %} - -[defaults] -private = 1 diff --git a/roles/golang/tasks/main.yml b/roles/golang/tasks/main.yml deleted file mode 100644 index a12b17a..0000000 --- a/roles/golang/tasks/main.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- name: Install go - community.general.pacman: - name: go - state: present - -- name: Create system go group - ansible.builtin.group: - name: golang - state: present - -- name: Add user to system golang group - ansible.builtin.user: - name: "{{ user.name }}" - groups: golang - append: true - tags: - - user - -- name: Create system go dir - ansible.builtin.file: - path: /usr/local/go - state: directory - group: golang - mode: "0775" diff --git a/roles/hashicorp/meta/main.yml b/roles/hashicorp/meta/main.yml deleted file mode 100644 index 5ede082..0000000 --- a/roles/hashicorp/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: golang } diff --git a/roles/hashicorp/tasks/main.yml b/roles/hashicorp/tasks/main.yml deleted file mode 100644 index 2cc9964..0000000 --- a/roles/hashicorp/tasks/main.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- name: Install vagrant - community.general.pacman: - name: vagrant - state: present - -- name: Install consul - community.general.pacman: - name: consul - state: present - -- name: Install terraform - community.general.pacman: - name: terraform - state: present - -- name: Install vault - community.general.pacman: - name: vault - state: present - -- name: Install nomad - kewlfft.aur.aur: - name: nomad - become: true - become_user: "{{ aur.user }}" - tags: - - aur diff --git a/roles/pianobar/files/firejail/pianobar.profile b/roles/pianobar/files/firejail/pianobar.profile deleted file mode 100644 index c82f426..0000000 --- a/roles/pianobar/files/firejail/pianobar.profile +++ /dev/null @@ -1,7 +0,0 @@ -include /etc/firejail/default.profile -include /etc/firejail/disable-devel.inc - -private-etc firejail,group,hosts,nsswitch.conf,resolv.conf,asound.conf,pulse,ssl,ca-certificates -private-tmp -shell none -whitelist ~/.config/pianobar diff --git a/roles/pianobar/meta/main.yml b/roles/pianobar/meta/main.yml deleted file mode 100644 index cbc0668..0000000 --- a/roles/pianobar/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: firejail } diff --git a/roles/pianobar/tasks/main.yml b/roles/pianobar/tasks/main.yml deleted file mode 100644 index 365c9ef..0000000 --- a/roles/pianobar/tasks/main.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- name: Install pianobar - community.general.pacman: - name: pianobar - state: present - -- name: Jail pianobar - ansible.builtin.file: - src: /usr/bin/firejail - dest: /usr/local/bin/pianobar - state: link - tags: - - firejail - -- name: Push pianobar firejail profile - ansible.builtin.copy: - src: firejail/pianobar.profile - dest: /usr/local/etc/firejail/pianobar.profile - mode: "0644" - notify: - - Activate firejail profiles - tags: - - firejail diff --git a/roles/weechat/meta/main.yml b/roles/weechat/meta/main.yml deleted file mode 100644 index cbc0668..0000000 --- a/roles/weechat/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: firejail } diff --git a/roles/weechat/tasks/main.yml b/roles/weechat/tasks/main.yml deleted file mode 100644 index c8d9df9..0000000 --- a/roles/weechat/tasks/main.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- name: Install weechat - community.general.pacman: - name: weechat - state: present - -- name: Jail weechat - ansible.builtin.file: - src: /usr/bin/firejail - dest: /usr/local/bin/weechat - state: link - tags: - - firejail - -- name: Install dunst - community.general.pacman: - name: dunst - state: present