From 507981b54d53448d84394c56fd8d5e55178b6068 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Fri, 24 Mar 2023 11:14:27 +0100 Subject: [PATCH] Cleaned up repository --- README.md | 41 +++++++++++-------- playbook.yml | 30 ++++++++++++-- roles/application-latex/tasks/main.yml | 1 + .../meta/main.yml | 0 .../tasks/main.yml | 1 + .../meta/main.yml | 2 + .../tasks/main.yml | 0 .../meta/main.yml | 2 - roles/collection-designer/meta/main.yml | 2 + roles/collection-designer/tasks/main.yml | 7 ++++ .../meta/main.yml | 2 + .../tasks/main.yml | 0 roles/collection-developer-base/meta/main.yml | 2 + .../tasks/main.yml | 0 roles/collection-developer-bash/meta/main.yml | 2 + .../tasks/main.yml | 0 .../meta/main.yml | 0 roles/collection-developer-php/meta/main.yml | 2 + .../tasks/main.yml | 0 .../collection-developer-python/meta/main.yml | 2 + .../tasks/main.yml | 0 .../meta/main.yml | 2 - .../meta/main.yml | 2 - .../meta/main.yml | 2 - .../meta/main.yml | 2 - .../meta/main.yml | 2 - roles/collection-entertainment/meta/main.yml | 2 + roles/collection-entertainment/tasks/main.yml | 5 +++ roles/collection-office-tools/meta/main.yml | 2 - roles/collection-office/meta/main.yml | 3 ++ .../tasks/main.yml | 4 +- roles/collection-streamer/tasks/main.yml | 5 +++ roles/collection-torrent/meta/main.yml | 2 + roles/collection-torrent/tasks/main.yml | 5 +++ roles/collection-video-conference/README.md | 4 ++ .../collection-video-conference/meta/main.yml | 2 + .../tasks/main.yml | 5 +++ roles/native-general/tasks/main.yml | 17 -------- 38 files changed, 109 insertions(+), 53 deletions(-) rename roles/{collection-administrator-tools-base => collection-administrator-base}/meta/main.yml (100%) rename roles/{collection-administrator-tools-base => collection-administrator-base}/tasks/main.yml (92%) create mode 100644 roles/collection-administrator-network-analyze/meta/main.yml rename roles/{collection-administrator-tools-network-analyze => collection-administrator-network-analyze}/tasks/main.yml (100%) delete mode 100644 roles/collection-administrator-tools-network-analyze/meta/main.yml create mode 100644 roles/collection-designer/meta/main.yml create mode 100644 roles/collection-designer/tasks/main.yml create mode 100644 roles/collection-developer-arduino/meta/main.yml rename roles/{collection-developer-tools-arduino => collection-developer-arduino}/tasks/main.yml (100%) create mode 100644 roles/collection-developer-base/meta/main.yml rename roles/{collection-developer-tools-base => collection-developer-base}/tasks/main.yml (100%) create mode 100644 roles/collection-developer-bash/meta/main.yml rename roles/{collection-developer-tools-bash => collection-developer-bash}/tasks/main.yml (100%) rename roles/{collection-developer-tools-java => collection-developer-java}/meta/main.yml (100%) create mode 100644 roles/collection-developer-php/meta/main.yml rename roles/{collection-developer-tools-php => collection-developer-php}/tasks/main.yml (100%) create mode 100644 roles/collection-developer-python/meta/main.yml rename roles/{collection-developer-tools-python => collection-developer-python}/tasks/main.yml (100%) delete mode 100644 roles/collection-developer-tools-arduino/meta/main.yml delete mode 100644 roles/collection-developer-tools-base/meta/main.yml delete mode 100644 roles/collection-developer-tools-bash/meta/main.yml delete mode 100644 roles/collection-developer-tools-php/meta/main.yml delete mode 100644 roles/collection-developer-tools-python/meta/main.yml create mode 100644 roles/collection-entertainment/meta/main.yml create mode 100644 roles/collection-entertainment/tasks/main.yml delete mode 100644 roles/collection-office-tools/meta/main.yml create mode 100644 roles/collection-office/meta/main.yml rename roles/{collection-office-tools => collection-office}/tasks/main.yml (64%) create mode 100644 roles/collection-streamer/tasks/main.yml create mode 100644 roles/collection-torrent/meta/main.yml create mode 100644 roles/collection-torrent/tasks/main.yml create mode 100644 roles/collection-video-conference/README.md create mode 100644 roles/collection-video-conference/meta/main.yml create mode 100644 roles/collection-video-conference/tasks/main.yml delete mode 100644 roles/native-general/tasks/main.yml diff --git a/README.md b/README.md index a0db7c7..fccd5a3 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,35 @@ # Client Playbook [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0) -Playbook to setup Manjaro GNOME clients. -# Setup +Playbook to setup Manjaro GNOME clients in integration with a server which is configured with the [Server Playbook Software](https://github.com/kevinveenbirkenbach/server-playbook). + +## Included Applications +- [Basic Linux Administration Tools](./roles/collection-administrator-base/) +- [Network Analyzes Tools](./roles/collection-administrator-network-analyze/) +- [Designer Tools](./roles/collection-designer/) +- [Arduino Developer Tools](./roles/collection-developer-arduino/) +- [Basic Developer Tools](./roles/collection-developer-base/) +- [Bash Developer Tools](./roles/collection-developer-bash/) +- [Java Developer Tools](./roles/collection-developer-java/) +- [PHP Developer Tools](./roles/collection-developer-php/) +- [Python Developer Tools](./roles/collection-developer-python/) +- [Entertainment Software](./roles/collection-entertainment/) +- [Games](./roles/collection-games/) +- [Office Tools](./roles/collection-office/) +- [Streaming Tools](./roles/collection-streamer/) +- [Torrent Software](./roles/collection-torrent/) +- ... + +## Setup Run: ```bash ansible-galaxy collection install -r requirements.yml ``` -# Todo -- pacman -S retext -- add yay -S calibre -- add yay -S qbittorrent -- add yay -S zoom -- add obs-studios -- add yay -S drawio-desktop -- add native-office-worker -- add native-graphic-designer -- add native-developer-basic -- add native-workspaces -- add https://aur.archlinux.org/packages/displaylink -- add spotify -- add backup to tails usb stick -- https://www.reddit.com/r/ManjaroLinux/comments/cbkblb/guide_run_android_apps_on_manjaro_super_simple/ https://archived.forum.manjaro.org/t/running-android-applications-on-arch-using-anbox/53332 -# See +## See - https://www.middlewareinventory.com/blog/run-ansible-playbook-locally/ - https://stackoverflow.com/questions/30533372/run-an-ansible-task-only-when-the-hostname-contains-a-string +- https://archived.forum.manjaro.org/t/running-android-applications-on-arch-using-anbox/53332 +- https://www.reddit.com/r/ManjaroLinux/comments/cbkblb/guide_run_android_apps_on_manjaro_super_simple/ diff --git a/playbook.yml b/playbook.yml index 4678d2d..6b4fc55 100644 --- a/playbook.yml +++ b/playbook.yml @@ -3,15 +3,33 @@ become: true roles: - system-pacman - - collection-administrator-tools-base + - collection-administrator-base - application-caffeine - driver-non-free -- name: collection-office-tools +- name: collection-office hosts: collection_officetools_hosts become: true roles: - - collection-office-tools + - collection-office + +- name: collection-designer + hosts: collection_designer_hosts + become: true + roles: + - collection-designer + +- name: collection-torrent + hosts: collection_torrent_hosts + become: true + roles: + - collection-torrent + +- name: collection-streamer + hosts: collection_streamer_hosts + become: true + roles: + - collection-streamer - name: collection-bluray-player hosts: collection_bluray_player_hosts @@ -61,6 +79,12 @@ roles: - collection-games +- name: setup entertainment hosts + hosts: entertainment_hosts + become: true + roles: + - collection-entertainment + - name: setup multiprinter hosts hosts: epson_multiprinter_hosts become: true diff --git a/roles/application-latex/tasks/main.yml b/roles/application-latex/tasks/main.yml index 013c453..18b0f09 100644 --- a/roles/application-latex/tasks/main.yml +++ b/roles/application-latex/tasks/main.yml @@ -5,4 +5,5 @@ - texlive-lang - texlive-langextra - texlive-fontsextra + - texlive-most state: present \ No newline at end of file diff --git a/roles/collection-administrator-tools-base/meta/main.yml b/roles/collection-administrator-base/meta/main.yml similarity index 100% rename from roles/collection-administrator-tools-base/meta/main.yml rename to roles/collection-administrator-base/meta/main.yml diff --git a/roles/collection-administrator-tools-base/tasks/main.yml b/roles/collection-administrator-base/tasks/main.yml similarity index 92% rename from roles/collection-administrator-tools-base/tasks/main.yml rename to roles/collection-administrator-base/tasks/main.yml index 84f3d6d..f17871c 100644 --- a/roles/collection-administrator-tools-base/tasks/main.yml +++ b/roles/collection-administrator-base/tasks/main.yml @@ -7,4 +7,5 @@ - gcc - cmake - fdupes + - p7zip state: present diff --git a/roles/collection-administrator-network-analyze/meta/main.yml b/roles/collection-administrator-network-analyze/meta/main.yml new file mode 100644 index 0000000..3d8aaa9 --- /dev/null +++ b/roles/collection-administrator-network-analyze/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- collection-administrator-base \ No newline at end of file diff --git a/roles/collection-administrator-tools-network-analyze/tasks/main.yml b/roles/collection-administrator-network-analyze/tasks/main.yml similarity index 100% rename from roles/collection-administrator-tools-network-analyze/tasks/main.yml rename to roles/collection-administrator-network-analyze/tasks/main.yml diff --git a/roles/collection-administrator-tools-network-analyze/meta/main.yml b/roles/collection-administrator-tools-network-analyze/meta/main.yml deleted file mode 100644 index cf8941d..0000000 --- a/roles/collection-administrator-tools-network-analyze/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- collection-administrator-tools-base \ No newline at end of file diff --git a/roles/collection-designer/meta/main.yml b/roles/collection-designer/meta/main.yml new file mode 100644 index 0000000..0043675 --- /dev/null +++ b/roles/collection-designer/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- application-dia \ No newline at end of file diff --git a/roles/collection-designer/tasks/main.yml b/roles/collection-designer/tasks/main.yml new file mode 100644 index 0000000..930f907 --- /dev/null +++ b/roles/collection-designer/tasks/main.yml @@ -0,0 +1,7 @@ +- name: install designer tools + community.general.pacman: + name: + - gimp + - blender + - drawio-desktop + state: present diff --git a/roles/collection-developer-arduino/meta/main.yml b/roles/collection-developer-arduino/meta/main.yml new file mode 100644 index 0000000..04afe1e --- /dev/null +++ b/roles/collection-developer-arduino/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- collection-developer-base \ No newline at end of file diff --git a/roles/collection-developer-tools-arduino/tasks/main.yml b/roles/collection-developer-arduino/tasks/main.yml similarity index 100% rename from roles/collection-developer-tools-arduino/tasks/main.yml rename to roles/collection-developer-arduino/tasks/main.yml diff --git a/roles/collection-developer-base/meta/main.yml b/roles/collection-developer-base/meta/main.yml new file mode 100644 index 0000000..3d8aaa9 --- /dev/null +++ b/roles/collection-developer-base/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- collection-administrator-base \ No newline at end of file diff --git a/roles/collection-developer-tools-base/tasks/main.yml b/roles/collection-developer-base/tasks/main.yml similarity index 100% rename from roles/collection-developer-tools-base/tasks/main.yml rename to roles/collection-developer-base/tasks/main.yml diff --git a/roles/collection-developer-bash/meta/main.yml b/roles/collection-developer-bash/meta/main.yml new file mode 100644 index 0000000..04afe1e --- /dev/null +++ b/roles/collection-developer-bash/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- collection-developer-base \ No newline at end of file diff --git a/roles/collection-developer-tools-bash/tasks/main.yml b/roles/collection-developer-bash/tasks/main.yml similarity index 100% rename from roles/collection-developer-tools-bash/tasks/main.yml rename to roles/collection-developer-bash/tasks/main.yml diff --git a/roles/collection-developer-tools-java/meta/main.yml b/roles/collection-developer-java/meta/main.yml similarity index 100% rename from roles/collection-developer-tools-java/meta/main.yml rename to roles/collection-developer-java/meta/main.yml diff --git a/roles/collection-developer-php/meta/main.yml b/roles/collection-developer-php/meta/main.yml new file mode 100644 index 0000000..04afe1e --- /dev/null +++ b/roles/collection-developer-php/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- collection-developer-base \ No newline at end of file diff --git a/roles/collection-developer-tools-php/tasks/main.yml b/roles/collection-developer-php/tasks/main.yml similarity index 100% rename from roles/collection-developer-tools-php/tasks/main.yml rename to roles/collection-developer-php/tasks/main.yml diff --git a/roles/collection-developer-python/meta/main.yml b/roles/collection-developer-python/meta/main.yml new file mode 100644 index 0000000..04afe1e --- /dev/null +++ b/roles/collection-developer-python/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- collection-developer-base \ No newline at end of file diff --git a/roles/collection-developer-tools-python/tasks/main.yml b/roles/collection-developer-python/tasks/main.yml similarity index 100% rename from roles/collection-developer-tools-python/tasks/main.yml rename to roles/collection-developer-python/tasks/main.yml diff --git a/roles/collection-developer-tools-arduino/meta/main.yml b/roles/collection-developer-tools-arduino/meta/main.yml deleted file mode 100644 index a0a0239..0000000 --- a/roles/collection-developer-tools-arduino/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- collection-developer-tools-base \ No newline at end of file diff --git a/roles/collection-developer-tools-base/meta/main.yml b/roles/collection-developer-tools-base/meta/main.yml deleted file mode 100644 index cf8941d..0000000 --- a/roles/collection-developer-tools-base/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- collection-administrator-tools-base \ No newline at end of file diff --git a/roles/collection-developer-tools-bash/meta/main.yml b/roles/collection-developer-tools-bash/meta/main.yml deleted file mode 100644 index a0a0239..0000000 --- a/roles/collection-developer-tools-bash/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- collection-developer-tools-base \ No newline at end of file diff --git a/roles/collection-developer-tools-php/meta/main.yml b/roles/collection-developer-tools-php/meta/main.yml deleted file mode 100644 index a0a0239..0000000 --- a/roles/collection-developer-tools-php/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- collection-developer-tools-base \ No newline at end of file diff --git a/roles/collection-developer-tools-python/meta/main.yml b/roles/collection-developer-tools-python/meta/main.yml deleted file mode 100644 index a0a0239..0000000 --- a/roles/collection-developer-tools-python/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- collection-developer-tools-base \ No newline at end of file diff --git a/roles/collection-entertainment/meta/main.yml b/roles/collection-entertainment/meta/main.yml new file mode 100644 index 0000000..f2b8958 --- /dev/null +++ b/roles/collection-entertainment/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- system-aur-helper \ No newline at end of file diff --git a/roles/collection-entertainment/tasks/main.yml b/roles/collection-entertainment/tasks/main.yml new file mode 100644 index 0000000..f0a84a3 --- /dev/null +++ b/roles/collection-entertainment/tasks/main.yml @@ -0,0 +1,5 @@ +- name: install entertainment software + kewlfft.aur.aur: + use: yay + name: + - spotify \ No newline at end of file diff --git a/roles/collection-office-tools/meta/main.yml b/roles/collection-office-tools/meta/main.yml deleted file mode 100644 index a5c9e61..0000000 --- a/roles/collection-office-tools/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- application-libreoffice \ No newline at end of file diff --git a/roles/collection-office/meta/main.yml b/roles/collection-office/meta/main.yml new file mode 100644 index 0000000..c67973f --- /dev/null +++ b/roles/collection-office/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: +- application-libreoffice +- collection-video-conference \ No newline at end of file diff --git a/roles/collection-office-tools/tasks/main.yml b/roles/collection-office/tasks/main.yml similarity index 64% rename from roles/collection-office-tools/tasks/main.yml rename to roles/collection-office/tasks/main.yml index 078bf6d..4870f8e 100644 --- a/roles/collection-office-tools/tasks/main.yml +++ b/roles/collection-office/tasks/main.yml @@ -1,7 +1,9 @@ -- name: install shutter +- name: install office sofware community.general.pacman: name: - chromium - shutter - thunderbird + - calibre + - retext state: present diff --git a/roles/collection-streamer/tasks/main.yml b/roles/collection-streamer/tasks/main.yml new file mode 100644 index 0000000..960b17d --- /dev/null +++ b/roles/collection-streamer/tasks/main.yml @@ -0,0 +1,5 @@ +- name: install streaming + community.general.pacman: + name: + - obs-studio + state: present diff --git a/roles/collection-torrent/meta/main.yml b/roles/collection-torrent/meta/main.yml new file mode 100644 index 0000000..f2b8958 --- /dev/null +++ b/roles/collection-torrent/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- system-aur-helper \ No newline at end of file diff --git a/roles/collection-torrent/tasks/main.yml b/roles/collection-torrent/tasks/main.yml new file mode 100644 index 0000000..052d132 --- /dev/null +++ b/roles/collection-torrent/tasks/main.yml @@ -0,0 +1,5 @@ +- name: install torrent software + kewlfft.aur.aur: + use: yay + name: + - qbittorrent \ No newline at end of file diff --git a/roles/collection-video-conference/README.md b/roles/collection-video-conference/README.md new file mode 100644 index 0000000..5ab8fdd --- /dev/null +++ b/roles/collection-video-conference/README.md @@ -0,0 +1,4 @@ +# collection-video-conference + +## further information +It seems like the microsoft client is not supported nativly on linux anymore: https://aur.archlinux.org/packages/teams \ No newline at end of file diff --git a/roles/collection-video-conference/meta/main.yml b/roles/collection-video-conference/meta/main.yml new file mode 100644 index 0000000..f2b8958 --- /dev/null +++ b/roles/collection-video-conference/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- system-aur-helper \ No newline at end of file diff --git a/roles/collection-video-conference/tasks/main.yml b/roles/collection-video-conference/tasks/main.yml new file mode 100644 index 0000000..baf2e7f --- /dev/null +++ b/roles/collection-video-conference/tasks/main.yml @@ -0,0 +1,5 @@ +- name: install video conference software + kewlfft.aur.aur: + use: yay + name: + - zoom \ No newline at end of file diff --git a/roles/native-general/tasks/main.yml b/roles/native-general/tasks/main.yml deleted file mode 100644 index fe44143..0000000 --- a/roles/native-general/tasks/main.yml +++ /dev/null @@ -1,17 +0,0 @@ -- name: install general software - community.general.pacman: - name: - # description language interpreters - #- texlive-most - - # compression tools - #- p7zip - - # video/picture manipulation - #- gimp - #- blender - #- obs-studio - - # virtualization tools - #- qemu - state: present