From 10a04681da5bb8f80e6f88616f52a6c73f41fc7b Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Fri, 7 Feb 2025 14:47:07 -0700 Subject: [PATCH] completed libreoffice and heroic games launcher --- tasks/pkgs/heroic.yml | 18 ++++++++++++++---- tasks/pkgs/libreoffice.yml | 28 +++++++++++++++++++++++----- vars/libreoffice.yml | 8 ++++++++ vars/main.yml | 1 + 4 files changed, 46 insertions(+), 9 deletions(-) create mode 100644 vars/libreoffice.yml diff --git a/tasks/pkgs/heroic.yml b/tasks/pkgs/heroic.yml index df56900..533bd21 100644 --- a/tasks/pkgs/heroic.yml +++ b/tasks/pkgs/heroic.yml @@ -1,5 +1,15 @@ -# TODO: implement --- -- name: append to syspkgs - debug: - msg: "NOT IMPLEMENTED YET" +- block: + - ansible.builtin.include_tasks: + file: pkgs/flatpak.yml + when: pkgconfig_flatpkak is undefined + - name: append to flatpkgs + ansible.builtin.set_fact: + flatpkgs: "{{ flatpkgs + [ 'com.heroicgameslauncher.hgl' ] }}" + when: + - ansible_os_family != 'Darwin' + +- name: append to caskpkgs + ansible.builtin.set_fact: + caskpkgs: "{{ caskpkgs + [ 'heroic' ] }}" + when: ansible_os_family == 'Darwin' diff --git a/tasks/pkgs/libreoffice.yml b/tasks/pkgs/libreoffice.yml index b09b096..10d1c31 100644 --- a/tasks/pkgs/libreoffice.yml +++ b/tasks/pkgs/libreoffice.yml @@ -1,9 +1,27 @@ -# TODO: implement --- -- name: append to syspkgs - debug: - msg: "NOT IMPLEMENTED YET" - when: ansible_os_family != 'Darwin' +- ansible.bultin.include_vars: + file: libreoffice.yml + name: _libreoffice +- ansible.builtin.set_fact: + pkgconfig_libreoffice: "{{ _libreoffice | ansible.builtin.combine(pkgconfig.libreoffice) }}" + +- block: + - ansible.builtin.include_tasks: + file: pkgs/flatpak.yml + when: pkgconfig_flatpkak is undefined + - name: append to flatpkgs + ansible.builtin.set_fact: + flatpkgs: "{{ flatpkgs + pkgconfig_libreoffice.flatpak }}" + when: + - ansible_os_family != 'Darwin' + - pkgconfig_libreoffice.use_flatpak + +- block: + - ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + pkgconfig_libreoffice[ansible_os_family] }}" + when: + - ansible_os_family != 'Darwin' + - not pkgconfig_libreoffice.use_flatpak - name: append to caskpkgs ansible.builtin.set_fact: diff --git a/vars/libreoffice.yml b/vars/libreoffice.yml new file mode 100644 index 0000000..fb8faa6 --- /dev/null +++ b/vars/libreoffice.yml @@ -0,0 +1,8 @@ +--- +use_flatpak: false +flatpak: + - org.libreoffice.LibreOffice +Debian: + - libreoffice +RedHat: + - libreoffice diff --git a/vars/main.yml b/vars/main.yml index 7abbe97..2cd64dd 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -40,6 +40,7 @@ pkgconfig: go: {} hashicorp: {} kitty: {} + libreoffice: {} luals: {} jellyfin: {} ghostty: {}