From c6493aebaa8442bdcde10ad2d7948ee825a9aabf Mon Sep 17 00:00:00 2001 From: Ahmed Abdelhalim Date: Mon, 23 Feb 2026 19:32:54 +0100 Subject: Replace rnote with gradia and fix typo in teams role --- configure.yml | 2 +- molecule/archlinux-gnome/converge.yml | 2 +- molecule/archlinux/converge.yml | 2 +- molecule/debian/converge.yml | 2 +- molecule/raspberrypi/converge.yml | 2 +- molecule/ubuntu/converge.yml | 2 +- roles/gradia/meta/argument_specs.yml | 6 ++++++ roles/gradia/meta/main.yml | 21 +++++++++++++++++++++ roles/gradia/tasks/install-archlinux.yml | 8 ++++++++ roles/gradia/tasks/install-debian.yml | 7 +++++++ roles/gradia/tasks/main.yml | 3 +++ roles/microsoft-teams/tasks/install-debian.yml | 2 +- roles/rnote/meta/argument_specs.yml | 6 ------ roles/rnote/meta/main.yml | 19 ------------------- roles/rnote/tasks/install-archlinux.yml | 6 ------ roles/rnote/tasks/install-debian.yml | 7 ------- roles/rnote/tasks/main.yml | 3 --- 17 files changed, 52 insertions(+), 48 deletions(-) create mode 100644 roles/gradia/meta/argument_specs.yml create mode 100644 roles/gradia/meta/main.yml create mode 100644 roles/gradia/tasks/install-archlinux.yml create mode 100644 roles/gradia/tasks/install-debian.yml create mode 100644 roles/gradia/tasks/main.yml delete mode 100644 roles/rnote/meta/argument_specs.yml delete mode 100644 roles/rnote/meta/main.yml delete mode 100644 roles/rnote/tasks/install-archlinux.yml delete mode 100644 roles/rnote/tasks/install-debian.yml delete mode 100644 roles/rnote/tasks/main.yml diff --git a/configure.yml b/configure.yml index 513c54c9..8233d28b 100644 --- a/configure.yml +++ b/configure.yml @@ -28,7 +28,7 @@ - role: "gnome-calendar" - role: "gnome-loupe" - role: "gnome-evince" - - role: "rnote" + - role: "gradia" - role: "mpv" - role: "neomutt" - role: "go" diff --git a/molecule/archlinux-gnome/converge.yml b/molecule/archlinux-gnome/converge.yml index cb8a84d8..93bed017 100644 --- a/molecule/archlinux-gnome/converge.yml +++ b/molecule/archlinux-gnome/converge.yml @@ -82,7 +82,7 @@ - role: "gnome-calendar" - role: "gnome-loupe" - role: "gnome-evince" - - role: "rnote" + - role: "gradia" - role: "mpv" - role: "neomutt" - role: "go" diff --git a/molecule/archlinux/converge.yml b/molecule/archlinux/converge.yml index 55537e16..2c9182ae 100644 --- a/molecule/archlinux/converge.yml +++ b/molecule/archlinux/converge.yml @@ -81,7 +81,7 @@ - role: "gnome-calendar" - role: "gnome-loupe" - role: "gnome-evince" - - role: "rnote" + - role: "gradia" - role: "mpv" - role: "neomutt" - role: "go" diff --git a/molecule/debian/converge.yml b/molecule/debian/converge.yml index 8acbc5ab..8876a28f 100644 --- a/molecule/debian/converge.yml +++ b/molecule/debian/converge.yml @@ -93,7 +93,7 @@ - role: "gnome-calendar" - role: "gnome-loupe" - role: "gnome-evince" - - role: "rnote" + - role: "gradia" - role: "rsync" - role: "gpg" - role: "dotfiles" diff --git a/molecule/raspberrypi/converge.yml b/molecule/raspberrypi/converge.yml index f0e4733e..aead87c1 100644 --- a/molecule/raspberrypi/converge.yml +++ b/molecule/raspberrypi/converge.yml @@ -90,7 +90,7 @@ - role: "gnome-calendar" - role: "gnome-loupe" - role: "gnome-evince" - - role: "rnote" + - role: "gradia" - role: "rsync" - role: "gpg" - role: "dotfiles" diff --git a/molecule/ubuntu/converge.yml b/molecule/ubuntu/converge.yml index a7d5828b..35e0ead8 100644 --- a/molecule/ubuntu/converge.yml +++ b/molecule/ubuntu/converge.yml @@ -82,7 +82,7 @@ - role: "gnome-calendar" - role: "gnome-loupe" - role: "gnome-evince" - - role: "rnote" + - role: "gradia" - role: "rsync" - role: "gpg" - role: "dotfiles" diff --git a/roles/gradia/meta/argument_specs.yml b/roles/gradia/meta/argument_specs.yml new file mode 100644 index 00000000..fb0eda03 --- /dev/null +++ b/roles/gradia/meta/argument_specs.yml @@ -0,0 +1,6 @@ +--- +argument_specs: + main: + short_description: "Install gradia on Linux distribution" + description: "Install gradia on Linux distribution" + options: {} diff --git a/roles/gradia/meta/main.yml b/roles/gradia/meta/main.yml new file mode 100644 index 00000000..e873dfbd --- /dev/null +++ b/roles/gradia/meta/main.yml @@ -0,0 +1,21 @@ +--- +dependencies: + - role: "yay" + when: ansible_facts['os_family'] == "Archlinux" + - role: "flatpak" + when: ansible_facts['os_family'] == "Debian" +galaxy_info: + author: "a14m" + description: "Install gradia" + license: "MIT" + min_ansible_version: "2.18" + platforms: + - name: "ArchLinux" + versions: + - "all" + - name: "Ubuntu" + versions: + - "noble" + - name: "Debian" + versions: + - "bookworm" diff --git a/roles/gradia/tasks/install-archlinux.yml b/roles/gradia/tasks/install-archlinux.yml new file mode 100644 index 00000000..ab560d8d --- /dev/null +++ b/roles/gradia/tasks/install-archlinux.yml @@ -0,0 +1,8 @@ +--- +- name: "Ensure gradia is installed" + become: true + become_user: "aur_builder" + kewlfft.aur.aur: + name: "gradia" + state: "present" + use: "yay" diff --git a/roles/gradia/tasks/install-debian.yml b/roles/gradia/tasks/install-debian.yml new file mode 100644 index 00000000..42c81e24 --- /dev/null +++ b/roles/gradia/tasks/install-debian.yml @@ -0,0 +1,7 @@ +--- +- name: "Ensure gradia is installed via flathub" + community.general.flatpak: + name: "be.alexandervanhee.gradia" + remote: "flathub" + state: "present" + method: "user" diff --git a/roles/gradia/tasks/main.yml b/roles/gradia/tasks/main.yml new file mode 100644 index 00000000..71bcbd0d --- /dev/null +++ b/roles/gradia/tasks/main.yml @@ -0,0 +1,3 @@ +--- +- name: "Include OS-specific tasks" + ansible.builtin.include_tasks: "install-{{ ansible_facts['os_family'] | lower }}.yml" diff --git a/roles/microsoft-teams/tasks/install-debian.yml b/roles/microsoft-teams/tasks/install-debian.yml index 7a0e74a3..b69638b8 100644 --- a/roles/microsoft-teams/tasks/install-debian.yml +++ b/roles/microsoft-teams/tasks/install-debian.yml @@ -1,5 +1,5 @@ --- -- name: "Ensure rnote is installed via flathub" +- name: "Ensure microsoft-teams is installed via flathub" community.general.flatpak: name: "com.github.IsmaelMartinez.teams_for_linux" remote: "flathub" diff --git a/roles/rnote/meta/argument_specs.yml b/roles/rnote/meta/argument_specs.yml deleted file mode 100644 index a7ec1084..00000000 --- a/roles/rnote/meta/argument_specs.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -argument_specs: - main: - short_description: "Install rnote on Linux distribution" - description: "Install rnote on Linux distribution" - options: {} diff --git a/roles/rnote/meta/main.yml b/roles/rnote/meta/main.yml deleted file mode 100644 index f56ff44f..00000000 --- a/roles/rnote/meta/main.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -dependencies: - - role: "flatpak" - when: ansible_facts['os_family'] == "Debian" -galaxy_info: - author: "a14m" - description: "Install rnote" - license: "MIT" - min_ansible_version: "2.18" - platforms: - - name: "ArchLinux" - versions: - - "all" - - name: "Ubuntu" - versions: - - "noble" - - name: "Debian" - versions: - - "bookworm" diff --git a/roles/rnote/tasks/install-archlinux.yml b/roles/rnote/tasks/install-archlinux.yml deleted file mode 100644 index d1c355f7..00000000 --- a/roles/rnote/tasks/install-archlinux.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: "Ensure rnote is installed" - become: true - ansible.builtin.package: - name: "rnote" - state: "present" diff --git a/roles/rnote/tasks/install-debian.yml b/roles/rnote/tasks/install-debian.yml deleted file mode 100644 index 4126128c..00000000 --- a/roles/rnote/tasks/install-debian.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: "Ensure rnote is installed via flathub" - community.general.flatpak: - name: "com.github.flxzt.rnote" - remote: "flathub" - state: "present" - method: "user" diff --git a/roles/rnote/tasks/main.yml b/roles/rnote/tasks/main.yml deleted file mode 100644 index 71bcbd0d..00000000 --- a/roles/rnote/tasks/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: "Include OS-specific tasks" - ansible.builtin.include_tasks: "install-{{ ansible_facts['os_family'] | lower }}.yml" -- cgit v1.2.3